Merge pull request #6577 from minosgalanakis/minos/add_bignum_more_raw_base_classes
Bignum: Add BignumModRaw Operation base classes
diff --git a/scripts/mbedtls_dev/bignum_mod_raw.py b/scripts/mbedtls_dev/bignum_mod_raw.py
index 2e059b2..1465e3e 100644
--- a/scripts/mbedtls_dev/bignum_mod_raw.py
+++ b/scripts/mbedtls_dev/bignum_mod_raw.py
@@ -15,14 +15,88 @@
# limitations under the License.
from abc import ABCMeta
+from typing import Dict, Iterator, List
+from . import test_case
from . import test_data_generation
+from . import bignum_common
class BignumModRawTarget(test_data_generation.BaseTarget, metaclass=ABCMeta):
#pylint: disable=abstract-method
"""Target for bignum mod_raw test case generation."""
target_basename = 'test_suite_bignum_mod_raw.generated'
+class BignumModRawOperation(bignum_common.OperationCommon, BignumModRawTarget, metaclass=ABCMeta):
+ #pylint: disable=abstract-method
+ """Target for bignum mod_raw test case generation."""
+
+ def __init__(self, val_n: str, val_a: str, val_b: str = "0", bits_in_limb: int = 64) -> None:
+ super().__init__(val_a=val_a, val_b=val_b)
+ self.val_n = val_n
+ self.bits_in_limb = bits_in_limb
+
+ @property
+ def int_n(self) -> int:
+ return bignum_common.hex_to_int(self.val_n)
+
+ @property
+ def boundary(self) -> int:
+ data_in = [self.int_a, self.int_b, self.int_n]
+ return max([n for n in data_in if n is not None])
+
+ @property
+ def limbs(self) -> int:
+ return bignum_common.limbs_mpi(self.boundary, self.bits_in_limb)
+
+ @property
+ def hex_digits(self) -> int:
+ return 2 * (self.limbs * self.bits_in_limb // 8)
+
+ @property
+ def hex_n(self) -> str:
+ return "{:x}".format(self.int_n).zfill(self.hex_digits)
+
+ @property
+ def hex_a(self) -> str:
+ return "{:x}".format(self.int_a).zfill(self.hex_digits)
+
+ @property
+ def hex_b(self) -> str:
+ return "{:x}".format(self.int_b).zfill(self.hex_digits)
+
+ @property
+ def r(self) -> int: # pylint: disable=invalid-name
+ l = bignum_common.limbs_mpi(self.int_n, self.bits_in_limb)
+ return bignum_common.bound_mpi_limbs(l, self.bits_in_limb)
+
+ @property
+ def r_inv(self) -> int:
+ return bignum_common.invmod(self.r, self.int_n)
+
+ @property
+ def r2(self) -> int: # pylint: disable=invalid-name
+ return pow(self.r, 2)
+
+class BignumModRawOperationArchSplit(BignumModRawOperation):
+ #pylint: disable=abstract-method
+ """Common features for bignum mod raw operations where the result depends on
+ the limb size."""
+
+ limb_sizes = [32, 64] # type: List[int]
+
+ def __init__(self, val_n: str, val_a: str, val_b: str = "0", bits_in_limb: int = 64) -> None:
+ super().__init__(val_n=val_n, val_a=val_a, val_b=val_b, bits_in_limb=bits_in_limb)
+
+ if bits_in_limb not in self.limb_sizes:
+ raise ValueError("Invalid number of bits in limb!")
+
+ self.dependencies = ["MBEDTLS_HAVE_INT{:d}".format(bits_in_limb)]
+
+ @classmethod
+ def generate_function_tests(cls) -> Iterator[test_case.TestCase]:
+ for a_value, b_value in cls.get_value_pairs():
+ for bil in cls.limb_sizes:
+ yield cls(a_value, b_value, bits_in_limb=bil).create_test_case()
# BEGIN MERGE SLOT 1
# END MERGE SLOT 1
diff --git a/tests/scripts/generate_bignum_tests.py b/tests/scripts/generate_bignum_tests.py
index 4ac9210..a105203 100755
--- a/tests/scripts/generate_bignum_tests.py
+++ b/tests/scripts/generate_bignum_tests.py
@@ -66,7 +66,7 @@
# Import modules containing additional test classes
# Test function classes in these modules will be registered by
# the framework
-from mbedtls_dev import bignum_core # pylint: disable=unused-import
+from mbedtls_dev import bignum_core, bignum_mod_raw # pylint: disable=unused-import
class BignumTarget(test_data_generation.BaseTarget, metaclass=ABCMeta):
#pylint: disable=abstract-method