diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-17 10:31:16 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-20 11:37:55 -0400 |
| commit | af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56 (patch) | |
| tree | 47a532ae4d72eef2068a1bf8260eafabeafdef2e /src/lib/Bcfg2/Encryption.py | |
| parent | 3ea977825739b1c15c04ca053cc44bcfacf9cfb9 (diff) | |
| download | bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.tar.gz bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.tar.bz2 bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.zip | |
added json, md5 to Bcfg2.Compat
Diffstat (limited to 'src/lib/Bcfg2/Encryption.py')
| -rwxr-xr-x | src/lib/Bcfg2/Encryption.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Encryption.py b/src/lib/Bcfg2/Encryption.py index 0a2d486bf..5e70a1d10 100755 --- a/src/lib/Bcfg2/Encryption.py +++ b/src/lib/Bcfg2/Encryption.py @@ -4,12 +4,7 @@ import os import base64 from M2Crypto import Rand from M2Crypto.EVP import Cipher, EVPError -from Bcfg2.Compat import StringIO - -try: - from hashlib import md5 -except ImportError: - from md5 import md5 +from Bcfg2.Compat import StringIO, md5 ENCRYPT = 1 DECRYPT = 0 |