diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2011-03-28 02:09:18 -0400 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2011-03-28 02:09:18 -0400 |
| commit | a9d11d6ccdddcce08825a3bf185bfe1bf70cbdb8 (patch) | |
| tree | e59c828a31012cdca8592caf00278b084a81dd9f | |
| parent | 592167e9687f4835d40584689fc51c1b1f9b1883 (diff) | |
| download | passlib-a9d11d6ccdddcce08825a3bf185bfe1bf70cbdb8.tar.gz | |
removed a bunch of "L" suffixes from ints (per 2to3)
| -rw-r--r-- | passlib/utils/des.py | 14 | ||||
| -rw-r--r-- | passlib/utils/pbkdf2.py | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/passlib/utils/des.py b/passlib/utils/des.py index e27cf54..279c638 100644 --- a/passlib/utils/des.py +++ b/passlib/utils/des.py @@ -64,9 +64,9 @@ RR6_S2 = range(6, -1, -2) RR14_S2 = range(14, -1, -2) R16_S2 = range(0, 16, 2) -INT_24_MAX = 0xffffffL -INT_64_MAX = 0xffffffffL -INT_64_MAX = 0xffffffffffffffffL +INT_24_MAX = 0xffffff +INT_64_MAX = 0xffffffff +INT_64_MAX = 0xffffffffffffffff #========================================================= # static tables for des @@ -706,13 +706,13 @@ def mdes_encrypt_int_block(key, input, salt=0, rounds=1): L, R = R, L C = ( - ((L>>3) & 0x0f0f0f0f00000000L) + ((L>>3) & 0x0f0f0f0f00000000) | - ((L<<33) & 0xf0f0f0f000000000L) + ((L<<33) & 0xf0f0f0f000000000) | - ((R>>35) & 0x000000000f0f0f0fL) + ((R>>35) & 0x000000000f0f0f0f) | - ((R<<1) & 0x00000000f0f0f0f0L) + ((R<<1) & 0x00000000f0f0f0f0) ) C = permute(C, CF6464) diff --git a/passlib/utils/pbkdf2.py b/passlib/utils/pbkdf2.py index be965b6..acc9c1f 100644 --- a/passlib/utils/pbkdf2.py +++ b/passlib/utils/pbkdf2.py @@ -47,7 +47,7 @@ if _EVP: #================================================================================= #backend #================================================================================= -MAX_BLOCKS = 0xffffffffL #2**32-1 +MAX_BLOCKS = 0xffffffff #2**32-1 MAX_HMAC_SHA1_KEYLEN = MAX_BLOCKS*20 def _resolve_prf(prf): |