diff options
| -rwxr-xr-x | src/python/botan2.py | 16 | ||||
| -rw-r--r-- | src/scripts/test_python.py | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/src/python/botan2.py b/src/python/botan2.py index 2018cae20..dcff583a9 100755 --- a/src/python/botan2.py +++ b/src/python/botan2.py @@ -1415,9 +1415,9 @@ class X509Cert(object): # pylint: disable=invalid-name def validation_status(cls, error_code): return _ctype_to_str(_DLL.botan_x509_cert_validation_status(c_int(error_code))) -class MPI(object): +class MPI(object): # pylint: disable=too-many-public-methods - def __init__(self, initial_value=None): + def __init__(self, initial_value=None, radix=None): self.__obj = c_void_p(0) _DLL.botan_mp_init(byref(self.__obj)) @@ -1426,6 +1426,8 @@ class MPI(object): pass # left as zero elif isinstance(initial_value, MPI): _DLL.botan_mp_set_from_mp(self.__obj, initial_value.handle_()) + elif radix is not None: + _DLL.botan_mp_set_from_radix_str(self.__obj, _ctype_str(initial_value), c_size_t(radix)) elif isinstance(initial_value, str): _DLL.botan_mp_set_from_str(self.__obj, _ctype_str(initial_value)) else: @@ -1591,6 +1593,16 @@ class MPI(object): _DLL.botan_mp_rshift(self.__obj, self.__obj, shift) return self + def mod_mul(self, other, modulus): + r = MPI() + _DLL.botan_mp_mod_mul(r.handle_(), self.__obj, other.handle_(), modulus.handle_()) + return r + + def gcd(self, other): + r = MPI() + _DLL.botan_mp_gcd(r.handle_(), self.__obj, other.handle_()) + return r + def pow_mod(self, exponent, modulus): r = MPI() _DLL.botan_mp_powmod(r.handle_(), self.__obj, exponent.handle_(), modulus.handle_()) diff --git a/src/scripts/test_python.py b/src/scripts/test_python.py index 60cb80ec5..ad1be89ce 100644 --- a/src/scripts/test_python.py +++ b/src/scripts/test_python.py @@ -507,11 +507,13 @@ ofvkP1EDmpx50fHLawIDAQAB big = botan2.MPI('0x85839682368923476892367235') self.assertEqual(big.bit_count(), 104) small = botan2.MPI(0xDEADBEEF) + radix = botan2.MPI("DEADBEEF", 16) self.assertEqual(hex_encode(small.to_bytes()), "deadbeef") self.assertEqual(hex_encode(big.to_bytes()), "85839682368923476892367235") self.assertEqual(int(small), 0xDEADBEEF) + self.assertEqual(int(radix), int(small)) self.assertEqual(int(small >> 16), 0xDEAD) @@ -577,6 +579,20 @@ ofvkP1EDmpx50fHLawIDAQAB p = inv.pow_mod(botan2.MPI(46), mod) self.assertEqual(int(p), 42) + one = botan2.MPI(1) + twelve = botan2.MPI("C", 16) + eight = botan2.MPI(8) + + mul = twelve.mod_mul(eight, inv) + self.assertEqual(int(mul), 27) + + gcd = one.gcd(one) + self.assertEqual(one, gcd) + gcd = one.gcd(twelve) + self.assertEqual(one, gcd) + gcd = twelve.gcd(eight) + self.assertEqual(4, int(gcd)) + def test_mpi_random(self): rng = botan2.RandomNumberGenerator() |