Backed out changeset 812d745b6bef

1 files changed, 6 insertions, 11 deletions

diff --git a/rsa/core.py b/rsa/core.py
index 639cba9..8f989df 100755
--- a/rsa/core.py
+++ b/rsa/core.py
@@ -17,16 +17,12 @@ 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:
-        raise ValueError('Only non-negative numbers are supported')
-         
-    if message > n:
-        raise OverflowError("The message %i is too long for n=%i" % (message, n))
+    if message < 0 or message > n:
+        raise OverflowError("The message is too long")
 
-    # 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)
 
@@ -36,9 +32,8 @@ def decrypt_int(cyphertext, dkey, n):
 
     message = pow(cyphertext, dkey, n)
 
-    # TODO: reinstate safebit
-    #safebit = rsa.common.bit_size(n) - 2        # compute safe bit (MSB - 1)
-    #message -= (1 << safebit)                   # remove safebit before decode
+    safebit = rsa.common.bit_size(n) - 2        # compute safe bit (MSB - 1)
+    message -= (1 << safebit)                   # remove safebit before decode
 
     return message