Update MQDSS to v2.1 (open-quantum-safe#725)

onavratil-monetplus · Apr 24, 2020 · 2dae6ea · 2dae6ea
1 parent c103f7b
commit 2dae6ea
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/src/sig/mqdss/pqclean_mqdss-48_clean/api.h b/src/sig/mqdss/pqclean_mqdss-48_clean/api.h
@@ -8,7 +8,7 @@
 
 #define PQCLEAN_MQDSS48_CLEAN_CRYPTO_SECRETKEYBYTES 16
 #define PQCLEAN_MQDSS48_CLEAN_CRYPTO_PUBLICKEYBYTES 46
-#define PQCLEAN_MQDSS48_CLEAN_CRYPTO_BYTES 20854
+#define PQCLEAN_MQDSS48_CLEAN_CRYPTO_BYTES 28400
 
 /*
  * Generates an MQDSS key pair.

diff --git a/src/sig/mqdss/pqclean_mqdss-48_clean/params.h b/src/sig/mqdss/pqclean_mqdss-48_clean/params.h
@@ -5,7 +5,7 @@
 #define M N
 #define F_LEN (M * (((N * (N + 1)) >> 1) + N)) /* Number of elements in F */
 
-#define ROUNDS 135
+#define ROUNDS 184
 
 /* Number of bytes that N, M and F_LEN elements require when packed into a byte
    array, 5-bit elements packed continuously. */

diff --git a/src/sig/mqdss/pqclean_mqdss-64_clean/api.h b/src/sig/mqdss/pqclean_mqdss-64_clean/api.h
@@ -8,7 +8,7 @@
 
 #define PQCLEAN_MQDSS64_CLEAN_CRYPTO_SECRETKEYBYTES 24
 #define PQCLEAN_MQDSS64_CLEAN_CRYPTO_PUBLICKEYBYTES 64
-#define PQCLEAN_MQDSS64_CLEAN_CRYPTO_BYTES 43728
+#define PQCLEAN_MQDSS64_CLEAN_CRYPTO_BYTES 59928
 
 /*
  * Generates an MQDSS key pair.

diff --git a/src/sig/mqdss/pqclean_mqdss-64_clean/params.h b/src/sig/mqdss/pqclean_mqdss-64_clean/params.h
@@ -5,7 +5,7 @@
 #define M N
 #define F_LEN (M * (((N * (N + 1)) >> 1) + N)) /* Number of elements in F */
 
-#define ROUNDS 202
+#define ROUNDS 277
 
 /* Number of bytes that N, M and F_LEN elements require when packed into a byte
    array, 5-bit elements packed continuously. */

diff --git a/src/sig/mqdss/sig_mqdss.h b/src/sig/mqdss/sig_mqdss.h
@@ -6,7 +6,7 @@
 #ifdef OQS_ENABLE_SIG_mqdss_31_48
 #define OQS_SIG_mqdss_31_48_length_public_key 46
 #define OQS_SIG_mqdss_31_48_length_secret_key 16
-#define OQS_SIG_mqdss_31_48_length_signature 20854
+#define OQS_SIG_mqdss_31_48_length_signature 28400
 
 OQS_SIG *OQS_SIG_mqdss_31_48_new(void);
 OQS_API OQS_STATUS OQS_SIG_mqdss_31_48_keypair(uint8_t *public_key, uint8_t *secret_key);
@@ -17,7 +17,7 @@ OQS_API OQS_STATUS OQS_SIG_mqdss_31_48_verify(const uint8_t *message, size_t mes
 #ifdef OQS_ENABLE_SIG_mqdss_31_64
 #define OQS_SIG_mqdss_31_64_length_public_key 64
 #define OQS_SIG_mqdss_31_64_length_secret_key 24
-#define OQS_SIG_mqdss_31_64_length_signature 43728
+#define OQS_SIG_mqdss_31_64_length_signature 59928
 
 OQS_SIG *OQS_SIG_mqdss_31_64_new(void);
 OQS_API OQS_STATUS OQS_SIG_mqdss_31_64_keypair(uint8_t *public_key, uint8_t *secret_key);

diff --git a/src/sig/mqdss/sig_mqdss_31_48.c b/src/sig/mqdss/sig_mqdss_31_48.c
@@ -11,7 +11,7 @@ OQS_SIG *OQS_SIG_mqdss_31_48_new() {
 		return NULL;
 	}
 	sig->method_name = OQS_SIG_alg_mqdss_31_48;
-	sig->alg_version = "https://github.com/joostrijneveld/MQDSS/commit/0c64d4d67a37051c1299a3049a5bb8984ca27ecc";
+	sig->alg_version = "https://github.com/joostrijneveld/MQDSS/commit/00608d7610262ff07b1834885d32bc3fd27ef5e1";
 
 	sig->claimed_nist_level = 1;
 	sig->euf_cma = true;

diff --git a/src/sig/mqdss/sig_mqdss_31_64.c b/src/sig/mqdss/sig_mqdss_31_64.c
@@ -11,7 +11,7 @@ OQS_SIG *OQS_SIG_mqdss_31_64_new() {
 		return NULL;
 	}
 	sig->method_name = OQS_SIG_alg_mqdss_31_64;
-	sig->alg_version = "https://github.com/joostrijneveld/MQDSS/commit/0c64d4d67a37051c1299a3049a5bb8984ca27ecc";
+	sig->alg_version = "https://github.com/joostrijneveld/MQDSS/commit/00608d7610262ff07b1834885d32bc3fd27ef5e1";
 
 	sig->claimed_nist_level = 3;
 	sig->euf_cma = true;

diff --git a/tests/KATs/sig/MQDSS-31-48.kat b/tests/KATs/sig/MQDSS-31-48.kat
diff --git a/tests/KATs/sig/MQDSS-31-64.kat b/tests/KATs/sig/MQDSS-31-64.kat