Use common source files for FIPS mode and utilize same optimizations.

diff --git a/CHANGES b/CHANGES
index 37af6c570e136571d78ff67f655db802b6d6c494..157dfc23cbc70c2cece6e4c52560fbc7dfde8631 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 
  Changes between 0.9.8e and 0.9.8f-fips  [xx XXX xxxx]
 
+  *) Use standard implementations of SHAx, DES, AES under crypto/ in FIPS
+     mode to avoid having to maintain two versions. This will also make use
+     of appropriate assembly language optimizations.
+     [Steve Henson]
+
   *) Check for selftest status in all crypto operations and exit with a
      fatal error if selftest failed.
      [Steve Henson]

diff --git a/Configure b/Configure
index bb35763882c44c87bc8c11e65bb05099ce6cbe48..aca0995563c0141f6f7fcb009bbd845e9ce4d9d6 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1223,24 +1223,8 @@ $bn_obj = $bn_asm unless $bn_obj ne "";
 $cflags.=" -DOPENSSL_BN_ASM_PART_WORDS" if ($bn_obj =~ /bn86/);
 $cflags.=" -DOPENSSL_IA32_SSE2" if (!$no_sse2 && $bn_obj =~ /bn86/);
 
-my $fips_des_obj;
-my $fips_aes_obj;
-my $fips_sha1_obj;
 if ($fips)
        {
-       if ($des_obj =~ /\-elf\.o$/)
-               {
-               $fips_des_obj='asm/fips-dx86-elf.o';
-               $openssl_other_defines.="#define OPENSSL_FIPS_DES_ASM\n";
-               $fips_aes_obj='asm/fips-ax86-elf.o';
-               $openssl_other_defines.="#define OPENSSL_FIPS_AES_ASM\n";
-               }
-       else    {
-               $fips_des_obj=$fips_des_enc;
-               $fips_aes_obj='fips_aes_core.o';
-               }
-       $fips_sha1_obj='asm/fips-sx86-elf.o' if ($sha1_obj =~ /\-elf\.o$/);
-       $des_obj=$sha1_obj=$aes_obj="";
        $openssl_other_defines.="#define OPENSSL_FIPS\n";
        }
 
@@ -1354,8 +1338,6 @@ while (<IN>)
        s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/;
        s/^CPUID_OBJ=.*$/CPUID_OBJ= $cpuid_obj/;
        s/^BN_ASM=.*$/BN_ASM= $bn_obj/;
-       s/^FIPS_DES_ENC=.*$/FIPS_DES_ENC= $fips_des_obj/;
-       s/^FIPS_AES_ENC=.*$/FIPS_AES_ENC= $fips_aes_obj/;
        s/^DES_ENC=.*$/DES_ENC= $des_obj/;
        s/^AES_ASM_OBJ=.*$/AES_ASM_OBJ= $aes_obj/;
        s/^BF_ENC=.*$/BF_ENC= $bf_obj/;
@@ -1364,7 +1346,6 @@ while (<IN>)
        s/^RC5_ENC=.*$/RC5_ENC= $rc5_obj/;
        s/^MD5_ASM_OBJ=.*$/MD5_ASM_OBJ= $md5_obj/;
        s/^SHA1_ASM_OBJ=.*$/SHA1_ASM_OBJ= $sha1_obj/;
-       s/^FIPS_SHA1_ASM_OBJ=.*$/FIPS_SHA1_ASM_OBJ= $fips_sha1_obj/;
        s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $rmd160_obj/;
        s/^PROCESSOR=.*/PROCESSOR= $processor/;
        s/^RANLIB=.*/RANLIB= $ranlib/;

diff --git a/Makefile.org b/Makefile.org
index f7c8aa9eb37f8532e0d22198c2ea4ba0e6b4f74c..9074e83f22a40655d09b9a104a9272d089410b22 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -87,8 +87,6 @@ PROCESSOR=
 # CPUID module collects small commonly used assembler snippets
 CPUID_OBJ= 
 BN_ASM= bn_asm.o
