diff options
author | Yesudeep Mangalapilly <yesudeep@gmail.com> | 2011-08-24 16:29:53 +0530 |
---|---|---|
committer | Yesudeep Mangalapilly <yesudeep@gmail.com> | 2011-08-24 16:29:53 +0530 |
commit | 1328f48aa26fa684bb60682175308d3fb146cc71 (patch) | |
tree | bcb0c32ceb95d45c714dec8d165498608ff69c47 | |
parent | 23c41d28c83d8bab03ea205153ed3c8a015589c9 (diff) | |
download | rsa-git-1328f48aa26fa684bb60682175308d3fb146cc71.tar.gz |
Allow block_size=None in _int2bytes.
-rw-r--r-- | rsa/transform.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rsa/transform.py b/rsa/transform.py index 511233b..2734788 100644 --- a/rsa/transform.py +++ b/rsa/transform.py @@ -51,7 +51,7 @@ def bytes2int(raw_bytes): return int(binascii.hexlify(raw_bytes), 16) -def _int2bytes(number, block_size=0): +def _int2bytes(number, block_size=None): """Converts a number to a string of bytes. @param number: the number to convert @@ -77,8 +77,9 @@ def _int2bytes(number, block_size=0): else: needed_bytes = common.byte_size(number) raw_bytes = [] - - if block_size > 0: + + # You cannot compare None > 0 in Python 3x. It will fail with a TypeError. + if block_size and block_size > 0: if needed_bytes > block_size: raise OverflowError('Needed %i bytes for number, but block size ' 'is %i' % (needed_bytes, block_size)) @@ -89,7 +90,7 @@ def _int2bytes(number, block_size=0): number >>= 8 # Pad with zeroes to fill the block - if block_size > 0: + if block_size and block_size > 0: padding = (block_size - needed_bytes) * ZERO_BYTE else: padding = EMPTY_BYTE |