Commit 899ffab2 authored by Ben Laurie's avatar Ben Laurie
Browse files

Make FIPS work again.

parent 577332db
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ SDIRS= objects \
	buffer bio stack lhash rand err \
	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5

FDIRS=	sha1 rand des aes dsa
FDIRS=	sha1 rand des aes dsa rsa

# tests to perform.  "alltests" is a special word indicating that all tests
# should be performed.
+2 −2
Original line number Diff line number Diff line
SHA1(fips_aes_core.c)= 5298df7807877eed470a1ee5f8331fc0876689da
SHA1(fips_aes_selftest.c)= 49cd793c702170721385f4efc1dc15cf7b18eff0
SHA1(fips_aes_core.c)= 638c2707398fea4181243b0d7a2d6acd33084659
SHA1(fips_aes_selftest.c)= b41f520aa90f813de815ee77ade4e7c73ef147b0
SHA1(fips_aes_locl.h)= a3c01d9a4f9d5211e9e785852f6f1a2febfd73b6
+2 −2
Original line number Diff line number Diff line
SHA1(fips_des_enc.c)= a4b88bb16782604a298d74de04a8b3bc3a204c5a
SHA1(fips_des_selftest.c)= f516832dcb9c49c20adc35c14e2b00ed0ebd36b2
SHA1(fips_des_enc.c)= 75389f527cc456178e6a2e35f82bf49f98fe3e90
SHA1(fips_des_selftest.c)= 4165967e54097aab14e6737525c7f34e052d7b16
SHA1(fips_des_locl.h)= a4cf60ca32476a2483b3e4460ec9a19c0444fd20
+2 −1
Original line number Diff line number Diff line
@@ -51,8 +51,9 @@
#include <openssl/err.h>
#include <openssl/fips.h>
#include <openssl/des.h>
#include <openssl/opensslconf.h>

#ifdef FIPS
#ifdef OPENSSL_FIPS
static struct
    {
    DES_cblock key;
+1 −1
Original line number Diff line number Diff line
#
# SSLeay/fips/sha1/Makefile
# SSLeay/fips/dsa/Makefile
#

DIR=	dsa
Loading