-FIPS_DES_ENC= des_enc.o fcrypt_b.o
-FIPS_AES_ENC= fips_aes_core.o
 DES_ENC= des_enc.o fcrypt_b.o
 AES_ASM_OBJ=aes_core.o aes_cbc.o
 BF_ENC= bf_enc.o
@@ -96,7 +94,6 @@ CAST_ENC= c_enc.o
 RC4_ENC= rc4_enc.o
 RC5_ENC= rc5_enc.o
 MD5_ASM_OBJ= 
-FIPS_SHA1_ASM_OBJ= 
 SHA1_ASM_OBJ= 
 RMD160_ASM_OBJ= 
 
@@ -222,9 +219,6 @@ BUILDENV=   PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
                SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'                  \
                MD5_ASM_OBJ='${MD5_ASM_OBJ}'                    \
                RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'              \
-               FIPS_SHA1_ASM_OBJ='${FIPS_SHA1_ASM_OBJ}'        \
-               FIPS_DES_ENC='${FIPS_DES_ENC}'                  \
-               FIPS_AES_ENC='${FIPS_AES_ENC}'                  \
                FIPSLIBDIR='${FIPSLIBDIR}' FIPSCANLIB='${FIPSCANLIB}' \
                FIPSCANISTERINTERNAL='${FIPSCANISTERINTERNAL}'  \
                FIPS_EX_OBJ='${FIPS_EX_OBJ}'    \
@@ -259,8 +253,7 @@ BUILD_ONE_CMD=\
 reflect:
        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
 
-FIPS_EX_OBJ= ../crypto/aes/aes_cbc.o \
-       ../crypto/aes/aes_cfb.o \
+FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/aes/aes_ecb.o \
        ../crypto/aes/aes_ofb.o \
        ../crypto/bn/bn_add.o \
@@ -286,13 +279,12 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cbc.o \
        ../crypto/des/cfb64ede.o \
        ../crypto/des/cfb64enc.o \
        ../crypto/des/cfb_enc.o \
-       ../crypto/des/des_enc.o \
        ../crypto/des/ecb3_enc.o \
        ../crypto/des/ecb_enc.o \
        ../crypto/des/ofb64ede.o \
        ../crypto/des/ofb64enc.o \
-       ../crypto/des/fcrypt_b.o \
        ../crypto/des/fcrypt.o \
+       ../crypto/des/set_key.o \
        ../crypto/dsa/dsa_utl.o \
        ../crypto/dsa/dsa_sign.o \
        ../crypto/dsa/dsa_vrf.o \
@@ -319,6 +311,9 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cbc.o \
        ../crypto/rsa/rsa_pss.o \
        ../crypto/rsa/rsa_ssl.o \
        ../crypto/rsa/rsa_x931.o \
+       ../crypto/sha/sha1dgst.o \
+       ../crypto/sha/sha256.o \
+       ../crypto/sha/sha512.o \
        ../crypto/uid.o
 
 sub_all: build_all
@@ -328,7 +323,7 @@ build_libs: build_crypto build_fips build_ssl build_engines
 
 build_crypto:
        if [ -n "$(FIPSCANLIB)" ]; then \
-               EXCL_OBJ='$(BN_ASM) $(CPUID_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
+               EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
                ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
        else \
                ARX='${AR}' ; \

diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index 0e8003193e4c4cd9d6c7797dbc8de74471afa94d..b6f8a7dd97e9d6fc2471f191f066d4d0db5e459d 100644 (file)
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -39,8 +39,6 @@
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
-#ifndef OPENSSL_FIPS
-
 /*
 Te0[x] = S [x].[02, 01, 01, 03];
 Te1[x] = S [x].[03, 02, 01, 01];
@@ -633,6 +631,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        int i = 0;
        u32 temp;
 
+#ifdef OPENSSL_FIPS
+       FIPS_selftest_check();
+#endif
+
        if (!userKey || !key)
                return -1;
        if (bits != 128 && bits != 192 && bits != 256)
@@ -1159,5 +1161,3 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
 }
 
 #endif /* AES_ASM */
