diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2012-01-18 20:01:20 -0500 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2012-01-18 20:01:20 -0500 |
| commit | bebb8be9cca116e1331cdb9154b225a69fa9b8b7 (patch) | |
| tree | c34ef49378a1c9f8059ceadf9f39493dff181ef9 /passlib/handlers/des_crypt.py | |
| parent | c1927edb87df4f22c5d5471e88f42b085a1a946a (diff) | |
| download | passlib-bebb8be9cca116e1331cdb9154b225a69fa9b8b7.tar.gz | |
misc bugfixes from round of changes
* added str_to_[ub]ascii to wrap hexdigest() calls
* fixed some h64big calls I missed
* some py3 fixes
* removed utils.compat.aliases, using overlay
to replace real compat module instead
(to agree w/ imports already in code)
Diffstat (limited to 'passlib/handlers/des_crypt.py')
| -rw-r--r-- | passlib/handlers/des_crypt.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/passlib/handlers/des_crypt.py b/passlib/handlers/des_crypt.py index da64560..976625a 100644 --- a/passlib/handlers/des_crypt.py +++ b/passlib/handlers/des_crypt.py @@ -101,7 +101,7 @@ def raw_crypt(secret, salt): result = mdes_encrypt_int_block(key_value, 0, salt_value, 25) #run h64 encode on result - return h64.encode_dc_int64(result) + return h64big.encode_int64(result) def raw_ext_crypt(secret, rounds, salt): "ext_crypt() helper which returns checksum only" @@ -132,7 +132,7 @@ def raw_ext_crypt(secret, rounds, salt): result = mdes_encrypt_int_block(key_value, 0, salt_value, rounds) #run h64 encode on result - return h64.encode_dc_int64(result) + return h64big.encode_int64(result) #========================================================= #handler @@ -531,7 +531,7 @@ class crypt16(uh.HasSalt, uh.GenericHandler): result2 = mdes_encrypt_int_block(key2, 0, salt_value, 5) #done - chk = h64.encode_dc_int64(result1) + h64.encode_dc_int64(result2) + chk = h64big.encode_int64(result1) + h64big.encode_int64(result2) return chk.decode("ascii") #========================================================= |