diff --git a/crypto_sign/rainbowIIIc-classic/clean/rainbow.c b/crypto_sign/rainbowIIIc-classic/clean/rainbow.c index efad695c..fc808689 100644 --- a/crypto_sign/rainbowIIIc-classic/clean/rainbow.c +++ b/crypto_sign/rainbowIIIc-classic/clean/rainbow.c @@ -15,8 +15,6 @@ #include #define MAX_ATTEMPT_FRMAT 128 -#define _MAX_O ((_O1 > _O2) ? _O1 : _O2) -#define _MAX_O_BYTE ((_O1_BYTE > _O2_BYTE) ? _O1_BYTE : _O2_BYTE) int PQCLEAN_RAINBOWIIICCLASSIC_CLEAN_rainbow_sign(uint8_t *signature, const sk_t *sk, const uint8_t *_digest) { uint8_t mat_l1[_O1 * _O1_BYTE]; diff --git a/crypto_sign/rainbowIIIc-classic/clean/rainbow_config.h b/crypto_sign/rainbowIIIc-classic/clean/rainbow_config.h index 6d9aa270..b8bb361d 100644 --- a/crypto_sign/rainbowIIIc-classic/clean/rainbow_config.h +++ b/crypto_sign/rainbowIIIc-classic/clean/rainbow_config.h @@ -9,6 +9,7 @@ #define _V1 68 #define _O1 36 #define _O2 36 +#define _MAX_O 36 #define _HASH_LEN 48 @@ -27,6 +28,7 @@ #define _V2_BYTE (_V2) #define _O1_BYTE (_O1) #define _O2_BYTE (_O2) +#define _MAX_O_BYTE (_MAX_O) #define _PUB_N_BYTE (_PUB_N) #define _PUB_M_BYTE (_PUB_M) diff --git a/crypto_sign/rainbowIIIc-cyclic-compressed/clean/rainbow.c b/crypto_sign/rainbowIIIc-cyclic-compressed/clean/rainbow.c index 7caa9107..4dc14cfa 100644 --- a/crypto_sign/rainbowIIIc-cyclic-compressed/clean/rainbow.c +++ b/crypto_sign/rainbowIIIc-cyclic-compressed/clean/rainbow.c @@ -15,8 +15,6 @@ #include #define MAX_ATTEMPT_FRMAT 128 -#define _MAX_O ((_O1 > _O2) ? _O1 : _O2) -#define _MAX_O_BYTE ((_O1_BYTE > _O2_BYTE) ? _O1_BYTE : _O2_BYTE) int PQCLEAN_RAINBOWIIICCYCLICCOMPRESSED_CLEAN_rainbow_sign(uint8_t *signature, const sk_t *sk, const uint8_t *_digest) { uint8_t mat_l1[_O1 * _O1_BYTE]; diff --git a/crypto_sign/rainbowIIIc-cyclic-compressed/clean/rainbow_config.h b/crypto_sign/rainbowIIIc-cyclic-compressed/clean/rainbow_config.h index 6d9aa270..b8bb361d 100644 --- a/crypto_sign/rainbowIIIc-cyclic-compressed/clean/rainbow_config.h +++ b/crypto_sign/rainbowIIIc-cyclic-compressed/clean/rainbow_config.h @@ -9,6 +9,7 @@ #define _V1 68 #define _O1 36 #define _O2 36 +#define _MAX_O 36 #define _HASH_LEN 48 @@ -27,6 +28,7 @@ #define _V2_BYTE (_V2) #define _O1_BYTE (_O1) #define _O2_BYTE (_O2) +#define _MAX_O_BYTE (_MAX_O) #define _PUB_N_BYTE (_PUB_N) #define _PUB_M_BYTE (_PUB_M) diff --git a/crypto_sign/rainbowIIIc-cyclic/clean/rainbow.c b/crypto_sign/rainbowIIIc-cyclic/clean/rainbow.c index 234d5853..840a2603 100644 --- a/crypto_sign/rainbowIIIc-cyclic/clean/rainbow.c +++ b/crypto_sign/rainbowIIIc-cyclic/clean/rainbow.c @@ -15,8 +15,6 @@ #include #define MAX_ATTEMPT_FRMAT 128 -#define _MAX_O ((_O1 > _O2) ? _O1 : _O2) -#define _MAX_O_BYTE ((_O1_BYTE > _O2_BYTE) ? _O1_BYTE : _O2_BYTE) int PQCLEAN_RAINBOWIIICCYCLIC_CLEAN_rainbow_sign(uint8_t *signature, const sk_t *sk, const uint8_t *_digest) { uint8_t mat_l1[_O1 * _O1_BYTE]; diff --git a/crypto_sign/rainbowIIIc-cyclic/clean/rainbow_config.h b/crypto_sign/rainbowIIIc-cyclic/clean/rainbow_config.h index 6d9aa270..b8bb361d 100644 --- a/crypto_sign/rainbowIIIc-cyclic/clean/rainbow_config.h +++ b/crypto_sign/rainbowIIIc-cyclic/clean/rainbow_config.h @@ -9,6 +9,7 @@ #define _V1 68 #define _O1 36 #define _O2 36 +#define _MAX_O 36 #define _HASH_LEN 48 @@ -27,6 +28,7 @@ #define _V2_BYTE (_V2) #define _O1_BYTE (_O1) #define _O2_BYTE (_O2) +#define _MAX_O_BYTE (_MAX_O) #define _PUB_N_BYTE (_PUB_N) #define _PUB_M_BYTE (_PUB_M) diff --git a/crypto_sign/rainbowIa-classic/clean/rainbow.c b/crypto_sign/rainbowIa-classic/clean/rainbow.c index 017c263a..3ffd0c1c 100644 --- a/crypto_sign/rainbowIa-classic/clean/rainbow.c +++ b/crypto_sign/rainbowIa-classic/clean/rainbow.c @@ -15,8 +15,6 @@ #include #define MAX_ATTEMPT_FRMAT 128 -#define _MAX_O ((_O1 > _O2) ? _O1 : _O2) -#define _MAX_O_BYTE ((_O1_BYTE > _O2_BYTE) ? _O1_BYTE : _O2_BYTE) int PQCLEAN_RAINBOWIACLASSIC_CLEAN_rainbow_sign(uint8_t *signature, const sk_t *sk, const uint8_t *_digest) { uint8_t mat_l1[_O1 * _O1_BYTE]; diff --git a/crypto_sign/rainbowIa-classic/clean/rainbow_config.h b/crypto_sign/rainbowIa-classic/clean/rainbow_config.h index 2222abe1..36075368 100644 --- a/crypto_sign/rainbowIa-classic/clean/rainbow_config.h +++ b/crypto_sign/rainbowIa-classic/clean/rainbow_config.h @@ -10,6 +10,7 @@ #define _V1 32 #define _O1 32 #define _O2 32 +#define _MAX_O 32 #define _HASH_LEN 32 @@ -28,6 +29,7 @@ #define _V2_BYTE (_V2 / 2) #define _O1_BYTE (_O1 / 2) #define _O2_BYTE (_O2 / 2) +#define _MAX_O_BYTE (_MAX_O / 2) #define _PUB_N_BYTE (_PUB_N / 2) #define _PUB_M_BYTE (_PUB_M / 2) diff --git a/crypto_sign/rainbowIa-cyclic-compressed/clean/rainbow.c b/crypto_sign/rainbowIa-cyclic-compressed/clean/rainbow.c index 916df6ec..c25cabac 100644 --- a/crypto_sign/rainbowIa-cyclic-compressed/clean/rainbow.c +++ b/crypto_sign/rainbowIa-cyclic-compressed/clean/rainbow.c @@ -15,8 +15,6 @@ #include #define MAX_ATTEMPT_FRMAT 128 -#define _MAX_O ((_O1 > _O2) ? _O1 : _O2) -#define _MAX_O_BYTE ((_O1_BYTE > _O2_BYTE) ? _O1_BYTE : _O2_BYTE) int PQCLEAN_RAINBOWIACYCLICCOMPRESSED_CLEAN_rainbow_sign(uint8_t *signature, const sk_t *sk, const uint8_t *_digest) { uint8_t mat_l1[_O1 * _O1_BYTE]; diff --git a/crypto_sign/rainbowIa-cyclic-compressed/clean/rainbow_config.h b/crypto_sign/rainbowIa-cyclic-compressed/clean/rainbow_config.h index 2222abe1..36075368 100644 --- a/crypto_sign/rainbowIa-cyclic-compressed/clean/rainbow_config.h +++ b/crypto_sign/rainbowIa-cyclic-compressed/clean/rainbow_config.h @@ -10,6 +10,7 @@ #define _V1 32 #define _O1 32 #define _O2 32 +#define _MAX_O 32 #define _HASH_LEN 32 @@ -28,6 +29,7 @@ #define _V2_BYTE (_V2 / 2) #define _O1_BYTE (_O1 / 2) #define _O2_BYTE (_O2 / 2) +#define _MAX_O_BYTE (_MAX_O / 2) #define _PUB_N_BYTE (_PUB_N / 2) #define _PUB_M_BYTE (_PUB_M / 2) diff --git a/crypto_sign/rainbowIa-cyclic/clean/rainbow.c b/crypto_sign/rainbowIa-cyclic/clean/rainbow.c index 0646eeb5..a4b6f45e 100644 --- a/crypto_sign/rainbowIa-cyclic/clean/rainbow.c +++ b/crypto_sign/rainbowIa-cyclic/clean/rainbow.c @@ -15,8 +15,6 @@ #include #define MAX_ATTEMPT_FRMAT 128 -#define _MAX_O ((_O1 > _O2) ? _O1 : _O2) -#define _MAX_O_BYTE ((_O1_BYTE > _O2_BYTE) ? _O1_BYTE : _O2_BYTE) int PQCLEAN_RAINBOWIACYCLIC_CLEAN_rainbow_sign(uint8_t *signature, const sk_t *sk, const uint8_t *_digest) { uint8_t mat_l1[_O1 * _O1_BYTE]; diff --git a/crypto_sign/rainbowIa-cyclic/clean/rainbow_config.h b/crypto_sign/rainbowIa-cyclic/clean/rainbow_config.h index 2222abe1..36075368 100644 --- a/crypto_sign/rainbowIa-cyclic/clean/rainbow_config.h +++ b/crypto_sign/rainbowIa-cyclic/clean/rainbow_config.h @@ -10,6 +10,7 @@ #define _V1 32 #define _O1 32 #define _O2 32 +#define _MAX_O 32 #define _HASH_LEN 32 @@ -28,6 +29,7 @@ #define _V2_BYTE (_V2 / 2) #define _O1_BYTE (_O1 / 2) #define _O2_BYTE (_O2 / 2) +#define _MAX_O_BYTE (_MAX_O / 2) #define _PUB_N_BYTE (_PUB_N / 2) #define _PUB_M_BYTE (_PUB_M / 2) diff --git a/crypto_sign/rainbowVc-classic/clean/rainbow.c b/crypto_sign/rainbowVc-classic/clean/rainbow.c index dc2cd846..97f7616a 100644 --- a/crypto_sign/rainbowVc-classic/clean/rainbow.c +++ b/crypto_sign/rainbowVc-classic/clean/rainbow.c @@ -15,8 +15,6 @@ #include #define MAX_ATTEMPT_FRMAT 128 -#define _MAX_O ((_O1 > _O2) ? _O1 : _O2) -#define _MAX_O_BYTE ((_O1_BYTE > _O2_BYTE) ? _O1_BYTE : _O2_BYTE) int PQCLEAN_RAINBOWVCCLASSIC_CLEAN_rainbow_sign(uint8_t *signature, const sk_t *sk, const uint8_t *_digest) { uint8_t mat_l1[_O1 * _O1_BYTE]; diff --git a/crypto_sign/rainbowVc-classic/clean/rainbow_config.h b/crypto_sign/rainbowVc-classic/clean/rainbow_config.h index 979aa244..f691dfb1 100644 --- a/crypto_sign/rainbowVc-classic/clean/rainbow_config.h +++ b/crypto_sign/rainbowVc-classic/clean/rainbow_config.h @@ -9,6 +9,7 @@ #define _V1 92 #define _O1 48 #define _O2 48 +#define _MAX_O 48 #define _HASH_LEN 64 @@ -27,6 +28,7 @@ #define _V2_BYTE (_V2) #define _O1_BYTE (_O1) #define _O2_BYTE (_O2) +#define _MAX_O_BYTE (_MAX_O) #define _PUB_N_BYTE (_PUB_N) #define _PUB_M_BYTE (_PUB_M) diff --git a/crypto_sign/rainbowVc-cyclic-compressed/clean/rainbow.c b/crypto_sign/rainbowVc-cyclic-compressed/clean/rainbow.c index da152041..76fc6879 100644 --- a/crypto_sign/rainbowVc-cyclic-compressed/clean/rainbow.c +++ b/crypto_sign/rainbowVc-cyclic-compressed/clean/rainbow.c @@ -15,8 +15,6 @@ #include #define MAX_ATTEMPT_FRMAT 128 -#define _MAX_O ((_O1 > _O2) ? _O1 : _O2) -#define _MAX_O_BYTE ((_O1_BYTE > _O2_BYTE) ? _O1_BYTE : _O2_BYTE) int PQCLEAN_RAINBOWVCCYCLICCOMPRESSED_CLEAN_rainbow_sign(uint8_t *signature, const sk_t *sk, const uint8_t *_digest) { uint8_t mat_l1[_O1 * _O1_BYTE]; diff --git a/crypto_sign/rainbowVc-cyclic-compressed/clean/rainbow_config.h b/crypto_sign/rainbowVc-cyclic-compressed/clean/rainbow_config.h index 979aa244..f691dfb1 100644 --- a/crypto_sign/rainbowVc-cyclic-compressed/clean/rainbow_config.h +++ b/crypto_sign/rainbowVc-cyclic-compressed/clean/rainbow_config.h @@ -9,6 +9,7 @@ #define _V1 92 #define _O1 48 #define _O2 48 +#define _MAX_O 48 #define _HASH_LEN 64 @@ -27,6 +28,7 @@ #define _V2_BYTE (_V2) #define _O1_BYTE (_O1) #define _O2_BYTE (_O2) +#define _MAX_O_BYTE (_MAX_O) #define _PUB_N_BYTE (_PUB_N) #define _PUB_M_BYTE (_PUB_M) diff --git a/crypto_sign/rainbowVc-cyclic/clean/rainbow.c b/crypto_sign/rainbowVc-cyclic/clean/rainbow.c index 1e81915b..6d8631ad 100644 --- a/crypto_sign/rainbowVc-cyclic/clean/rainbow.c +++ b/crypto_sign/rainbowVc-cyclic/clean/rainbow.c @@ -15,8 +15,6 @@ #include #define MAX_ATTEMPT_FRMAT 128 -#define _MAX_O ((_O1 > _O2) ? _O1 : _O2) -#define _MAX_O_BYTE ((_O1_BYTE > _O2_BYTE) ? _O1_BYTE : _O2_BYTE) int PQCLEAN_RAINBOWVCCYCLIC_CLEAN_rainbow_sign(uint8_t *signature, const sk_t *sk, const uint8_t *_digest) { uint8_t mat_l1[_O1 * _O1_BYTE]; diff --git a/crypto_sign/rainbowVc-cyclic/clean/rainbow_config.h b/crypto_sign/rainbowVc-cyclic/clean/rainbow_config.h index 979aa244..f691dfb1 100644 --- a/crypto_sign/rainbowVc-cyclic/clean/rainbow_config.h +++ b/crypto_sign/rainbowVc-cyclic/clean/rainbow_config.h @@ -9,6 +9,7 @@ #define _V1 92 #define _O1 48 #define _O2 48 +#define _MAX_O 48 #define _HASH_LEN 64 @@ -27,6 +28,7 @@ #define _V2_BYTE (_V2) #define _O1_BYTE (_O1) #define _O2_BYTE (_O2) +#define _MAX_O_BYTE (_MAX_O) #define _PUB_N_BYTE (_PUB_N) #define _PUB_M_BYTE (_PUB_M)