Merge pull request #3262 from julek-wolfssl/missing-cipherExtraData-2

HAVE_SESSION_TICKET can also be defined without TLS 1.2
This commit is contained in:
Sean Parkinson
2020-08-31 08:34:54 +10:00
committed by GitHub

View File

@@ -16784,9 +16784,8 @@ int CreateOcspResponse(WOLFSSL* ssl, OcspRequest** ocspRequest,
#endif
#endif /* !NO_WOLFSSL_SERVER */
#ifndef WOLFSSL_NO_TLS12
#if !defined(NO_CERTS) || defined(HAVE_SESSION_TICKET)
#if (!defined(WOLFSSL_NO_TLS12) && !defined(NO_CERTS)) \
|| defined(HAVE_SESSION_TICKET)
static int cipherExtraData(WOLFSSL* ssl)
{
/* Cipher data that may be added by BuildMessage */
@@ -16796,6 +16795,8 @@ static int cipherExtraData(WOLFSSL* ssl)
}
#endif
#ifndef WOLFSSL_NO_TLS12
#ifndef NO_CERTS
#if !defined(NO_WOLFSSL_SERVER) || !defined(WOLFSSL_NO_CLIENT_AUTH)
/* handle generation of certificate (11) */