diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-02-06 13:32:53 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-02-06 13:32:53 +0000 |
| commit | 37401bf9e4b9f627662af7b9d1f50937eea2c99d (patch) | |
| tree | a1122fd34890cc7ee18102ca450e00ae203b010c /src/lib/tlslite/TLSRecordLayer.py | |
| parent | 44541d050d74d9952e47c56611c73f80523fdd37 (diff) | |
| download | bcfg2-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/TLSRecordLayer.py')
| -rwxr-xr-x | src/lib/tlslite/TLSRecordLayer.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/tlslite/TLSRecordLayer.py b/src/lib/tlslite/TLSRecordLayer.py index 002a56862..8b200e1ec 100755 --- a/src/lib/tlslite/TLSRecordLayer.py +++ b/src/lib/tlslite/TLSRecordLayer.py @@ -12,8 +12,12 @@ from constants import * from utils.cryptomath import getRandomBytes from utils import hmac from FileObject import FileObject -import sha -import md5 +try: + import hashlib as sha + import hashlib as md5 +except: + import sha + import md5 import socket import errno import traceback |