summaryrefslogtreecommitdiffstats
path: root/module/lib/beaker/crypto/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/lib/beaker/crypto/__init__.py')
-rw-r--r--module/lib/beaker/crypto/__init__.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/module/lib/beaker/crypto/__init__.py b/module/lib/beaker/crypto/__init__.py
index 3e26b0c13..ac13da527 100644
--- a/module/lib/beaker/crypto/__init__.py
+++ b/module/lib/beaker/crypto/__init__.py
@@ -14,10 +14,14 @@ if util.jython:
pass
else:
try:
- from beaker.crypto.pycrypto import getKeyLength, aesEncrypt, aesDecrypt
+ from beaker.crypto.nsscrypto import getKeyLength, aesEncrypt, aesDecrypt
keyLength = getKeyLength()
except ImportError:
- pass
+ try:
+ from beaker.crypto.pycrypto import getKeyLength, aesEncrypt, aesDecrypt
+ keyLength = getKeyLength()
+ except ImportError:
+ pass
if not keyLength:
has_aes = False