feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for expected Configurations Test - NIGHTLY BUILD #265 and ifdef cleanup.

Browse Source
This commit is contained in:
David Garske
2018-04-24 13:32:48 -07:00
parent ff1559275d
commit 089e1b6b9b
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ssl.c
View File

@@ -3303,13 +3303,17 @@ const WOLFSSL_EVP_CIPHER *wolfSSL_EVP_get_cipherbynid(int id)
#ifndef NO_DES3 #ifndef NO_DES3
static char *EVP_DES_CBC; static char *EVP_DES_CBC;
static char *EVP_DES_ECB; static char *EVP_DES_ECB;
static const int EVP_DES_SIZE = 7;
static char *EVP_DES_EDE3_CBC; static char *EVP_DES_EDE3_CBC;
static char *EVP_DES_EDE3_ECB; static char *EVP_DES_EDE3_ECB;
#ifdef OPENSSL_EXTRA
static const int EVP_DES_SIZE = 7;
static const int EVP_DES_EDE3_SIZE = 12; static const int EVP_DES_EDE3_SIZE = 12;
#endif #endif
#endif
#ifdef HAVE_IDEA #ifdef HAVE_IDEA
static char *EVP_IDEA_CBC; static char *EVP_IDEA_CBC;
#if defined(OPENSSL_EXTRA) #if defined(OPENSSL_EXTRA)
@@ -11872,7 +11876,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
XMEMCPY(out, ssl->arrays->clientRandom, size); XMEMCPY(out, ssl->arrays->clientRandom, size);
return size; return size;
} }
#endif /* !defined(NO_WOLFSSL_CLIENT) */ #endif /* !NO_WOLFSSL_CLIENT */
unsigned long wolfSSLeay(void) unsigned long wolfSSLeay(void)
@@ -11936,7 +11940,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
return 0; return 0;
} }
#endif /* NO_MD5 */ #endif /* !NO_MD5 */
#ifndef NO_SHA #ifndef NO_SHA
@@ -12009,7 +12013,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
WOLFSSL_ENTER("SHA1_Final"); WOLFSSL_ENTER("SHA1_Final");
return SHA_Final(input, sha); return SHA_Final(input, sha);
} }
#endif /* NO_SHA */ #endif /* !NO_SHA */
#ifdef WOLFSSL_SHA224 #ifdef WOLFSSL_SHA224
@@ -12314,7 +12318,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return EVP_get_digestbyname("MD4"); return EVP_get_digestbyname("MD4");
} }
#endif /* NO_MD4 */ #endif /* !NO_MD4 */
#ifndef NO_MD5 #ifndef NO_MD5
@@ -12325,7 +12329,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return EVP_get_digestbyname("MD5"); return EVP_get_digestbyname("MD5");
} }
#endif /* NO_MD5 */ #endif /* !NO_MD5 */
#ifndef NO_SHA #ifndef NO_SHA
@@ -12373,6 +12377,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
#endif /* WOLFSSL_SHA512 */ #endif /* WOLFSSL_SHA512 */
WOLFSSL_EVP_MD_CTX *wolfSSL_EVP_MD_CTX_new(void) WOLFSSL_EVP_MD_CTX *wolfSSL_EVP_MD_CTX_new(void)
{ {
WOLFSSL_EVP_MD_CTX* ctx; WOLFSSL_EVP_MD_CTX* ctx;