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

Merge pull request #1580 from JacobBarthelmeh/Testing

Browse Source 
check on cipher suites for AEAD
This commit is contained in:
toddouska
2018-05-23 17:02:01 -06:00
committed by GitHub
parent 555efe0345 89fbb1b40d
commit 6a00bfc9f7
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal.c
View File

@ -5227,8 +5227,9 @@ void FreeSSL(WOLFSSL* ssl, void* heap)
(void)heap;
}
#if !defined(NO_OLD_TLS) || defined(HAVE_CHACHA) || defined(HAVE_AESCCM) \
|| defined(HAVE_AESGCM) || defined(WOLFSSL_DTLS)
#if !defined(NO_OLD_TLS) || defined(WOLFSSL_DTLS) || \
((defined(HAVE_CHACHA) || defined(HAVE_AESCCM) || defined(HAVE_AESGCM)) \
&& defined(HAVE_AEAD))
static INLINE void GetSEQIncrement(WOLFSSL* ssl, int verify, word32 seq[2])
{
if (verify) {
@ -5342,7 +5343,6 @@ static INLINE void WriteSEQ(WOLFSSL* ssl, int verifyOrder, byte* out)
}
#endif
#ifdef WOLFSSL_DTLS
/* functions for managing DTLS datagram reordering */

24
wolfssl/internal.h
View File

@ -773,6 +773,25 @@
defined(BUILD_TLS_PSK_WITH_AES_256_GCM_SHA384) || \
defined(BUILD_TLS_DHE_PSK_WITH_AES_256_GCM_SHA384)
#define BUILD_AESGCM
#else
/* No AES-GCM cipher suites available with build */
#define NO_AESGCM_AEAD
#endif
#if defined(BUILD_TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256) || \
defined(BUILD_TLS_DHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256) || \
defined(BUILD_TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256) || \
defined(BUILD_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256) || \
defined(BUILD_TLS_ECDHE_ECDSA_WITH_CHACHA20_OLD_POLY1305_SHA256) || \
defined(BUILD_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256) || \
defined(BUILD_TLS_ECDHE_RSA_WITH_CHACHA20_OLD_POLY1305_SHA256) || \
defined(BUILD_TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256) || \
defined(BUILD_TLS_PSK_WITH_CHACHA20_POLY1305_SHA256) || \
defined(BUILD_TLS_CHACHA20_POLY1305_SHA256)
/* Have an available ChaCha Poly cipher suite */
#else
/* No ChaCha Poly cipher suites available with build */
#define NO_CHAPOL_AEAD
#endif
#if defined(BUILD_TLS_RSA_WITH_HC_128_SHA) || \
@ -810,8 +829,9 @@
#endif
#if defined(WOLFSSL_MAX_STRENGTH) || \
defined(HAVE_AESGCM) || defined(HAVE_AESCCM) || \
(defined(HAVE_CHACHA) && defined(HAVE_POLY1305))
(defined(HAVE_AESGCM) && !defined(NO_AESGCM_AEAD)) || \
defined(HAVE_AESCCM) || \
(defined(HAVE_CHACHA) && defined(HAVE_POLY1305) && !defined(NO_CHAPOL_AEAD))
#define HAVE_AEAD
#endif