提交 017bc57b 编写于 作者: D Dr. Stephen Henson

Experimental FIPS symbol renaming.

Fixups under fips/ to make symbol renaming work.
上级 d749e108
...@@ -4,6 +4,12 @@ ...@@ -4,6 +4,12 @@
Changes between 1.0.1 and 1.1.0 [xx XXX xxxx] Changes between 1.0.1 and 1.1.0 [xx XXX xxxx]
*) Add experimental option FIPSSYMS to give all symbols in
fipscanister.o and FIPS or fips prefix. This will avoid
conflicts with future versions of OpenSSL. Only works for
no-asm at present.
[Steve Henson]
*) Add selftest checks and algorithm block of non-fips algorithms in *) Add selftest checks and algorithm block of non-fips algorithms in
FIPS mode. Remove DES2 from selftests. FIPS mode. Remove DES2 from selftests.
[Steve Henson] [Steve Henson]
......
...@@ -49,7 +49,7 @@ FIPS_OBJ_LISTS=sha/lib hmac/lib rand/lib des/lib aes/lib dsa/lib rsa/lib \ ...@@ -49,7 +49,7 @@ FIPS_OBJ_LISTS=sha/lib hmac/lib rand/lib des/lib aes/lib dsa/lib rsa/lib \
SRC= $(LIBSRC) SRC= $(LIBSRC)
EXHEADER=fips.h fipshacks.h EXHEADER=fips.h fipssyms.h
HEADER=$(EXHEADER) fips_utl.h fips_locl.h HEADER=$(EXHEADER) fips_utl.h fips_locl.h
EXE=fipsld EXE=fipsld
......
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <openssl/crypto.h>
#include <openssl/des.h> #include <openssl/des.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/bn.h> #include <openssl/bn.h>
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#define OPENSSL_FIPSAPI #define OPENSSL_FIPSAPI
#include <openssl/crypto.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/fips_rand.h> #include <openssl/fips_rand.h>
#include <openssl/err.h> #include <openssl/err.h>
......
此差异已折叠。
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
/* /*
* This is a FIPS approved AES PRNG based on ANSI X9.31 A.2.4. * This is a FIPS approved AES PRNG based on ANSI X9.31 A.2.4.
*/ */
#include <openssl/crypto.h>
#include "e_os.h" #include "e_os.h"
/* If we don't define _XOPEN_SOURCE_EXTENDED, struct timeval won't /* If we don't define _XOPEN_SOURCE_EXTENDED, struct timeval won't
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <openssl/opensslconf.h> #include <openssl/crypto.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/hmac.h> #include <openssl/hmac.h>
#include <openssl/fips.h> #include <openssl/fips.h>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册