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

Fix for building with NO_OLD_TLS and WOLFSSL_ALLOW_TLS_SHA1.

Browse Source
This commit is contained in:
David Garske
2017-04-13 13:46:54 -07:00
parent f2ac410f1e
commit 7779a64cae
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/internal.c
View File

@ -5637,7 +5637,8 @@ static int GetDtlsHandShakeHeader(WOLFSSL* ssl, const byte* input,
#endif #endif
#ifndef NO_OLD_TLS #if !defined(NO_OLD_TLS) || \
(defined(NO_OLD_TLS) && defined(WOLFSSL_ALLOW_TLS_SHA1))
/* fill with MD5 pad size since biggest required */ /* fill with MD5 pad size since biggest required */
static const byte PAD1[PAD_MD5] = static const byte PAD1[PAD_MD5] =
{ 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, { 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
@ -5655,6 +5656,9 @@ static const byte PAD2[PAD_MD5] =
0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c,
0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c
}; };
#endif /* !NO_OLD_TLS || (NO_OLD_TLS && WOLFSSL_ALLOW_TLS_SHA1) */
#ifndef NO_OLD_TLS
/* calculate MD5 hash for finished */ /* calculate MD5 hash for finished */
#ifdef WOLFSSL_TI_HASH #ifdef WOLFSSL_TI_HASH
@ -10802,8 +10806,12 @@ static int SSL_hmac(WOLFSSL* ssl, byte* digest, const byte* in, word32 sz,
} }
return 0; return 0;
} }
#endif /* NO_OLD_TLS */
#ifndef NO_CERTS #ifndef NO_CERTS
#if !defined(NO_MD5) && !defined(NO_OLD_TLS)
static int BuildMD5_CertVerify(WOLFSSL* ssl, byte* digest) static int BuildMD5_CertVerify(WOLFSSL* ssl, byte* digest)
{ {
int ret; int ret;
@ -10844,8 +10852,10 @@ static int BuildMD5_CertVerify(WOLFSSL* ssl, byte* digest)
return ret; return ret;
} }
#endif /* !NO_MD5 && !NO_OLD_TLS */
#if !defined(NO_SHA) && (!defined(NO_OLD_TLS) || \
defined(WOLFSSL_ALLOW_TLS_SHA1))
static int BuildSHA_CertVerify(WOLFSSL* ssl, byte* digest) static int BuildSHA_CertVerify(WOLFSSL* ssl, byte* digest)
{ {
int ret; int ret;
@ -10886,11 +10896,7 @@ static int BuildSHA_CertVerify(WOLFSSL* ssl, byte* digest)
return ret; return ret;
} }
#endif /* NO_CERTS */ #endif /* !NO_SHA && (!NO_OLD_TLS || WOLFSSL_ALLOW_TLS_SHA1) */
#endif /* NO_OLD_TLS */
#ifndef NO_CERTS
static int BuildCertHashes(WOLFSSL* ssl, Hashes* hashes) static int BuildCertHashes(WOLFSSL* ssl, Hashes* hashes)
{ {