-
-#endif

diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c
index 975a09b973af62ffef144434ef73b8fab5edeb6d..cf71965acae09720284ccb22b8bc5d0a2dbe4e55 100644 (file)
--- a/crypto/des/des_enc.c
+++ b/crypto/des/des_enc.c
@@ -58,8 +58,6 @@
 
 #include "des_locl.h"
 
-#ifndef OPENSSL_FIPS
-
 void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
        {
        register DES_LONG l,r,t,u;
@@ -289,8 +287,6 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
        data[1]=r;
        }
 
-#endif
-
 #ifndef DES_DEFAULT_OPTIONS
 
 #if !defined(OPENSSL_FIPS_DES_ASM)

diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index a169f8b78e969a105b3cc9f1da876d83114f5aad..46bb4cc945a29860ea779c07aa9ac7c51bcde77e 100644 (file)
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -65,8 +65,6 @@
  */
 #include "des_locl.h"
 
-#ifndef OPENSSL_FIPS
-
 OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key);   /* defaults to false */
 
 static const unsigned char odd_parity[256]={
@@ -351,6 +349,10 @@ void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
        k = &schedule->ks->deslong[0];
        in = &(*key)[0];
 
+#ifdef OPENSSL_FIPS
+       FIPS_selftest_check();
+#endif
+
        c2l(in,c);
        c2l(in,d);
 
@@ -408,4 +410,3 @@ void des_fixup_key_parity(des_cblock *key)
        }
 */
 
-#endif

diff --git a/crypto/sha/sha1_one.c b/crypto/sha/sha1_one.c
index f10d0b2af1ef7d9187aa44dc2e0e09e32aa1ebc3..4831174198e73a5a12f573dc512173f230698228 100644 (file)
--- a/crypto/sha/sha1_one.c
+++ b/crypto/sha/sha1_one.c
@@ -61,7 +61,7 @@
 #include <openssl/sha.h>
 #include <openssl/crypto.h>
 
