New struct ecc_curve field, q_bit_size.

diff --git a/ChangeLog b/ChangeLog
index 5154cee4d1efc988a7178865df1aaee5b33fc5d2..a472f78fdc93bbc0da3ca81f5c7be1d35b7dbc4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-08-27  Niels Möller  <nisse@lysator.liu.se>
 
+       * ecc-internal.h (struct ecc_curve): New field q_bit_size. Updated
+       all instances.
+
        * configure.ac: Bumped package version number to 3.1.
        (LIBHOGWEED_MAJOR): Bumped library version to 4.0.
 

diff --git a/ecc-192.c b/ecc-192.c
index 29ff7f6a2ee00aff90ea2fae4905d052e3583790..8cd4bd0880e5fd10e2b1e928a997f697f8a8c17e 100644 (file)
--- a/ecc-192.c
+++ b/ecc-192.c
@@ -115,6 +115,7 @@ const struct ecc_curve nettle_secp_192r1 =
   192,
   ECC_LIMB_SIZE,
   ECC_BMODP_SIZE,
+  192,
   ECC_BMODQ_SIZE,
   USE_REDC,
   ECC_REDC_SIZE,

diff --git a/ecc-224.c b/ecc-224.c
index 8a99f0e38ad0ca5894d024e3e7c85e733c21948f..bb66acceaa2ae5b29101f51cbc2e04ad54d1feb8 100644 (file)
--- a/ecc-224.c
+++ b/ecc-224.c
@@ -59,6 +59,7 @@ const struct ecc_curve nettle_secp_224r1 =
   224,
   ECC_LIMB_SIZE,    
   ECC_BMODP_SIZE,
+  224,
   ECC_BMODQ_SIZE,
   USE_REDC,
   ECC_REDC_SIZE,

diff --git a/ecc-25519.c b/ecc-25519.c
index 3cbc60edee3024e94c5bed407c99edaab7118f49..a2a814b870841d81f37d26e670949667a8d2af2e 100644 (file)
--- a/ecc-25519.c
+++ b/ecc-25519.c
@@ -237,6 +237,7 @@ const struct ecc_curve nettle_curve25519 =
   255,
   ECC_LIMB_SIZE,
   ECC_BMODP_SIZE,
+  253,
   ECC_BMODQ_SIZE,
   0, /* No redc */
   0,

diff --git a/ecc-256.c b/ecc-256.c
index f888aafef92510ae555fad9e547ed5598ef4ec30..5c7de7799828db21c4131d8f209888faa8396d8d 100644 (file)
--- a/ecc-256.c
+++ b/ecc-256.c
@@ -224,6 +224,7 @@ const struct ecc_curve nettle_secp_256r1 =
   256,
   ECC_LIMB_SIZE,    
   ECC_BMODP_SIZE,
+  256,
   ECC_BMODQ_SIZE,
   USE_REDC,
   ECC_REDC_SIZE,

diff --git a/ecc-384.c b/ecc-384.c
index c20d8ab425dce7073e314b912a81e0911568b029..bd44366dd628af97b48d130dd8417f279e67f5c1 100644 (file)
--- a/ecc-384.c
+++ b/ecc-384.c
@@ -152,6 +152,7 @@ const struct ecc_curve nettle_secp_384r1 =
   384,
   ECC_LIMB_SIZE,    
   ECC_BMODP_SIZE,
+  384,
   ECC_BMODQ_SIZE,
   USE_REDC,
   ECC_REDC_SIZE,

diff --git a/ecc-521.c b/ecc-521.c
index 821c77c769681d7760cc0ea3bbfc9fe27187b7f1..62a33ca55d27d924a8c98018345a35cb505a1eb4 100644 (file)
--- a/ecc-521.c
+++ b/ecc-521.c
@@ -80,6 +80,7 @@ const struct ecc_curve nettle_secp_521r1 =
   521,
   ECC_LIMB_SIZE,    
   ECC_BMODP_SIZE,
+  521,
   ECC_BMODQ_SIZE,
   USE_REDC,
   ECC_REDC_SIZE,

diff --git a/ecc-internal.h b/ecc-internal.h
index d9e107303d092b722bf8cf5103c43dac28c84c14..214b47a4eb73ccecbfa47210e577d7bce7702548 100644 (file)
--- a/ecc-internal.h
+++ b/ecc-internal.h
@@ -106,6 +106,7 @@ struct ecc_curve
      coordinates. */
   unsigned short size;
   unsigned short Bmodp_size;
+  unsigned short q_bit_size;
   unsigned short Bmodq_size;
   unsigned short use_redc;
   /* +k if p+1 has k low zero limbs, -k if p-1 has k low zero