From f40bda7cb34dc85c42da1d17b2bff548c1a39ab9 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 9 Jun 2017 09:37:10 +0200 Subject: [PATCH 1/3] fix indentation --- src/misc/pkcs5/pkcs_5_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc/pkcs5/pkcs_5_test.c b/src/misc/pkcs5/pkcs_5_test.c index c247fe8..1268154 100644 --- a/src/misc/pkcs5/pkcs_5_test.c +++ b/src/misc/pkcs5/pkcs_5_test.c @@ -201,7 +201,7 @@ int pkcs_5_test (void) } else if (compare_testvector(DK, dkLen, cases_5_1[i].DK, cases_5_1[i].dkLen, "PKCS#5_1", i)) { ++failed; - } + } } /* testing alg 1_openssl */ From ec51f880b5c62aba55d01e6992b6130660ef84d1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 9 Jun 2017 09:50:24 +0200 Subject: [PATCH 2/3] Right hand side of assignment needs parenthesis --- src/misc/crypt/crypt_register_all_ciphers.c | 2 +- src/misc/crypt/crypt_register_all_hashes.c | 2 +- src/misc/crypt/crypt_register_all_prngs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc/crypt/crypt_register_all_ciphers.c b/src/misc/crypt/crypt_register_all_ciphers.c index 7d83acb..80db5d2 100644 --- a/src/misc/crypt/crypt_register_all_ciphers.c +++ b/src/misc/crypt/crypt_register_all_ciphers.c @@ -16,7 +16,7 @@ */ #define REGISTER_CIPHER(h) do {\ - LTC_ARGCHK((err = register_cipher(h) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \ + LTC_ARGCHK(((err = register_cipher(h)) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \ } while(0) int register_all_ciphers(void) diff --git a/src/misc/crypt/crypt_register_all_hashes.c b/src/misc/crypt/crypt_register_all_hashes.c index 64ec0cc..4493d8f 100644 --- a/src/misc/crypt/crypt_register_all_hashes.c +++ b/src/misc/crypt/crypt_register_all_hashes.c @@ -16,7 +16,7 @@ */ #define REGISTER_HASH(h) do {\ - LTC_ARGCHK((err = register_hash(h) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \ + LTC_ARGCHK(((err = register_hash(h)) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \ } while(0) int register_all_hashes(void) diff --git a/src/misc/crypt/crypt_register_all_prngs.c b/src/misc/crypt/crypt_register_all_prngs.c index ccd8a8c..3b9139d 100644 --- a/src/misc/crypt/crypt_register_all_prngs.c +++ b/src/misc/crypt/crypt_register_all_prngs.c @@ -16,7 +16,7 @@ */ #define REGISTER_PRNG(h) do {\ - LTC_ARGCHK((err = register_prng(h) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \ + LTC_ARGCHK(((err = register_prng(h)) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \ } while(0) int register_all_prngs(void) From 0bc0d5524591d806b236e938a0c7411d539fcee4 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 9 Jun 2017 15:14:35 +0200 Subject: [PATCH 3/3] refactor REGISTER_* --- src/misc/crypt/crypt_register_all_ciphers.c | 2 +- src/misc/crypt/crypt_register_all_hashes.c | 2 +- src/misc/crypt/crypt_register_all_prngs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc/crypt/crypt_register_all_ciphers.c b/src/misc/crypt/crypt_register_all_ciphers.c index 80db5d2..c8ec528 100644 --- a/src/misc/crypt/crypt_register_all_ciphers.c +++ b/src/misc/crypt/crypt_register_all_ciphers.c @@ -16,7 +16,7 @@ */ #define REGISTER_CIPHER(h) do {\ - LTC_ARGCHK(((err = register_cipher(h)) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \ + LTC_ARGCHK((err = register_cipher(h)) != -1); \ } while(0) int register_all_ciphers(void) diff --git a/src/misc/crypt/crypt_register_all_hashes.c b/src/misc/crypt/crypt_register_all_hashes.c index 4493d8f..e953332 100644 --- a/src/misc/crypt/crypt_register_all_hashes.c +++ b/src/misc/crypt/crypt_register_all_hashes.c @@ -16,7 +16,7 @@ */ #define REGISTER_HASH(h) do {\ - LTC_ARGCHK(((err = register_hash(h)) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \ + LTC_ARGCHK((err = register_hash(h)) != -1); \ } while(0) int register_all_hashes(void) diff --git a/src/misc/crypt/crypt_register_all_prngs.c b/src/misc/crypt/crypt_register_all_prngs.c index 3b9139d..08c6984 100644 --- a/src/misc/crypt/crypt_register_all_prngs.c +++ b/src/misc/crypt/crypt_register_all_prngs.c @@ -16,7 +16,7 @@ */ #define REGISTER_PRNG(h) do {\ - LTC_ARGCHK(((err = register_prng(h)) == -1 ? CRYPT_ERROR : CRYPT_OK) == CRYPT_OK); \ + LTC_ARGCHK((err = register_prng(h)) != -1); \ } while(0) int register_all_prngs(void)