wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 02:37:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compile error when FP_MAX_BITS doesn't support FFHDE parameters

Browse Source
This commit is contained in:
Sean Parkinson
2019-02-26 08:41:15 +10:00
parent ee4e27afe2
commit fe620b5250
1 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
wolfssl/wolfcrypt/settings.h
View File

@ -1642,11 +1642,39 @@ extern void uITRON4_free(void *p) ;
#define WOLFSSL_AEAD_ONLY #define WOLFSSL_AEAD_ONLY
#endif #endif
#if !defined(NO_DH) && !defined(HAVE_FFDHE)
#if defined(HAVE_FFDHE_2048) || defined(HAVE_FFDHE_3072) || \
defined(HAVE_FFDHE_4096) || defined(HAVE_FFDHE_6144) || \
defined(HAVE_FFDHE_8192)
#define HAVE_FFDHE
#endif
#endif
#if defined(HAVE_FFDHE_8192)
#define MIN_FFDHE_FP_MAX_BITS 16384
#elif defined(HAVE_FFDHE_6144)
#define MIN_FFDHE_FP_MAX_BITS 12288
#elif defined(HAVE_FFDHE_4096)
#define MIN_FFDHE_FP_MAX_BITS 8192
#elif defined(HAVE_FFDHE_3072)
#define MIN_FFDHE_FP_MAX_BITS 6144
#elif defined(HAVE_FFDHE_2048)
#define MIN_FFDHE_FP_MAX_BITS 4096
#else
#define MIN_FFDHE_FP_MAX_BITS 0
#endif
#if defined(HAVE_FFDHE) && defined(FP_MAX_BITS)
#if MIN_FFDHE_FP_MAX_BITS > FP_MAX_BITS
#error "FFDHE parameters are too large for FP_MAX_BIT as set"
#endif
#endif
/* if desktop type system and fastmath increase default max bits */ /* if desktop type system and fastmath increase default max bits */
#ifdef WOLFSSL_X86_64_BUILD #ifdef WOLFSSL_X86_64_BUILD
#ifdef USE_FAST_MATH #if defined(USE_FAST_MATH) && !defined(FP_MAX_BITS)
#ifndef FP_MAX_BITS #if MIN_FFDHE_FP_MAX_BITS <= 8192
#define FP_MAX_BITS 8192 #define FP_MAX_BITS 8192
#else
#define FP_MAX_BITS MIN_FFDHE_FP_MAX_BITS
#endif #endif
#endif #endif
#endif #endif
@ -1808,36 +1836,6 @@ extern void uITRON4_free(void *p) ;
#define SSL_CTRL_SET_TLSEXT_HOSTNAME #define SSL_CTRL_SET_TLSEXT_HOSTNAME
#endif #endif
#if !defined(NO_DH) && !defined(HAVE_FFDHE)
#if defined(HAVE_FFDHE_2048) || defined(HAVE_FFDHE_3072) || \
defined(HAVE_FFDHE_4096) || defined(HAVE_FFDHE_6144) || \
defined(HAVE_FFDHE_8192)
#define HAVE_FFDHE
#endif
#endif
#ifdef FP_MAX_BITS
#if defined(HAVE_FFDHE_8192) && FP_MAX_BITS < 16384
#undef FP_MAX_BITS
#define FP_MAX_BITS 16384
#endif
#if defined(HAVE_FFDHE_6144) && FP_MAX_BITS < 12288
#undef FP_MAX_BITS
#define FP_MAX_BITS 12288
#endif
#if defined(HAVE_FFDHE_4096) && FP_MAX_BITS < 8192
#undef FP_MAX_BITS
#define FP_MAX_BITS 8192
#endif
#if defined(HAVE_FFDHE_3072) && FP_MAX_BITS < 6144
#undef FP_MAX_BITS
#define FP_MAX_BITS 6144
#endif
#if defined(HAVE_FFDHE_2048) && FP_MAX_BITS < 4096
#undef FP_MAX_BITS
#define FP_MAX_BITS 4096
#endif
#endif
/* both CURVE and ED small math should be enabled */ /* both CURVE and ED small math should be enabled */
#ifdef CURVED25519_SMALL #ifdef CURVED25519_SMALL