From 05b0f6d9cc027283a85e66afd7354117369145b5 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Tue, 19 Mar 2019 13:28:15 +0000 Subject: [PATCH] Namespace the #define constants. --- crypto_kem/kyber768/clean/api.h | 10 +++++----- crypto_sign/dilithium-iii/clean/api.h | 8 ++++---- test/crypto_kem/functest.c | 7 +++++++ test/crypto_kem/testvectors.c | 5 +++++ test/crypto_sign/functest.c | 6 ++++++ test/crypto_sign/testvectors.c | 4 ++++ 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/crypto_kem/kyber768/clean/api.h b/crypto_kem/kyber768/clean/api.h index ee269c8b..737a208e 100644 --- a/crypto_kem/kyber768/clean/api.h +++ b/crypto_kem/kyber768/clean/api.h @@ -5,12 +5,12 @@ #include "params.h" -#define CRYPTO_SECRETKEYBYTES KYBER_SECRETKEYBYTES -#define CRYPTO_PUBLICKEYBYTES KYBER_PUBLICKEYBYTES -#define CRYPTO_CIPHERTEXTBYTES KYBER_CIPHERTEXTBYTES -#define CRYPTO_BYTES KYBER_SYMBYTES +#define PQCLEAN_KYBER768_CLEAN_CRYPTO_SECRETKEYBYTES KYBER_SECRETKEYBYTES +#define PQCLEAN_KYBER768_CLEAN_CRYPTO_PUBLICKEYBYTES KYBER_PUBLICKEYBYTES +#define PQCLEAN_KYBER768_CLEAN_CRYPTO_CIPHERTEXTBYTES KYBER_CIPHERTEXTBYTES +#define PQCLEAN_KYBER768_CLEAN_CRYPTO_BYTES KYBER_SYMBYTES -#define CRYPTO_ALGNAME "Kyber768" +#define PQCLEAN_KYBER768_CLEAN_CRYPTO_ALGNAME "Kyber768" int PQCLEAN_KYBER768_CLEAN_crypto_kem_keypair(uint8_t *pk, uint8_t *sk); diff --git a/crypto_sign/dilithium-iii/clean/api.h b/crypto_sign/dilithium-iii/clean/api.h index c6e80d95..c9c15380 100644 --- a/crypto_sign/dilithium-iii/clean/api.h +++ b/crypto_sign/dilithium-iii/clean/api.h @@ -7,11 +7,11 @@ #define MODE 2 -#define CRYPTO_PUBLICKEYBYTES 1472U -#define CRYPTO_SECRETKEYBYTES 3504U -#define CRYPTO_BYTES 2701U +#define PQCLEAN_DILITHIUMIII_CLEAN_CRYPTO_PUBLICKEYBYTES 1472U +#define PQCLEAN_DILITHIUMIII_CLEAN_CRYPTO_SECRETKEYBYTES 3504U +#define PQCLEAN_DILITHIUMIII_CLEAN_CRYPTO_BYTES 2701U -#define CRYPTO_ALGNAME "Dilithium-III" +#define PQCLEAN_DILITHIUMIII_CLEAN_CRYPTO_ALGNAME "Dilithium-III" int PQCLEAN_DILITHIUMIII_CLEAN_crypto_sign_keypair(uint8_t *pk, uint8_t *sk); diff --git a/test/crypto_kem/functest.c b/test/crypto_kem/functest.c index 88e2764b..5a513810 100644 --- a/test/crypto_kem/functest.c +++ b/test/crypto_kem/functest.c @@ -34,6 +34,12 @@ static int check_canary(const uint8_t *d) { #define EVALUATOR(x, y) PASTER(x, y) #define NAMESPACE(fun) EVALUATOR(PQCLEAN_NAMESPACE, fun) +#define CRYPTO_BYTES NAMESPACE(CRYPTO_BYTES) +#define CRYPTO_PUBLICKEYBYTES NAMESPACE(CRYPTO_PUBLICKEYBYTES) +#define CRYPTO_SECRETKEYBYTES NAMESPACE(CRYPTO_SECRETKEYBYTES) +#define CRYPTO_CIPHERTEXTBYTES NAMESPACE(CRYPTO_CIPHERTEXTBYTES) +#define CRYPTO_ALGNAME NAMESPACE(CRYPTO_ALGNAME) + #define crypto_kem_keypair NAMESPACE(crypto_kem_keypair) #define crypto_kem_enc NAMESPACE(crypto_kem_enc) #define crypto_kem_dec NAMESPACE(crypto_kem_dec) @@ -190,6 +196,7 @@ static int test_invalid_ciphertext(void) { } int main(void) { + puts(CRYPTO_ALGNAME); int result = 0; result += test_keys(); result += test_invalid_sk_a(); diff --git a/test/crypto_kem/testvectors.c b/test/crypto_kem/testvectors.c index 6fbdc880..516b5886 100644 --- a/test/crypto_kem/testvectors.c +++ b/test/crypto_kem/testvectors.c @@ -21,6 +21,11 @@ static void printbytes(const uint8_t *x, size_t xlen) { #define EVALUATOR(x, y) PASTER(x, y) #define NAMESPACE(fun) EVALUATOR(PQCLEAN_NAMESPACE, fun) +#define CRYPTO_BYTES NAMESPACE(CRYPTO_BYTES) +#define CRYPTO_PUBLICKEYBYTES NAMESPACE(CRYPTO_PUBLICKEYBYTES) +#define CRYPTO_SECRETKEYBYTES NAMESPACE(CRYPTO_SECRETKEYBYTES) +#define CRYPTO_CIPHERTEXTBYTES NAMESPACE(CRYPTO_CIPHERTEXTBYTES) + #define crypto_kem_keypair NAMESPACE(crypto_kem_keypair) #define crypto_kem_enc NAMESPACE(crypto_kem_enc) #define crypto_kem_dec NAMESPACE(crypto_kem_dec) diff --git a/test/crypto_sign/functest.c b/test/crypto_sign/functest.c index 42a73cf6..11938648 100644 --- a/test/crypto_sign/functest.c +++ b/test/crypto_sign/functest.c @@ -36,6 +36,11 @@ static int check_canary(const uint8_t *d) { #define EVALUATOR(x, y) PASTER(x, y) #define NAMESPACE(fun) EVALUATOR(PQCLEAN_NAMESPACE, fun) +#define CRYPTO_PUBLICKEYBYTES NAMESPACE(CRYPTO_PUBLICKEYBYTES) +#define CRYPTO_SECRETKEYBYTES NAMESPACE(CRYPTO_SECRETKEYBYTES) +#define CRYPTO_BYTES NAMESPACE(CRYPTO_BYTES) +#define CRYPTO_ALGNAME NAMESPACE(CRYPTO_ALGNAME) + #define crypto_sign_keypair NAMESPACE(crypto_sign_keypair) #define crypto_sign NAMESPACE(crypto_sign) #define crypto_sign_open NAMESPACE(crypto_sign_open) @@ -155,6 +160,7 @@ static int test_wrong_pk(void) { } int main(void) { + puts(CRYPTO_ALGNAME); int result = 0; result += test_sign(); result += test_wrong_pk(); diff --git a/test/crypto_sign/testvectors.c b/test/crypto_sign/testvectors.c index dcbc4e38..7cf87cf3 100644 --- a/test/crypto_sign/testvectors.c +++ b/test/crypto_sign/testvectors.c @@ -22,6 +22,10 @@ static void printbytes(const uint8_t *x, size_t xlen) { #define EVALUATOR(x, y) PASTER(x, y) #define NAMESPACE(fun) EVALUATOR(PQCLEAN_NAMESPACE, fun) +#define CRYPTO_PUBLICKEYBYTES NAMESPACE(CRYPTO_PUBLICKEYBYTES) +#define CRYPTO_SECRETKEYBYTES NAMESPACE(CRYPTO_SECRETKEYBYTES) +#define CRYPTO_BYTES NAMESPACE(CRYPTO_BYTES) + #define crypto_sign_keypair NAMESPACE(crypto_sign_keypair) #define crypto_sign NAMESPACE(crypto_sign) #define crypto_sign_open NAMESPACE(crypto_sign_open)