Skip to content

register_all_* should return CRYPT_OK on success #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karel-m merged 1 commit into from
Oct 19, 2017
Merged

register_all_* should return CRYPT_OK on success #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/misc/crypt/crypt_register_all_ciphers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
*/

#define REGISTER_CIPHER(h) do {\
LTC_ARGCHK((err = register_cipher(h)) != -1); \
LTC_ARGCHK(register_cipher(h) != -1); \
} while(0)

int register_all_ciphers(void)
{
int err = CRYPT_NOP;

#ifdef LTC_RIJNDAEL
#ifdef ENCRYPT_ONLY
/* alternative would be
Expand Down Expand Up @@ -100,7 +98,7 @@ int register_all_ciphers(void)
#ifdef LTC_SERPENT
REGISTER_CIPHER(&serpent_desc);
#endif
return err;
return CRYPT_OK;
}

/* ref: $Format:%D$ */
Expand Down
7 changes: 3 additions & 4 deletions src/misc/crypt/crypt_register_all_hashes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@
*/

#define REGISTER_HASH(h) do {\
LTC_ARGCHK((err = register_hash(h)) != -1); \
LTC_ARGCHK(register_hash(h) != -1); \
} while(0)

int register_all_hashes(void)
{
int err = CRYPT_NOP;
#ifdef LTC_TIGER
REGISTER_HASH(&tiger_desc);
#endif
Expand Down Expand Up @@ -90,9 +89,9 @@ int register_all_hashes(void)
#endif
#ifdef LTC_CHC_HASH
REGISTER_HASH(&chc_desc);
LTC_ARGCHK((err = chc_register(find_cipher_any("aes", 8, 16))) == CRYPT_OK);
LTC_ARGCHK(chc_register(find_cipher_any("aes", 8, 16)) == CRYPT_OK);
#endif
return err;
return CRYPT_OK;
}

/* ref: $Format:%D$ */
Expand Down
5 changes: 2 additions & 3 deletions src/misc/crypt/crypt_register_all_prngs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@
*/

#define REGISTER_PRNG(h) do {\
LTC_ARGCHK((err = register_prng(h)) != -1); \
LTC_ARGCHK(register_prng(h) != -1); \
} while(0)

int register_all_prngs(void)
{
int err = CRYPT_NOP;
#ifdef LTC_YARROW
REGISTER_PRNG(&yarrow_desc);
#endif
Expand All @@ -41,7 +40,7 @@ int register_all_prngs(void)
REGISTER_PRNG(&sprng_desc);
#endif

return err;
return CRYPT_OK;
}

/* ref: $Format:%D$ */
Expand Down
15 changes: 12 additions & 3 deletions tests/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,18 @@ static void register_algs(void)
#ifndef LTC_YARROW
#error This demo requires Yarrow.
#endif
register_all_ciphers();
register_all_hashes();
register_all_prngs();
if ((err = register_all_ciphers()) != CRYPT_OK) {
fprintf(stderr, "register_all_ciphers err=%s\n", error_to_string(err));
exit(EXIT_FAILURE);
}
if ((err = register_all_hashes()) != CRYPT_OK) {
fprintf(stderr, "register_all_hashes err=%s\n", error_to_string(err));
exit(EXIT_FAILURE);
}
if ((err = register_all_prngs()) != CRYPT_OK) {
fprintf(stderr, "register_all_prngs err=%s\n", error_to_string(err));
exit(EXIT_FAILURE);
}

if ((err = rng_make_prng(128, find_prng("yarrow"), &yarrow_prng, NULL)) != CRYPT_OK) {
fprintf(stderr, "rng_make_prng failed: %s\n", error_to_string(err));
Expand Down