denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wolfSSL 5.4.0 for tests

Browse Source 
The 5.4.0 update changed the default bignum implementation to what
could explicitly be enabled via `--enable-sp-math-all`.  Since this uses
fixed-sized buffers sufficient for key sizes of SP_INT_BITS, with a default
of 4096, modp6144 and modp8192 didn't work anymore (wc_DhGenerateKeyPair()
returned MP_EXPTMOD_E).  So we have to adapt the feature checks for this.

To support the larger DH groups we can either increase the buffer size
via `--with-max-rsa-bits` or add `--enable-heapmath` so buffers get
(re-)allocated as needed.  We go with the latter for now.
This commit is contained in:
Tobias Brunner
2022-07-18 12:42:24 +02:00
parent 110e8e6608
commit eae30af029
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
+24 -8
View File
@@ -270,31 +270,47 @@ METHOD(plugin_t, get_features, int,
#ifndef NO_DH
/* MODP DH groups */
PLUGIN_REGISTER(KE, wolfssl_diffie_hellman_create),
#if !defined(USE_FAST_MATH) || FP_MAX_BITS >= (3072 * 2)
#if (defined(USE_FAST_MATH) && FP_MAX_BITS >= (3072 * 2)) || \
(defined(WOLFSSL_SP_MATH_ALL) && SP_INT_BITS >= 3072) || \
defined(USE_INTEGER_HEAP_MATH)
PLUGIN_PROVIDE(KE, MODP_3072_BIT),
#endif
#if !defined(USE_FAST_MATH) || FP_MAX_BITS >= (4096 * 2)
#if (defined(USE_FAST_MATH) && FP_MAX_BITS >= (4096 * 2)) || \
(defined(WOLFSSL_SP_MATH_ALL) && SP_INT_BITS >= 4096) || \
defined(USE_INTEGER_HEAP_MATH)
PLUGIN_PROVIDE(KE, MODP_4096_BIT),
#endif
#if !defined(USE_FAST_MATH) || FP_MAX_BITS >= (6144 * 2)
#if (defined(USE_FAST_MATH) && FP_MAX_BITS >= (6144 * 2)) || \
(defined(WOLFSSL_SP_MATH_ALL) && SP_INT_BITS >= 6144) || \
defined(USE_INTEGER_HEAP_MATH)
PLUGIN_PROVIDE(KE, MODP_6144_BIT),
#endif
#if !defined(USE_FAST_MATH) || FP_MAX_BITS >= (8192 * 2)
#if (defined(USE_FAST_MATH) && FP_MAX_BITS >= (8192 * 2)) || \
(defined(WOLFSSL_SP_MATH_ALL) && SP_INT_BITS >= 8192) || \
defined(USE_INTEGER_HEAP_MATH)
PLUGIN_PROVIDE(KE, MODP_8192_BIT),
#endif
#if !defined(USE_FAST_MATH) || FP_MAX_BITS >= (2048 * 2)
#if (defined(USE_FAST_MATH) && FP_MAX_BITS >= (2048 * 2)) || \
(defined(WOLFSSL_SP_MATH_ALL) && SP_INT_BITS >= 2048) || \
defined(USE_INTEGER_HEAP_MATH)
PLUGIN_PROVIDE(KE, MODP_2048_BIT),
PLUGIN_PROVIDE(KE, MODP_2048_224),
PLUGIN_PROVIDE(KE, MODP_2048_256),
#endif
#if !defined(USE_FAST_MATH) || FP_MAX_BITS >= (1536 * 2)
#if (defined(USE_FAST_MATH) && FP_MAX_BITS >= (1536 * 2)) || \
(defined(WOLFSSL_SP_MATH_ALL) && SP_INT_BITS >= 1536) || \
defined(USE_INTEGER_HEAP_MATH)
PLUGIN_PROVIDE(KE, MODP_1536_BIT),
#endif
#if !defined(USE_FAST_MATH) || FP_MAX_BITS >= (1024 * 2)
#if (defined(USE_FAST_MATH) && FP_MAX_BITS >= (1024 * 2)) || \
(defined(WOLFSSL_SP_MATH_ALL) && SP_INT_BITS >= 1024) || \
defined(USE_INTEGER_HEAP_MATH)
PLUGIN_PROVIDE(KE, MODP_1024_BIT),
PLUGIN_PROVIDE(KE, MODP_1024_160),
#endif
#if !defined(USE_FAST_MATH) || FP_MAX_BITS >= (768 * 2)
#if (defined(USE_FAST_MATH) && FP_MAX_BITS >= (768 * 2)) || \
(defined(WOLFSSL_SP_MATH_ALL) && SP_INT_BITS >= 768) || \
defined(USE_INTEGER_HEAP_MATH)
PLUGIN_PROVIDE(KE, MODP_768_BIT),
#endif
PLUGIN_PROVIDE(KE, MODP_CUSTOM),