Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions phe/encoding.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import fractions
import math
import sys

Expand Down Expand Up @@ -186,7 +187,9 @@ def encode(cls, public_key, scalar, precision=None, max_exponent=None):
else:
exponent = min(max_exponent, prec_exponent)

int_rep = int(round(scalar * pow(cls.BASE, -exponent)))
# Use rationals instead of floats to avoid overflow.
int_rep = round(fractions.Fraction(scalar)
* fractions.Fraction(cls.BASE) ** -exponent)

if abs(int_rep) > public_key.max_int:
raise ValueError('Integer needs to be within +/- %d but got %d'
Expand Down Expand Up @@ -217,7 +220,17 @@ def decode(self):
else:
raise OverflowError('Overflow detected in decrypted number')

return mantissa * pow(self.BASE, self.exponent)
if self.exponent >= 0:
# Integer multiplication. This is exact.
return mantissa * self.BASE ** self.exponent
else:
# BASE ** -e is an integer, so below is a division of ints.
# Not coercing mantissa to float prevents some overflows.
try:
return mantissa / self.BASE ** -self.exponent
except OverflowError as e:
raise OverflowError(
'decoded result too large for a float') from e

def decrease_exponent_to(self, new_exp):
"""Return an `EncodedNumber` with same value but lower exponent.
Expand Down Expand Up @@ -249,4 +262,4 @@ def decrease_exponent_to(self, new_exp):
'old exponent %i' % (new_exp, self.exponent))
factor = pow(self.BASE, self.exponent - new_exp)
new_enc = self.encoding * factor % self.public_key.n
return self.__class__(self.public_key, new_enc, new_exp)
return self.__class__(self.public_key, new_enc, new_exp)
10 changes: 10 additions & 0 deletions phe/tests/paillier_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,16 @@ def testKeyring(self):
self.assertRaises(KeyError, keyring1.decrypt, ciphertext1)


class TestIssue62(unittest.TestCase):
def testIssue62(self):
pub, priv = paillier.generate_paillier_keypair()
a = pub.encrypt(445)
# Force big exponent.
b = pub.encrypt(0.16413409062205825) + pub.encrypt(2 ** -965)
# This will raise OverflowError without bugfix #73.
priv.decrypt(a + b)


def main():
unittest.main()

Expand Down