-#if !defined(OPENSSL_NO_SHA1) && !defined(OPENSSL_FIPS)
+#if !defined(OPENSSL_NO_SHA1)
 unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md)
        {
        SHA_CTX c;

diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
index 1cb812cbdd483721619f9cce0abcdaa01aa792d1..50d1925cdeb261887d2926140e53fe9cbf4387bd 100644 (file)
--- a/crypto/sha/sha1dgst.c
+++ b/crypto/sha/sha1dgst.c
@@ -64,18 +64,11 @@
 
 #include <openssl/opensslv.h>
 
-#ifndef OPENSSL_FIPS
 const char SHA1_version[]="SHA1" OPENSSL_VERSION_PTEXT;
 
 /* The implementation is in ../md32_common.h */
 
 #include "sha_locl.h"
 
-#else
-
-static void *dummy=&dummy;
-
-#endif
-
 #endif
 

diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c
index 3e8d1d673de80fcf6a5ff3440e5151248f90f84d..c1cdf089e168ab008af9e1e2eb17a946cda27633 100644 (file)
--- a/crypto/sha/sha256.c
+++ b/crypto/sha/sha256.c
@@ -15,12 +15,13 @@
 #include <openssl/fips.h>
 #include <openssl/opensslv.h>
 
-#ifndef OPENSSL_FIPS
-
 const char SHA256_version[]="SHA-256" OPENSSL_VERSION_PTEXT;
 
 int SHA224_Init (SHA256_CTX *c)
        {
+#ifdef OPENSSL_FIPS
+       FIPS_selftest_check();
+#endif
        c->h[0]=0xc1059ed8UL;   c->h[1]=0x367cd507UL;
        c->h[2]=0x3070dd17UL;   c->h[3]=0xf70e5939UL;
        c->h[4]=0xffc00b31UL;   c->h[5]=0x68581511UL;
@@ -32,6 +33,9 @@ int SHA224_Init (SHA256_CTX *c)
 
 int SHA256_Init (SHA256_CTX *c)
        {
+#ifdef OPENSSL_FIPS
+       FIPS_selftest_check();
+#endif
        c->h[0]=0x6a09e667UL;   c->h[1]=0xbb67ae85UL;
        c->h[2]=0x3c6ef372UL;   c->h[3]=0xa54ff53aUL;
        c->h[4]=0x510e527fUL;   c->h[5]=0x9b05688cUL;
@@ -320,5 +324,3 @@ void HASH_BLOCK_DATA_ORDER (SHA256_CTX *ctx, const void *in, size_t num)
 {   sha256_block (ctx,in,num,0);   }
 
 #endif /* OPENSSL_NO_SHA256 */
-
-#endif

diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c
index e05f6fd9612b3aee8aced0caf6ca6b8d2a48b049..45edbd2d2d2911f293ede144a9a4f8cacc34c871 100644 (file)
--- a/crypto/sha/sha512.c
+++ b/crypto/sha/sha512.c
@@ -6,7 +6,7 @@
  */
 #include <openssl/opensslconf.h>
 #include <openssl/fips.h>
-#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA512) && !defined(OPENSSL_FIPS)
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA512)
 /*
  * IMPLEMENTATION NOTES.
  *
@@ -59,6 +59,9 @@ const char SHA512_version[]="SHA-512" OPENSSL_VERSION_PTEXT;
 
 int SHA384_Init (SHA512_CTX *c)
        {
+#ifdef OPENSSL_FIPS
+       FIPS_selftest_check();
+#endif
        c->h[0]=U64(0xcbbb9d5dc1059ed8);
        c->h[1]=U64(0x629a292a367cd507);
        c->h[2]=U64(0x9159015a3070dd17);
@@ -74,6 +77,9 @@ int SHA384_Init (SHA512_CTX *c)
 
 int SHA512_Init (SHA512_CTX *c)
        {
+#ifdef OPENSSL_FIPS
+       FIPS_selftest_check();
+#endif
        c->h[0]=U64(0x6a09e667f3bcc908);
        c->h[1]=U64(0xbb67ae8584caa73b);
        c->h[2]=U64(0x3c6ef372fe94f82b);

diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h
index d65de44af0f431e6cdcd952431200ad8f4e8d30c..3b1cea84e448f27bc7e904b16e9e87d0d18b369e 100644 (file)
--- a/crypto/sha/sha_locl.h
+++ b/crypto/sha/sha_locl.h
@@ -151,6 +151,9 @@ FIPS_NON_FIPS_MD_Init(SHA)
 int HASH_INIT (SHA_CTX *c)
 #endif
        {
+#if defined(SHA_1) && defined(OPENSSL_FIPS)
+       FIPS_selftest_check();
+#endif
        c->h0=INIT_DATA_h0;
        c->h1=INIT_DATA_h1;
        c->h2=INIT_DATA_h2;

diff --git a/fips-1.0/Makefile b/fips-1.0/Makefile
index 8aa273284039d3a536eaf8e9bc7b7d4fdc6c1526..f929e93d46525e75174268ee217934480690b754 100644 (file)
--- a/fips-1.0/Makefile
+++ b/fips-1.0/Makefile
@@ -81,13 +81,16 @@ all:
 # vendor compiler drivers...
 
 fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
-       @FIPS_BN_ASM=""; for i in $(BN_ASM) ; do FIPS_BN_ASM="$$FIPS_BN_ASM ../crypto/bn/$$i" ; done; \
+       FIPS_ASM=""; for i in $(BN_ASM) ; do FIPS_ASM="$$FIPS_ASM ../crypto/bn/$$i" ; done; \
+       for i in $(AES_ASM_OBJ) ; do FIPS_ASM="$$FIPS_ASM ../crypto/aes/$$i" ; done; \
+       for i in $(DES_ENC) ; do FIPS_ASM="$$FIPS_ASM ../crypto/des/$$i" ; done; \
+       for i in $(SHA1_ASM_OBJ) ; do FIPS_ASM="$$FIPS_ASM ../crypto/sha/$$i" ; done; \
        if [ -n "$(CPUID_OBJ)" ]; then \
                CPUID=../crypto/$(CPUID_OBJ) ; \
        else \
                CPUID="" ; \
        fi ; \
-       objs="fips_start.o $(LIBOBJ) $(FIPS_EX_OBJ) $$CPUID $$FIPS_BN_ASM"; \
+       objs="fips_start.o $(LIBOBJ) $(FIPS_EX_OBJ) $$CPUID $$FIPS_ASM"; \
        for i in $(FIPS_OBJ_LISTS); do \
                dir=`dirname $$i`; script="s|^|$$dir/|;s| | $$dir/|g"; \
                objs="$$objs `sed "$$script" $$i`"; \

diff --git a/fips-1.0/aes/Makefile b/fips-1.0/aes/Makefile
index 7c86c21f7968088d7d25f23a2605c314dda56535..46eb9fa9da7ed5c1ca2bdc2fc24eef19b077554f 100644 (file)
--- a/fips-1.0/aes/Makefile
+++ b/fips-1.0/aes/Makefile
@@ -15,8 +15,6 @@ MAKEDEPEND=   $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 MAKEFILE=      Makefile
 AR=            ar r
 
-FIPS_AES_ENC=fips_aes_core.o
-
 ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
@@ -28,8 +26,8 @@ TESTDATA=fips_aes_data
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_aes_core.c asm/fips-ax86-elf.s fips_aes_selftest.c
-LIBOBJ=$(FIPS_AES_ENC) fips_aes_selftest.o
+LIBSRC=fips_aes_selftest.c
+LIBOBJ=fips_aes_selftest.o
 
 SRC= $(LIBSRC)
 
@@ -44,7 +42,6 @@ top:
 all:   lib
 
 lib:   $(LIBOBJ)
-       echo FIPS_AES_ENC: $(FIPS_AES_ENC)
        @echo $(LIBOBJ) > lib
 
 files:

diff --git a/fips-1.0/des/Makefile b/fips-1.0/des/Makefile
index 97ce708903ed3f65a00adf6646b36a37a91f036e..ae24e33fb27415046f0836ae163e91789528feb3 100644 (file)
--- a/fips-1.0/des/Makefile
+++ b/fips-1.0/des/Makefile
@@ -18,8 +18,6 @@ AR=           ar r
 ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
-FIPS_DES_ENC=fips_des_enc.o
-
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
@@ -27,8 +25,8 @@ TEST= fips_desmovs.c
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_des_enc.c asm/fips-dx86-elf.s fips_des_selftest.c fips_set_key.c
-LIBOBJ=$(FIPS_DES_ENC) fips_des_selftest.o fips_set_key.o
+LIBSRC=fips_des_selftest.c
+LIBOBJ=fips_des_selftest.o
 
 SRC= $(LIBSRC)
 

diff --git a/fips-1.0/dsa/fips_dssvs.c b/fips-1.0/dsa/fips_dssvs.c
index 2a0da15f646a86fb30154b6fa9516423d44789c2..e1fb00ffbcb185a921e0e40aa2968b07c0f4aa88 100644 (file)
--- a/fips-1.0/dsa/fips_dssvs.c
+++ b/fips-1.0/dsa/fips_dssvs.c
@@ -230,7 +230,6 @@ void sigver()
     int n;
     char *keyword, *value;
     int nmod=0;
-    unsigned char hash[20];
     DSA_SIG sg, *sig = &sg;
 
     sig->r = NULL;
@@ -266,10 +265,8 @@ void sigver()
            }
        else if(!strcmp(keyword,"Msg"))
            {
-
            n=hex2bin(value,msg);
            pv("Msg",msg,n);
-           SHA1(msg,n,hash);
            }
        else if(!strcmp(keyword,"Y"))
            dsa->pub_key=hex2bn(value);

diff --git a/fips-1.0/fips_test_suite.c b/fips-1.0/fips_test_suite.c
index 856599aa32933ce24c1e4fd26232a6148e21df4e..7ec593129506fd7d6a0e85842bbec5dd9d33161e 100644 (file)
--- a/fips-1.0/fips_test_suite.c
+++ b/fips-1.0/fips_test_suite.c
@@ -190,7 +190,7 @@ static int FIPS_sha1_test()
     unsigned char md[SHA_DIGEST_LENGTH];
 
     ERR_clear_error();
-    if (!SHA1(str,sizeof(str) - 1,md)) return 0;
+    if (!EVP_Digest(str,sizeof(str) - 1,md, NULL, EVP_sha1(), NULL)) return 0;
     if (memcmp(md,digest,sizeof(md)))
         return 0;
     return 1;

diff --git a/fips-1.0/sha/Makefile b/fips-1.0/sha/Makefile
index 67a929b8101fcf6d14adbbd48cce1f3673de193b..5e836ea6f75e49ab11515990d54a44700ec33baf 100644 (file)
--- a/fips-1.0/sha/Makefile
+++ b/fips-1.0/sha/Makefile
@@ -28,10 +28,8 @@ APPS=
 EXE= fips_standalone_sha1$(EXE_EXT)
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_sha1dgst.c fips_sha1_selftest.c asm/fips-sx86-elf.s \
-       fips_sha256.c fips_sha512.c
-LIBOBJ=fips_sha1dgst.o fips_sha1_selftest.o $(FIPS_SHA1_ASM_OBJ) \
-       fips_sha256.o fips_sha512.o
+LIBSRC=fips_sha1_selftest.c
+LIBOBJ=fips_sha1_selftest.o
 
 SRC= $(LIBSRC) fips_standalone_sha1.c
 
@@ -48,9 +46,10 @@ all: fips_standalone_sha1$(EXE_EXT) lib
 lib:   $(LIBOBJ)
        @echo $(LIBOBJ) > lib
 
-fips_standalone_sha1$(EXE_EXT): fips_standalone_sha1.o fips_sha1dgst.o $(FIPS_SHA1_ASM_OBJ)
+fips_standalone_sha1$(EXE_EXT): fips_standalone_sha1.o
+       FIPS_SHA_ASM=""; for i in $(SHA1_ASM_OBJ) ; do FIPS_SHA_ASM="$$FIPS_SHA_ASM ../../crypto/sha/$$i" ; done; \
        $(CC) -o fips_standalone_sha1$(EXE_EXT) $(CFLAGS) \
-               fips_standalone_sha1.o fips_sha1dgst.o $(FIPS_SHA1_ASM_OBJ)
+               fips_standalone_sha1.o ../crypto/sha/sha1dgst.o $$FIPS_SHA_ASM
 
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

diff --git a/fips-1.0/sha/fips_sha1_selftest.c b/fips-1.0/sha/fips_sha1_selftest.c
index 73a65cdc065fb5090595d067691bbfc6db1f6387..efae7470aa990073058b6d658ba6ca73657b6a40 100644 (file)
--- a/fips-1.0/sha/fips_sha1_selftest.c
+++ b/fips-1.0/sha/fips_sha1_selftest.c
@@ -50,7 +50,8 @@
 #include <string.h>
 #include <openssl/err.h>
 #include <openssl/fips.h>
-#include <openssl/fips_sha.h>
+#include <openssl/evp.h>
+#include <openssl/sha.h>
 
 #ifdef OPENSSL_FIPS
 static char test[][60]=
@@ -83,7 +84,7 @@ int FIPS_selftest_sha1()
        {
        unsigned char md[SHA_DIGEST_LENGTH];
 
-       SHA1((unsigned char*)test[n],strlen(test[n]),md);
+       EVP_Digest(test[n],strlen(test[n]),md, NULL, EVP_sha1(), NULL);
        if(memcmp(md,ret[n],sizeof md))
            {
            FIPSerr(FIPS_F_FIPS_SELFTEST_SHA,FIPS_R_SELFTEST_FAILED);