From 105f430bb8af76990c4c393d0e8b0a7d11429195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sun, 10 Jul 2011 01:35:46 +0200 Subject: Removed some fluff, rewritten some stuff, broken the lot --- rsa/core.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'rsa/core.py') diff --git a/rsa/core.py b/rsa/core.py index 8f989df..639cba9 100755 --- a/rsa/core.py +++ b/rsa/core.py @@ -17,12 +17,16 @@ def encrypt_int(message, ekey, n): if not type(message) is types.LongType: raise TypeError("You must pass a long or int") - if message < 0 or message > n: - raise OverflowError("The message is too long") + if message < 0: + raise ValueError('Only non-negative numbers are supported') + + if message > n: + raise OverflowError("The message %i is too long for n=%i" % (message, n)) + # TODO: reinstate safebit #Note: Bit exponents start at zero (bit counts start at 1) this is correct - safebit = rsa.common.bit_size(n) - 2 # compute safe bit (MSB - 1) - message += (1 << safebit) # add safebit to ensure folding + #safebit = rsa.common.bit_size(n) - 2 # compute safe bit (MSB - 1) + #message += (1 << safebit) # add safebit to ensure folding return pow(message, ekey, n) @@ -32,8 +36,9 @@ def decrypt_int(cyphertext, dkey, n): message = pow(cyphertext, dkey, n) - safebit = rsa.common.bit_size(n) - 2 # compute safe bit (MSB - 1) - message -= (1 << safebit) # remove safebit before decode + # TODO: reinstate safebit + #safebit = rsa.common.bit_size(n) - 2 # compute safe bit (MSB - 1) + #message -= (1 << safebit) # remove safebit before decode return message -- cgit v1.2.1