wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3415 from kojo1/config-options

Browse Source 
Config options
This commit is contained in:
Chris Conlon
2020-10-30 11:55:11 -06:00
committed by GitHub
parent bd3841c7d1 277edbb514
commit 54fe98716d
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sniffer.c
View File

@@ -2524,12 +2524,15 @@ static int ProcessSessionTicket(const byte* input, int* sslBytes,
SnifferSession* session, char* error) SnifferSession* session, char* error)
{ {
word16 len; word16 len;
#ifdef WOLFSSL_TLS13
WOLFSSL* ssl; WOLFSSL* ssl;
if (session->flags.side == WOLFSSL_SERVER_END) if (session->flags.side == WOLFSSL_SERVER_END)
ssl = session->sslServer; ssl = session->sslServer;
else else
ssl = session->sslClient; ssl = session->sslClient;
#endif
/* make sure can read through hint len */ /* make sure can read through hint len */
if (TICKET_HINT_LEN > *sslBytes) { if (TICKET_HINT_LEN > *sslBytes) {

5
src/ssl.c
View File

@@ -36021,9 +36021,12 @@ static int hash2mgf(enum wc_HashType hType)
return WC_MGF1SHA1; return WC_MGF1SHA1;
#endif #endif
#ifndef NO_SHA256 #ifndef NO_SHA256
#ifdef WOLFSSL_SHA224
case WC_HASH_TYPE_SHA224: case WC_HASH_TYPE_SHA224:
#ifdef WOLFSSL_SHA224
return WC_MGF1SHA224; return WC_MGF1SHA224;
#else
WOLFSSL_MSG("Unrecognized or unsupported hash function");
return WC_MGF1NONE;
#endif #endif
case WC_HASH_TYPE_SHA256: case WC_HASH_TYPE_SHA256:
return WC_MGF1SHA256; return WC_MGF1SHA256;