From 2159c20debef48e6f1be529384a8491d6922d3b4 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Tue, 21 Jan 2020 16:48:51 -0700 Subject: [PATCH] Update CLU, remove deprecated names --- wolfCLU/clu_include/genkey/clu_genkey.h | 6 ++-- wolfCLU/clu_src/benchmark/clu_benchmark.c | 42 ++++++++++++----------- wolfCLU/clu_src/crypto/clu_decrypt.c | 2 +- wolfCLU/clu_src/crypto/clu_encrypt.c | 2 +- wolfCLU/clu_src/genkey/clu_genkey.c | 7 ++-- wolfCLU/clu_src/hash/clu_hash_setup.c | 10 +++--- 6 files changed, 36 insertions(+), 33 deletions(-) diff --git a/wolfCLU/clu_include/genkey/clu_genkey.h b/wolfCLU/clu_include/genkey/clu_genkey.h index 5bc5dbc8..5d11bb20 100644 --- a/wolfCLU/clu_include/genkey/clu_genkey.h +++ b/wolfCLU/clu_include/genkey/clu_genkey.h @@ -61,7 +61,7 @@ int wolfCLU_genKey_ED25519(WC_RNG* rng, char* fOutNm, int directive, * * return 0 on success, non-zero on error */ -int wolfCLU_genKey_ECC(RNG* rng, char* fName, int directive, int fmt, +int wolfCLU_genKey_ECC(WC_RNG* rng, char* fName, int directive, int fmt, int keySz); /** @@ -76,7 +76,7 @@ int wolfCLU_genKey_ECC(RNG* rng, char* fName, int directive, int fmt, * * return 0 on success, non-zero on error */ -int wolfCLU_genKey_RSA(RNG* rng, char* fName, int directive, int fmt, +int wolfCLU_genKey_RSA(WC_RNG* rng, char* fName, int directive, int fmt, int keySz, long exp); /* generates key based on password provided @@ -87,7 +87,7 @@ int wolfCLU_genKey_RSA(RNG* rng, char* fName, int directive, int fmt, * @param salt the buffer to store the resulting salt after it's generated * @param pad a flag to let us know if there are padded bytes or not */ -int wolfCLU_genKey_PWDBASED(RNG* rng, byte* pwdKey, int size, byte* salt, +int wolfCLU_genKey_PWDBASED(WC_RNG* rng, byte* pwdKey, int size, byte* salt, int pad); #endif /* CLU_GENKEY_H */ diff --git a/wolfCLU/clu_src/benchmark/clu_benchmark.c b/wolfCLU/clu_src/benchmark/clu_benchmark.c index 2ed8606a..50c5f8fd 100644 --- a/wolfCLU/clu_src/benchmark/clu_benchmark.c +++ b/wolfCLU/clu_src/benchmark/clu_benchmark.c @@ -45,7 +45,7 @@ int wolfCLU_benchmark(int timer, int* option) Des3 des3; /* 3des declaration */ #endif - RNG rng; /* random number generator */ + WC_RNG rng; /* random number generator */ int ret = 0; /* return variable */ double stop = 0.0; /* stop breaks loop */ @@ -285,9 +285,10 @@ int wolfCLU_benchmark(int timer, int* option) #ifndef NO_MD5 /* md5 test */ if (option[i] == 1) { - Md5 md5; + wc_Md5 md5; - digest = XMALLOC(MD5_DIGEST_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); + digest = XMALLOC(WC_MD5_DIGEST_SIZE, HEAP_HINT, + DYNAMIC_TYPE_TMP_BUFFER); if (digest == NULL) return MEMORY_E; plain = XMALLOC(MEGABYTE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); @@ -313,7 +314,7 @@ int wolfCLU_benchmark(int timer, int* option) printf("MD5 "); wolfCLU_stats(start, MEGABYTE, blocks); XMEMSET(plain, 0, MEGABYTE); - XMEMSET(digest, 0, MD5_DIGEST_SIZE); + XMEMSET(digest, 0, WC_MD5_DIGEST_SIZE); wolfCLU_freeBins(digest, plain, NULL, NULL, NULL); blocks = 0; loop = 1; @@ -323,9 +324,10 @@ int wolfCLU_benchmark(int timer, int* option) #ifndef NO_SHA /* sha test */ if (option[i] == 1) { - Sha sha; + wc_Sha sha; - digest = XMALLOC(SHA_DIGEST_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); + digest = XMALLOC(WC_SHA_DIGEST_SIZE, HEAP_HINT, + DYNAMIC_TYPE_TMP_BUFFER); if (digest == NULL) return MEMORY_E; plain = XMALLOC(MEGABYTE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); @@ -351,7 +353,7 @@ int wolfCLU_benchmark(int timer, int* option) printf("Sha "); wolfCLU_stats(start, MEGABYTE, blocks); XMEMSET(plain, 0, MEGABYTE); - XMEMSET(digest, 0, SHA_DIGEST_SIZE); + XMEMSET(digest, 0, WC_SHA_DIGEST_SIZE); wolfCLU_freeBins(plain, digest, NULL, NULL, NULL); blocks = 0; loop = 1; @@ -359,10 +361,10 @@ int wolfCLU_benchmark(int timer, int* option) i++; #endif #ifndef NO_SHA256 - #define SHA256_SZ SHA256_DIGEST_SIZE + #define SHA256_SZ WC_SHA256_DIGEST_SIZE /* sha256 test */ if (option[i] == 1) { - Sha256 sha256; + wc_Sha256 sha256; digest = XMALLOC(SHA256_SZ, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); if (digest == NULL) @@ -391,7 +393,7 @@ int wolfCLU_benchmark(int timer, int* option) printf("Sha256 "); wolfCLU_stats(start, MEGABYTE, blocks); XMEMSET(plain, 0, MEGABYTE); - XMEMSET(digest, 0, SHA256_DIGEST_SIZE); + XMEMSET(digest, 0, WC_SHA256_DIGEST_SIZE); wolfCLU_freeBins(plain, digest, NULL, NULL, NULL); /* resets used for debug, uncomment if needed */ blocks = 0; @@ -400,10 +402,10 @@ int wolfCLU_benchmark(int timer, int* option) i++; #endif #ifdef WOLFSSL_SHA384 - #define SHA384_SZ SHA384_DIGEST_SIZE + #define SHA384_SZ WC_SHA384_DIGEST_SIZE /* sha384 test */ if (option[i] == 1) { - Sha384 sha384; + wc_Sha384 sha384; digest = XMALLOC(SHA384_SZ, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); if (digest == NULL) @@ -432,7 +434,7 @@ int wolfCLU_benchmark(int timer, int* option) printf("Sha384 "); wolfCLU_stats(start, MEGABYTE, blocks); XMEMSET(plain, 0, MEGABYTE); - XMEMSET(digest, 0, SHA384_DIGEST_SIZE); + XMEMSET(digest, 0, WC_SHA384_DIGEST_SIZE); wolfCLU_freeBins(plain, digest, NULL, NULL, NULL); blocks = 0; loop = 1; @@ -440,10 +442,10 @@ int wolfCLU_benchmark(int timer, int* option) i++; #endif #ifdef WOLFSSL_SHA512 - #define SHA512_SZ SHA512_DIGEST_SIZE + #define SHA512_SZ WC_SHA512_DIGEST_SIZE /* sha512 test */ if (option[i] == 1) { - Sha512 sha512; + wc_Sha512 sha512; digest = XMALLOC(SHA512_SZ, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); if (digest == NULL) @@ -472,7 +474,7 @@ int wolfCLU_benchmark(int timer, int* option) printf("Sha512 "); wolfCLU_stats(start, MEGABYTE, blocks); XMEMSET(plain, 0, MEGABYTE); - XMEMSET(digest, 0, SHA512_DIGEST_SIZE); + XMEMSET(digest, 0, WC_SHA512_DIGEST_SIZE); wolfCLU_freeBins(plain, digest, NULL, NULL, NULL); blocks = 0; loop = 1; @@ -484,7 +486,7 @@ int wolfCLU_benchmark(int timer, int* option) if (option[i] == 1) { Blake2b b2b; - digest = XMALLOC(BLAKE_DIGEST_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); + digest = XMALLOC(WC_BLAKE_DIGEST_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); if (digest == NULL) return MEMORY_E; plain = XMALLOC(MEGABYTE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); @@ -495,7 +497,7 @@ int wolfCLU_benchmark(int timer, int* option) wc_RNG_GenerateBlock(&rng, plain, MEGABYTE); - wc_InitBlake2b(&b2b, BLAKE_DIGEST_SIZE); + wc_InitBlake2b(&b2b, WC_BLAKE_DIGEST_SIZE); start = wolfCLU_getTime(); alarm(timer); @@ -507,11 +509,11 @@ int wolfCLU_benchmark(int timer, int* option) /* if stop >= timer, loop = 0 */ loop = (stop >= timer) ? 0 : 1; } - wc_Blake2bFinal(&b2b, digest, BLAKE_DIGEST_SIZE); + wc_Blake2bFinal(&b2b, digest, WC_BLAKE_DIGEST_SIZE); printf("Blake2b "); wolfCLU_stats(start, MEGABYTE, blocks); XMEMSET(plain, 0, MEGABYTE); - XMEMSET(digest, 0, BLAKE_DIGEST_SIZE); + XMEMSET(digest, 0, WC_BLAKE_DIGEST_SIZE); wolfCLU_freeBins(digest, plain, NULL, NULL, NULL); } #endif diff --git a/wolfCLU/clu_src/crypto/clu_decrypt.c b/wolfCLU/clu_src/crypto/clu_decrypt.c index aee5b057..9a1b2172 100644 --- a/wolfCLU/clu_src/crypto/clu_decrypt.c +++ b/wolfCLU/clu_src/crypto/clu_decrypt.c @@ -42,7 +42,7 @@ int wolfCLU_decrypt(char* alg, char* mode, byte* pwdKey, byte* key, int size, FILE* inFile; /* input file */ FILE* outFile; /* output file */ - RNG rng; /* random number generator */ + WC_RNG rng; /* random number generator */ byte* input = NULL; /* input buffer */ byte* output = NULL; /* output buffer */ byte salt[SALT_SIZE] = {0}; /* salt variable */ diff --git a/wolfCLU/clu_src/crypto/clu_encrypt.c b/wolfCLU/clu_src/crypto/clu_encrypt.c index 7ad7e2c6..580c1cae 100644 --- a/wolfCLU/clu_src/crypto/clu_encrypt.c +++ b/wolfCLU/clu_src/crypto/clu_encrypt.c @@ -43,7 +43,7 @@ int wolfCLU_encrypt(char* alg, char* mode, byte* pwdKey, byte* key, int size, FILE* inFile = NULL; /* input file */ FILE* outFile = NULL; /* output file */ - RNG rng; /* random number generator declaration */ + WC_RNG rng; /* random number generator declaration */ byte* input = NULL; /* input buffer */ byte* output = NULL; /* output buffer */ diff --git a/wolfCLU/clu_src/genkey/clu_genkey.c b/wolfCLU/clu_src/genkey/clu_genkey.c index 1ef1f46f..58e5efa3 100644 --- a/wolfCLU/clu_src/genkey/clu_genkey.c +++ b/wolfCLU/clu_src/genkey/clu_genkey.c @@ -146,7 +146,7 @@ int wolfCLU_genKey_ED25519(WC_RNG* rng, char* fOutNm, int directive, int format) } #endif /* HAVE_ED25519 */ -int wolfCLU_genKey_ECC(RNG* rng, char* fName, int directive, int fmt, +int wolfCLU_genKey_ECC(WC_RNG* rng, char* fName, int directive, int fmt, int keySz) { #ifdef HAVE_ECC @@ -297,7 +297,7 @@ int wolfCLU_genKey_ECC(RNG* rng, char* fName, int directive, int fmt, #endif /* HAVE_ECC */ } -int wolfCLU_genKey_RSA(RNG* rng, char* fName, int directive, int fmt, int +int wolfCLU_genKey_RSA(WC_RNG* rng, char* fName, int directive, int fmt, int keySz, long exp) { #ifndef NO_RSA @@ -451,7 +451,8 @@ int wolfCLU_genKey_RSA(RNG* rng, char* fName, int directive, int fmt, int /* * makes a cyptographically secure key by stretching a user entered pwdKey */ -int wolfCLU_genKey_PWDBASED(RNG* rng, byte* pwdKey, int size, byte* salt, int pad) +int wolfCLU_genKey_PWDBASED(WC_RNG* rng, byte* pwdKey, int size, byte* salt, + int pad) { int ret; /* return variable */ diff --git a/wolfCLU/clu_src/hash/clu_hash_setup.c b/wolfCLU/clu_src/hash/clu_hash_setup.c index 1b465104..8c3adf20 100644 --- a/wolfCLU/clu_src/hash/clu_hash_setup.c +++ b/wolfCLU/clu_src/hash/clu_hash_setup.c @@ -132,27 +132,27 @@ int wolfCLU_hashSetup(int argc, char** argv) /* sets default size of algorithm */ #ifndef NO_MD5 if (XSTRNCMP(alg, "md5", 3) == 0) - size = MD5_DIGEST_SIZE; + size = WC_MD5_DIGEST_SIZE; #endif #ifndef NO_SHA if (XSTRNCMP(alg, "sha", 3) == 0) - size = SHA_DIGEST_SIZE; + size = WC_SHA_DIGEST_SIZE; #endif #ifndef NO_SHA256 if (XSTRNCMP(alg, "sha256", 6) == 0) - size = SHA256_DIGEST_SIZE; + size = WC_SHA256_DIGEST_SIZE; #endif #ifdef WOLFSSL_SHA384 if (XSTRNCMP(alg, "sha384", 6) == 0) - size = SHA384_DIGEST_SIZE; + size = WC_SHA384_DIGEST_SIZE; #endif #ifdef WOLFSSL_SHA512 if (XSTRNCMP(alg, "sha512", 6) == 0) - size = SHA512_DIGEST_SIZE; + size = WC_SHA512_DIGEST_SIZE; #endif /* hashing function */