WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1824 from SparkiDev/tls_cam_no_aes 

Camellia is a block cipher in TLS - can't turn on AEAD only define
pull/1821/head
David Garske 2018-09-09 17:28:34 -07:00 committed by GitHub
parent f8ac5b5f71 2d413c5bb8
commit 8fdb6b79d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wolfssl/wolfcrypt/settings.h
View File

@ -1565,7 +1565,8 @@ extern void uITRON4_free(void *p) ;
#if (defined(WOLFSSL_TLS13) && defined(WOLFSSL_NO_TLS12)) || \ #if (defined(WOLFSSL_TLS13) && defined(WOLFSSL_NO_TLS12)) || \
(!defined(HAVE_AES_CBC) && defined(NO_DES3) && defined(NO_RC4) && \ (!defined(HAVE_AES_CBC) && defined(NO_DES3) && defined(NO_RC4) && \
!defined(HAVE_IDEA) && !defined(HAVE_NULL_CIPHER) && !defined(HAVE_HC128)) !defined(HAVE_CAMELLIA) && !defined(HAVE_IDEA) && \
!defined(HAVE_NULL_CIPHER) && !defined(HAVE_HC128))
#define WOLFSSL_AEAD_ONLY #define WOLFSSL_AEAD_ONLY
#endif #endif