summaryrefslogtreecommitdiffstats
path: root/src/lib/tlslite/utils
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-02-06 13:32:53 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-02-06 13:32:53 +0000
commit37401bf9e4b9f627662af7b9d1f50937eea2c99d (patch)
treea1122fd34890cc7ee18102ca450e00ae203b010c /src/lib/tlslite/utils
parent44541d050d74d9952e47c56611c73f80523fdd37 (diff)
downloadbcfg2-37401bf9e4b9f627662af7b9d1f50937eea2c99d.tar.gz
bcfg2-37401bf9e4b9f627662af7b9d1f50937eea2c99d.tar.bz2
bcfg2-37401bf9e4b9f627662af7b9d1f50937eea2c99d.zip
TLSlite updates for python 2.6 (From Kamil Kisiel)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5066 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/tlslite/utils')
-rwxr-xr-xsrc/lib/tlslite/utils/cryptomath.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/tlslite/utils/cryptomath.py b/src/lib/tlslite/utils/cryptomath.py
index 9b6f0495f..07f76641c 100755
--- a/src/lib/tlslite/utils/cryptomath.py
+++ b/src/lib/tlslite/utils/cryptomath.py
@@ -6,7 +6,10 @@ import os
import math
import base64
import binascii
-import sha
+try:
+ import hashlib as sha
+except:
+ import sha
from compat import *