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

Fix for use of WC_MAX_SYM_KEY_SIZE in macro. Fixes build case with --enable-nullcipher --disable-aes.

Browse Source
This commit is contained in:
David Garske
2020-06-17 11:16:33 -07:00
parent b1aa903c1b
commit 81892f4594
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wolfssl/wolfcrypt/wc_encrypt.h
View File

@ -28,24 +28,33 @@
#define WOLF_CRYPT_ENCRYPT_H #define WOLF_CRYPT_ENCRYPT_H
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#include <wolfssl/wolfcrypt/aes.h> #ifndef NO_AES
#include <wolfssl/wolfcrypt/chacha.h> #include <wolfssl/wolfcrypt/aes.h>
#include <wolfssl/wolfcrypt/des3.h> #endif
#include <wolfssl/wolfcrypt/arc4.h> #ifdef HAVE_CHACHA
#include <wolfssl/wolfcrypt/chacha.h>
#endif
#ifndef NO_DES3
#include <wolfssl/wolfcrypt/des3.h>
#endif
#ifndef NO_RC4
#include <wolfssl/wolfcrypt/arc4.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* determine max cipher key size */ /* determine max cipher key size - cannot use enum values here, must be define,
* since WC_MAX_SYM_KEY_SIZE is used in if macro logic. */
#ifndef NO_AES #ifndef NO_AES
#define WC_MAX_SYM_KEY_SIZE (AES_MAX_KEY_SIZE/8) #define WC_MAX_SYM_KEY_SIZE (AES_MAX_KEY_SIZE/8)
#elif defined(HAVE_CHACHA) #elif defined(HAVE_CHACHA)
#define WC_MAX_SYM_KEY_SIZE CHACHA_MAX_KEY_SZ #define WC_MAX_SYM_KEY_SIZE 32 /* CHACHA_MAX_KEY_SZ */
#elif !defined(NO_DES3) #elif !defined(NO_DES3)
#define WC_MAX_SYM_KEY_SIZE DES3_KEY_SIZE #define WC_MAX_SYM_KEY_SIZE 24 /* DES3_KEY_SIZE */
#elif !defined(NO_RC4) #elif !defined(NO_RC4)
#define WC_MAX_SYM_KEY_SIZE RC4_KEY_SIZE #define WC_MAX_SYM_KEY_SIZE 16 /* RC4_KEY_SIZE */
#else #else
#define WC_MAX_SYM_KEY_SIZE 32 #define WC_MAX_SYM_KEY_SIZE 32
#endif #endif