From df1d8200ef3f5c56a6b8a2bd1ff440eb6bdd0439 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Tue, 20 Sep 2016 12:07:58 -0700 Subject: [PATCH 1/4] Fixed unused variable complaint when KEYGEN and OPENSSL_EXTRA are enabled and when AES and DES3 are disabled. --- src/ssl.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index a5b6b6196..faf439f18 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -3412,6 +3412,9 @@ static int wolfssl_encrypt_buffer_key(byte* der, word32 derSz, byte* password, byte key[AES_256_KEY_SIZE]; #endif + (void)derSz; + (void)passwordSz; + WOLFSSL_ENTER("wolfssl_encrypt_buffer_key"); if (der == NULL || password == NULL || info == NULL || info->ivSz == 0) { @@ -3438,26 +3441,29 @@ static int wolfssl_encrypt_buffer_key(byte* der, word32 derSz, byte* password, return SSL_FATAL_ERROR; } #else - (void) passwordSz; + #endif /* NO_MD5 */ + if (ret > 0) { + ret = SSL_BAD_FILE; /* Reset error return */ #ifndef NO_DES3 - if (XSTRNCMP(info->name, EVP_DES_CBC, EVP_DES_SIZE) == 0) - ret = wc_Des_CbcEncryptWithKey(der, der, derSz, key, info->iv); - else if (XSTRNCMP(info->name, EVP_DES_EDE3_CBC, EVP_DES_EDE3_SIZE) == 0) - ret = wc_Des3_CbcEncryptWithKey(der, der, derSz, key, info->iv); + if (XSTRNCMP(info->name, EVP_DES_CBC, EVP_DES_SIZE) == 0) + ret = wc_Des_CbcEncryptWithKey(der, der, derSz, key, info->iv); + else if (XSTRNCMP(info->name, EVP_DES_EDE3_CBC, EVP_DES_EDE3_SIZE) == 0) + ret = wc_Des3_CbcEncryptWithKey(der, der, derSz, key, info->iv); #endif /* NO_DES3 */ #ifndef NO_AES - if (XSTRNCMP(info->name, EVP_AES_128_CBC, EVP_AES_SIZE) == 0) - ret = wc_AesCbcEncryptWithKey(der, der, derSz, - key, AES_128_KEY_SIZE, info->iv); - else if (XSTRNCMP(info->name, EVP_AES_192_CBC, EVP_AES_SIZE) == 0) - ret = wc_AesCbcEncryptWithKey(der, der, derSz, - key, AES_192_KEY_SIZE, info->iv); - else if (XSTRNCMP(info->name, EVP_AES_256_CBC, EVP_AES_SIZE) == 0) - ret = wc_AesCbcEncryptWithKey(der, der, derSz, - key, AES_256_KEY_SIZE, info->iv); + if (XSTRNCMP(info->name, EVP_AES_128_CBC, EVP_AES_SIZE) == 0) + ret = wc_AesCbcEncryptWithKey(der, der, derSz, + key, AES_128_KEY_SIZE, info->iv); + else if (XSTRNCMP(info->name, EVP_AES_192_CBC, EVP_AES_SIZE) == 0) + ret = wc_AesCbcEncryptWithKey(der, der, derSz, + key, AES_192_KEY_SIZE, info->iv); + else if (XSTRNCMP(info->name, EVP_AES_256_CBC, EVP_AES_SIZE) == 0) + ret = wc_AesCbcEncryptWithKey(der, der, derSz, + key, AES_256_KEY_SIZE, info->iv); #endif /* NO_AES */ + } #ifdef WOLFSSL_SMALL_STACK XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER); From ef7183dcf77104bd6501325aa433ebd2f2c436f6 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Tue, 20 Sep 2016 15:59:08 -0700 Subject: [PATCH 2/4] delete redundant #else --- src/ssl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ssl.c b/src/ssl.c index faf439f18..8409b774f 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -3440,7 +3440,6 @@ static int wolfssl_encrypt_buffer_key(byte* der, word32 derSz, byte* password, #endif return SSL_FATAL_ERROR; } -#else #endif /* NO_MD5 */ From 95acd9c9075100c848f5408bfab4feb69df5319a Mon Sep 17 00:00:00 2001 From: John Safranek Date: Wed, 21 Sep 2016 07:32:17 -0700 Subject: [PATCH 3/4] Fixed unused variable complaints when KEYGEN and OPENSSL_EXTRA are enabled and when AES and MD5 are disabled. It was in the same encrypt function as before and in the paired decrypt function. --- src/ssl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 8409b774f..98bff0d2a 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -2416,7 +2416,9 @@ static const char *EVP_AES_256_CBC = "AES-256-CBC"; static const char *EVP_AES_192_CTR = "AES-192-CTR"; static const char *EVP_AES_256_CTR = "AES-256-CTR"; #endif +#ifndef NO_AES static const int EVP_AES_SIZE = 11; +#endif #ifndef NO_DES3 static const char *EVP_DES_CBC = "DES-CBC"; @@ -3331,6 +3333,9 @@ static int wolfssl_decrypt_buffer_key(DerBuffer* der, byte* password, byte key[AES_256_KEY_SIZE]; #endif + (void)passwordSz; + (void)key; + WOLFSSL_ENTER("wolfssl_decrypt_buffer_key"); if (der == NULL || password == NULL || info == NULL) { @@ -3362,8 +3367,7 @@ static int wolfssl_decrypt_buffer_key(DerBuffer* der, byte* password, #endif return SSL_FATAL_ERROR; } -#else - (void) passwordSz; + #endif /* NO_MD5 */ #ifndef NO_DES3 @@ -3414,6 +3418,7 @@ static int wolfssl_encrypt_buffer_key(byte* der, word32 derSz, byte* password, (void)derSz; (void)passwordSz; + (void)key; WOLFSSL_ENTER("wolfssl_encrypt_buffer_key"); From de81c81eae3f66217625bcd6e0ec47e6f554c37d Mon Sep 17 00:00:00 2001 From: John Safranek Date: Wed, 21 Sep 2016 10:21:03 -0700 Subject: [PATCH 4/4] Fixed unused variable complaints when OPENSSL_EXTRA and MD5 are enabled and when AES is disabled. --- src/ssl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ssl.c b/src/ssl.c index 98bff0d2a..34ecbf77e 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -9407,6 +9407,8 @@ int wolfSSL_set_compression(WOLFSSL* ssl) return 0; #endif + (void)type; + WOLFSSL_ENTER("wolfSSL_EVP_BytesToKey"); wc_InitMd5(md5); @@ -9425,6 +9427,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl) } else #endif /* NO_DES3 */ + #ifndef NO_AES if (XSTRNCMP(type, EVP_AES_128_CBC, EVP_AES_SIZE) == 0) { keyLen = AES_128_KEY_SIZE; ivLen = AES_IV_SIZE; @@ -9437,7 +9440,9 @@ int wolfSSL_set_compression(WOLFSSL* ssl) keyLen = AES_256_KEY_SIZE; ivLen = AES_IV_SIZE; } - else { + else + #endif /* NO_AES */ + { #ifdef WOLFSSL_SMALL_STACK XFREE(md5, NULL, DYNAMIC_TYPE_TMP_BUFFER); #endif