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

Merge pull request #5120 from dgarske/v5.3.0_cubepack

Browse Source
This commit is contained in:
Chris Conlon
2022-05-08 07:50:20 -06:00
committed by GitHub
parent 421f54e60a bc877dab2a
commit b76c70d969
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
IDE/STM32Cube/default_conf.ftl
View File

@ -114,6 +114,9 @@ extern ${variable.value} ${variable.name};
#elif defined(STM32F207xx) #elif defined(STM32F207xx)
#define WOLFSSL_STM32F2 #define WOLFSSL_STM32F2
#define HAL_CONSOLE_UART huart3 #define HAL_CONSOLE_UART huart3
#elif defined(STM32F217xx)
#define WOLFSSL_STM32F2
#define HAL_CONSOLE_UART huart2
#elif defined(STM32F107xC) #elif defined(STM32F107xC)
#define WOLFSSL_STM32F1 #define WOLFSSL_STM32F1
#define HAL_CONSOLE_UART huart4 #define HAL_CONSOLE_UART huart4
@ -150,7 +153,7 @@ extern ${variable.value} ${variable.name};
//#define NO_STM32_RNG //#define NO_STM32_RNG
//#undef NO_STM32_HASH //#undef NO_STM32_HASH
//#undef NO_STM32_CRYPTO //#undef NO_STM32_CRYPTO
//#define WOLFSSL_GENSEED_FORTEST //#define WOLFSSL_GENSEED_FORTEST /* if no HW RNG is available use test seed */
//#define STM32_HAL_V2 //#define STM32_HAL_V2
#endif #endif
@ -264,8 +267,14 @@ extern ${variable.value} ${variable.name};
#if defined(WOLF_CONF_BASE64_ENCODE) && WOLF_CONF_BASE64_ENCODE == 1 #if defined(WOLF_CONF_BASE64_ENCODE) && WOLF_CONF_BASE64_ENCODE == 1
#define WOLFSSL_BASE64_ENCODE #define WOLFSSL_BASE64_ENCODE
#endif #endif
#if defined(WOLF_CONF_OPENSSL_EXTRA) && WOLF_CONF_OPENSSL_EXTRA == 1 #if defined(WOLF_CONF_OPENSSL_EXTRA) && WOLF_CONF_OPENSSL_EXTRA >= 1
#define OPENSSL_EXTRA #define OPENSSL_EXTRA
#if !defined(INT_MAX)
#include <limits.h>
#endif
#endif
#if defined(WOLF_CONF_OPENSSL_EXTRA) && WOLF_CONF_OPENSSL_EXTRA >= 2
#define OPENSSL_ALL
#endif #endif
/* TLS Session Cache */ /* TLS Session Cache */

4
wolfcrypt/benchmark/benchmark.c
View File

@ -680,6 +680,7 @@ static const bench_alg bench_other_opt[] = {
#endif /* !WOLFSSL_BENCHMARK_ALL && !NO_MAIN_DRIVER */ #endif /* !WOLFSSL_BENCHMARK_ALL && !NO_MAIN_DRIVER */
#if defined(HAVE_PQC)
/* The post-quantum-specific mapping of command line option to bit values and /* The post-quantum-specific mapping of command line option to bit values and
* OQS name. */ * OQS name. */
typedef struct bench_pq_alg { typedef struct bench_pq_alg {
@ -758,6 +759,7 @@ static const bench_pq_alg bench_pq_asym_opt[] = {
#endif #endif
{ NULL, 0, NULL } { NULL, 0, NULL }
}; };
#endif
#ifdef HAVE_WNR #ifdef HAVE_WNR
const char* wnrConfigFile = "wnr-example.conf"; const char* wnrConfigFile = "wnr-example.conf";
@ -7771,6 +7773,7 @@ int main(int argc, char** argv)
optMatched = 1; optMatched = 1;
} }
} }
#if defined(HAVE_PQC)
/* Known asymmetric post-quantum algorithms */ /* Known asymmetric post-quantum algorithms */
for (i=0; !optMatched && bench_pq_asym_opt[i].str != NULL; i++) { for (i=0; !optMatched && bench_pq_asym_opt[i].str != NULL; i++) {
if (string_matches(argv[1], bench_pq_asym_opt[i].str)) { if (string_matches(argv[1], bench_pq_asym_opt[i].str)) {
@ -7779,6 +7782,7 @@ int main(int argc, char** argv)
optMatched = 1; optMatched = 1;
} }
} }
#endif
/* Other known cryptographic algorithms */ /* Other known cryptographic algorithms */
for (i=0; !optMatched && bench_other_opt[i].str != NULL; i++) { for (i=0; !optMatched && bench_other_opt[i].str != NULL; i++) {
if (string_matches(argv[1], bench_other_opt[i].str)) { if (string_matches(argv[1], bench_other_opt[i].str)) {

4
wolfssl/internal.h
View File

@ -215,8 +215,8 @@
#endif #endif
#endif #endif
#ifndef CHAR_BIT #if !defined(CHAR_BIT) || (defined(OPENSSL_EXTRA) && !defined(INT_MAX))
/* Needed for DTLS without big math */ /* Needed for DTLS without big math and INT_MAX */
#include <limits.h> #include <limits.h>
#endif #endif