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

47
src/ssl.c
View File

@ -3303,13 +3303,17 @@ const WOLFSSL_EVP_CIPHER *wolfSSL_EVP_get_cipherbynid(int id)
#ifndef NO_DES3
static char *EVP_DES_CBC;
static char *EVP_DES_ECB;
static const int EVP_DES_SIZE = 7;
static char *EVP_DES_EDE3_CBC;
static char *EVP_DES_EDE3_ECB;
#ifdef OPENSSL_EXTRA
static const int EVP_DES_SIZE = 7;
static const int EVP_DES_EDE3_SIZE = 12;
#endif
#endif
#ifdef HAVE_IDEA
static char *EVP_IDEA_CBC;
#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);
return size;
}
#endif /* !defined(NO_WOLFSSL_CLIENT) */
#endif /* !NO_WOLFSSL_CLIENT */
unsigned long wolfSSLeay(void)
@ -11936,7 +11940,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
return 0;
}
#endif /* NO_MD5 */
#endif /* !NO_MD5 */
#ifndef NO_SHA
@ -12009,9 +12013,9 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
WOLFSSL_ENTER("SHA1_Final");
return SHA_Final(input, sha);
}
#endif /* NO_SHA */
#endif /* !NO_SHA */
#ifdef WOLFSSL_SHA224
#ifdef WOLFSSL_SHA224
int wolfSSL_SHA224_Init(WOLFSSL_SHA224_CTX* sha)
{
@ -12061,7 +12065,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
return 0;
}
#endif /* WOLFSSL_SHA224 */
#endif /* WOLFSSL_SHA224 */
int wolfSSL_SHA256_Init(WOLFSSL_SHA256_CTX* sha256)
@ -12113,7 +12117,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
}
#ifdef WOLFSSL_SHA384
#ifdef WOLFSSL_SHA384
int wolfSSL_SHA384_Init(WOLFSSL_SHA384_CTX* sha)
{
@ -12163,10 +12167,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
return 0;
}
#endif /* WOLFSSL_SHA384 */
#endif /* WOLFSSL_SHA384 */
#ifdef WOLFSSL_SHA512
#ifdef WOLFSSL_SHA512
int wolfSSL_SHA512_Init(WOLFSSL_SHA512_CTX* sha)
{
@ -12216,7 +12220,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
return 0;
}
#endif /* WOLFSSL_SHA512 */
#endif /* WOLFSSL_SHA512 */
static const struct s_ent {
const unsigned char macType;
@ -12305,7 +12309,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
}
#ifndef NO_MD4
#ifndef NO_MD4
/* return a pointer to MD4 EVP type */
const WOLFSSL_EVP_MD* wolfSSL_EVP_md4(void)
@ -12314,10 +12318,10 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return EVP_get_digestbyname("MD4");
}
#endif /* NO_MD4 */
#endif /* !NO_MD4 */
#ifndef NO_MD5
#ifndef NO_MD5
const WOLFSSL_EVP_MD* wolfSSL_EVP_md5(void)
{
@ -12325,7 +12329,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return EVP_get_digestbyname("MD5");
}
#endif /* NO_MD5 */
#endif /* !NO_MD5 */
#ifndef NO_SHA
@ -12336,7 +12340,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
}
#endif /* NO_SHA */
#ifdef WOLFSSL_SHA224
#ifdef WOLFSSL_SHA224
const WOLFSSL_EVP_MD* wolfSSL_EVP_sha224(void)
{
@ -12344,7 +12348,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return EVP_get_digestbyname("SHA224");
}
#endif /* WOLFSSL_SHA224 */
#endif /* WOLFSSL_SHA224 */
const WOLFSSL_EVP_MD* wolfSSL_EVP_sha256(void)
@ -12353,7 +12357,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return EVP_get_digestbyname("SHA256");
}
#ifdef WOLFSSL_SHA384
#ifdef WOLFSSL_SHA384
const WOLFSSL_EVP_MD* wolfSSL_EVP_sha384(void)
{
@ -12361,9 +12365,9 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return EVP_get_digestbyname("SHA384");
}
#endif /* WOLFSSL_SHA384 */
#endif /* WOLFSSL_SHA384 */
#ifdef WOLFSSL_SHA512
#ifdef WOLFSSL_SHA512
const WOLFSSL_EVP_MD* wolfSSL_EVP_sha512(void)
{
@ -12371,7 +12375,8 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return EVP_get_digestbyname("SHA512");
}
#endif /* WOLFSSL_SHA512 */
#endif /* WOLFSSL_SHA512 */
WOLFSSL_EVP_MD_CTX *wolfSSL_EVP_MD_CTX_new(void)
{
@ -13520,7 +13525,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
{
return NULL;
}
#ifdef WOLFSSL_SMALL_STACK
hmac = (Hmac*)XMALLOC(sizeof(Hmac), heap, DYNAMIC_TYPE_HMAC);
if (hmac == NULL)