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

FIPS Ready Windows Fix

Browse Source 
1. Modify the WIN10 FIPS solution user_settings.h to check for a
   FIPS Ready flag and to override HAVE_FIPS_VERSION to 3 if set.
2. Removed some redundant constants from the EVP file.
This commit is contained in:
John Safranek
2020-09-22 15:23:36 -07:00
parent 5afd313912
commit 54c4258c4b
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
IDE/WIN10/user_settings.h
View File

@@ -1,6 +1,14 @@
#ifndef _WIN_USER_SETTINGS_H_ #ifndef _WIN_USER_SETTINGS_H_
#define _WIN_USER_SETTINGS_H_ #define _WIN_USER_SETTINGS_H_
/* For FIPS Ready, uncomment the following: */
/* #define WOLFSSL_FIPS_READY */
#ifdef WOLFSSL_FIPS_READY
#undef HAVE_FIPS_VERSION
#define HAVE_FIPS_VERSION 3
#endif
/* Verify this is Windows */ /* Verify this is Windows */
#ifndef _WIN32 #ifndef _WIN32
#error This user_settings.h header is only designed for Windows #error This user_settings.h header is only designed for Windows

10
wolfcrypt/src/evp.c
View File

@@ -36,16 +36,6 @@
#if defined(OPENSSL_EXTRA) #if defined(OPENSSL_EXTRA)
#if !defined(HAVE_PKCS7) && \ #if !defined(HAVE_PKCS7) && \
((defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \
(HAVE_FIPS_VERSION > 2)) || defined(HAVE_SELFTEST))
enum {
/* In the event of fips cert 3389 or CAVP selftest build, these enums are
* not in aes.h for use with evp so enumerate it here outside the fips
* boundary */
GCM_NONCE_MID_SZ = 12, /* The usual default nonce size for AES-GCM. */
CCM_NONCE_MIN_SZ = 7,
};
#elif !defined(HAVE_PKCS7) && \
((defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \ ((defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \
(HAVE_FIPS_VERSION == 2)) || defined(HAVE_SELFTEST)) (HAVE_FIPS_VERSION == 2)) || defined(HAVE_SELFTEST))
#include <wolfssl/wolfcrypt/aes.h> #include <wolfssl/wolfcrypt/aes.h>