Index: third_party/tlslite/tlslite/mathtls.py |
=================================================================== |
--- third_party/tlslite/tlslite/mathtls.py (revision 53598) |
+++ third_party/tlslite/tlslite/mathtls.py (working copy) |
@@ -4,9 +4,19 @@ |
from utils.cryptomath import * |
import hmac |
-import md5 |
-import sha |
+# The sha module is deprecated in Python 2.6 |
+try: |
+ import sha |
+except ImportError: |
+ from hashlib import sha1 as sha |
+ |
+# The md5 module is deprecated in Python 2.6 |
+try: |
+ import md5 |
+except ImportError: |
+ from hashlib import md5 |
+ |
#1024, 1536, 2048, 3072, 4096, 6144, and 8192 bit groups] |
goodGroupParameters = [(2,0xEEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C9C256576D674DF7496EA81D3383B4813D692C6E0E0D5D8E250B98BE48E495C1D6089DAD15DC7D7B46154D6B6CE8EF4AD69B15D4982559B297BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA9AFD5138FE8376435B9FC61D2FC0EB06E3),\ |
(2,0x9DEF3CAFB939277AB1F12A8617A47BBBDBA51DF499AC4C80BEEEA9614B19CC4D5F4F5F556E27CBDE51C6A94BE4607A291558903BA0D0F84380B655BB9A22E8DCDF028A7CEC67F0D08134B1C8B97989149B609E0BE3BAB63D47548381DBC5B1FC764E3F4B53DD9DA1158BFD3E2B9C8CF56EDF019539349627DB2FD53D24B7C48665772E437D6C7F8CE442734AF7CCB7AE837C264AE3A9BEB87F8A2FE9B8B5292E5A021FFF5E91479E8CE7A28C2442C6F315180F93499A234DCF76E3FED135F9BB),\ |