From 8139fbd026e9fb0bd33a88c1cf13a3c180fdee22 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Thu, 26 Sep 2019 12:12:19 +0700 Subject: [PATCH 1/2] early data and enc-then-mac build fixes --- src/ssl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ssl.c b/src/ssl.c index 3615b431b..413d1f034 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -3099,6 +3099,7 @@ void* wolfSSL_GetDecryptVerifyCtx(WOLFSSL* ssl) return NULL; } +#ifdef HAVE_ENCRYPT_THEN_MAC /** * Set the callback, against the context, that encrypts then MACs. * @@ -3175,6 +3176,7 @@ void* wolfSSL_GetVerifyDecryptCtx(WOLFSSL* ssl) return NULL; } +#endif /* HAVE_ENCRYPT_THEN_MAC */ @@ -26106,7 +26108,7 @@ int wolfSSL_i2d_SSL_SESSION(WOLFSSL_SESSION* sess, unsigned char** p) #endif #endif #ifdef WOLFSSL_EARLY_DATA - c32toa(sess->maxEarlyDataSz); + c32toa(sess->maxEarlyDataSz, data + idx); idx += OPAQUE32_LEN; #endif #endif From c6c7f67dfd78ff6cd72ca5217830d02d894c2df4 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Thu, 26 Sep 2019 12:30:17 +0700 Subject: [PATCH 2/2] add check on AEAD only mode with enc-then-mac functions --- src/ssl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 413d1f034..ca825b2cc 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -3099,7 +3099,7 @@ void* wolfSSL_GetDecryptVerifyCtx(WOLFSSL* ssl) return NULL; } -#ifdef HAVE_ENCRYPT_THEN_MAC +#if defined(HAVE_ENCRYPT_THEN_MAC) && !defined(WOLFSSL_AEAD_ONLY) /** * Set the callback, against the context, that encrypts then MACs. * @@ -3176,7 +3176,7 @@ void* wolfSSL_GetVerifyDecryptCtx(WOLFSSL* ssl) return NULL; } -#endif /* HAVE_ENCRYPT_THEN_MAC */ +#endif /* HAVE_ENCRYPT_THEN_MAC !WOLFSSL_AEAD_ONLY */