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

Merge pull request #5736 from douzzer/20221025-fixes-wolfsentry-and-armv7a

Browse Source 
20221025-fixes-wolfsentry-and-armv7a
This commit is contained in:
Sean Parkinson
2022-10-26 12:38:01 +10:00
committed by GitHub
parent 8d8371ac5a baa19c1092
commit 2d19f00dd5
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2191,7 +2191,7 @@ then
# Include options.h # Include options.h
AM_CCASFLAGS="$AM_CCASFLAGS -DEXTERNAL_OPTS_OPENVPN" AM_CCASFLAGS="$AM_CCASFLAGS -DEXTERNAL_OPTS_OPENVPN"
ENABLED_ARMASM_CRYPTO=no ENABLED_ARMASM_CRYPTO=no
ENABLED_AESGCM_STREAM=no # not yet implemented ENABLED_AESGCM_STREAM=no # not yet implemented
AC_MSG_NOTICE([32bit ARMv7-a found, setting mfpu to neon]) AC_MSG_NOTICE([32bit ARMv7-a found, setting mfpu to neon])
;; ;;
*) *)

3
tests/api.c
View File

@ -48490,15 +48490,12 @@ static int test_wolfSSL_d2i_OCSP_CERTID(void)
/* The below tests should fail when passed bad parameters. NULL should /* The below tests should fail when passed bad parameters. NULL should
* always be returned. */ * always be returned. */
certIdBad = (WOLFSSL_OCSP_CERTID*) 1;
certIdBad = wolfSSL_d2i_OCSP_CERTID(NULL, &rawCertIdPtr, sizeof(rawCertId)); certIdBad = wolfSSL_d2i_OCSP_CERTID(NULL, &rawCertIdPtr, sizeof(rawCertId));
AssertNull(certIdBad); AssertNull(certIdBad);
certIdBad = (WOLFSSL_OCSP_CERTID*) 1;
certIdBad = wolfSSL_d2i_OCSP_CERTID(&certId, NULL, sizeof(rawCertId)); certIdBad = wolfSSL_d2i_OCSP_CERTID(&certId, NULL, sizeof(rawCertId));
AssertNull(certIdBad); AssertNull(certIdBad);
certIdBad = (WOLFSSL_OCSP_CERTID*) 1;
certIdBad = wolfSSL_d2i_OCSP_CERTID(&certId, &rawCertIdPtr, 0); certIdBad = wolfSSL_d2i_OCSP_CERTID(&certId, &rawCertIdPtr, 0);
AssertNull(certIdBad); AssertNull(certIdBad);

7
wolfcrypt/src/port/arm/armv8-aes.c
View File

@ -33,12 +33,13 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#if !defined(NO_AES) && defined(WOLFSSL_ARMASM) #if !defined(NO_AES) && defined(WOLFSSL_ARMASM)
#ifndef WOLFSSL_ARMASM_NO_HW_CRYPTO
#ifdef HAVE_FIPS #if defined(HAVE_FIPS) && !defined(FIPS_NO_WRAPPERS)
#undef HAVE_FIPS #define FIPS_NO_WRAPPERS
#endif #endif
#ifndef WOLFSSL_ARMASM_NO_HW_CRYPTO
#include <wolfssl/wolfcrypt/aes.h> #include <wolfssl/wolfcrypt/aes.h>
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/wolfcrypt/logging.h> #include <wolfssl/wolfcrypt/logging.h>

3
wolfssl/test.h
View File

@ -1585,7 +1585,8 @@ static int wolfsentry_setup(
#if !defined(NO_FILESYSTEM) && !defined(WOLFSENTRY_NO_JSON) #if !defined(NO_FILESYSTEM) && !defined(WOLFSENTRY_NO_JSON)
if (_wolfsentry_config_path != NULL) { if (_wolfsentry_config_path != NULL) {
char buf[512], err_buf[512]; unsigned char buf[512];
char err_buf[512];
struct wolfsentry_json_process_state *jps; struct wolfsentry_json_process_state *jps;
FILE *f = fopen(_wolfsentry_config_path, "r"); FILE *f = fopen(_wolfsentry_config_path, "r");