diff options
Diffstat (limited to 'passlib/utils/des.py')
| -rw-r--r-- | passlib/utils/des.py | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/passlib/utils/des.py b/passlib/utils/des.py index 034bfc4..1c407b9 100644 --- a/passlib/utils/des.py +++ b/passlib/utils/des.py @@ -17,30 +17,15 @@ warn("the 'passlib.utils.des' module has been relocated to 'passlib.crypto.des' from passlib.utils.decor import deprecated_function from passlib.crypto.des import expand_des_key, des_encrypt_block, des_encrypt_int_block -expand_des_key = deprecated_function(deprecated="1.7", removed="1.8", +expand_des_key = deprecated_function(deprecated="1.7", removed="2.0", replacement="passlib.crypto.des.expand_des_key")(expand_des_key) -des_encrypt_block = deprecated_function(deprecated="1.7", removed="1.8", +des_encrypt_block = deprecated_function(deprecated="1.7", removed="2.0", replacement="passlib.crypto.des.des_encrypt_block")(des_encrypt_block) -des_encrypt_int_block = deprecated_function(deprecated="1.7", removed="1.8", +des_encrypt_int_block = deprecated_function(deprecated="1.7", removed="2.0", replacement="passlib.crypto.des.des_encrypt_int_block")(des_encrypt_int_block) #============================================================================= -# deprecated functions -- not carried over to passlib.crypto.des -#============================================================================= -import struct -_unpack_uint64 = struct.Struct(">Q").unpack - -@deprecated_function(deprecated="1.6", removed="1.8", - replacement="passlib.crypto.des.des_encrypt_int_block()") -def mdes_encrypt_int_block(key, input, salt=0, rounds=1): # pragma: no cover -- deprecated & unused - if isinstance(key, bytes): - if len(key) == 7: - key = expand_des_key(key) - key = _unpack_uint64(key)[0] - return des_encrypt_int_block(key, input, salt, rounds) - -#============================================================================= # eof #============================================================================= |