diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-02-06 15:29:54 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-02-06 15:29:54 +0000 |
| commit | 6b494128bec736187ad1a5c7d1d664924b8f983e (patch) | |
| tree | 64b3e738f084b96876e8e10b915e13575bb7e636 /src/lib/tlslite/mathtls.py | |
| parent | bc3672d9ef435b90d19e75979dfc33e3a0438e57 (diff) | |
| download | bcfg2-6b494128bec736187ad1a5c7d1d664924b8f983e.tar.gz bcfg2-6b494128bec736187ad1a5c7d1d664924b8f983e.tar.bz2 bcfg2-6b494128bec736187ad1a5c7d1d664924b8f983e.zip | |
Revert tlslite updates for the moment
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5069 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/tlslite/mathtls.py')
| -rwxr-xr-x | src/lib/tlslite/mathtls.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/tlslite/mathtls.py b/src/lib/tlslite/mathtls.py index 59f1f10d6..3b8ede601 100755 --- a/src/lib/tlslite/mathtls.py +++ b/src/lib/tlslite/mathtls.py @@ -4,12 +4,8 @@ from utils.compat import * from utils.cryptomath import * import hmac -try: - import hashlib as md5 - import hashlib as sha -except: - import md5 - import sha +import md5 +import sha #1024, 1536, 2048, 3072, 4096, 6144, and 8192 bit groups] goodGroupParameters = [(2,0xEEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C9C256576D674DF7496EA81D3383B4813D692C6E0E0D5D8E250B98BE48E495C1D6089DAD15DC7D7B46154D6B6CE8EF4AD69B15D4982559B297BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA9AFD5138FE8376435B9FC61D2FC0EB06E3),\ |