diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-06-28 15:57:48 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-06-28 20:23:46 +0200 |
| commit | d8f5e6d74b386045a451ed20a3c250204be8946e (patch) | |
| tree | d6fea466ca287e8de33201d4d42b5b12d7c2f75b /module/lib/beaker/crypto/__init__.py | |
| parent | [Lib] Revert libraries to original status (remove all cosmetics optimizations) (diff) | |
| download | pyload-d8f5e6d74b386045a451ed20a3c250204be8946e.tar.xz | |
[Lib] Update beaker.py to version 1.6.4
Diffstat (limited to 'module/lib/beaker/crypto/__init__.py')
| -rw-r--r-- | module/lib/beaker/crypto/__init__.py | 8 |
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 |