Rename fips/sha1/sx86-elf.s to fips/sha1/fips-sx86-elf.s.

diff --git a/Configure b/Configure
index 3c66a0e19a2d538efb229cf988eb8d76f8641278..21e1d0d427961c6f3ce943e0c014d4a14482ae21 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1183,7 +1183,7 @@ if ($fips)
                $openssl_other_defines.="#define OPENSSL_FIPS_DES_ASM\n";
                }
        else {  $fips_des_obj=$fips_des_enc;  }
-       $fips_sha1_obj='asm/sx86-elf.o' if ($sha1_obj =~ /\-elf\.o$/);
+       $fips_sha1_obj='asm/fips-sx86-elf.o' if ($sha1_obj =~ /\-elf\.o$/);
        $des_obj=$sha1_obj="";
        $openssl_other_defines.="#define OPENSSL_FIPS\n";
        }

diff --git a/fips/fipshashes.sha1 b/fips/fipshashes.sha1
index 8c43b003aad4b7f820589b1c0538ea040dd153a1..04dbdcb506b4ed80efcf9fe33452ff5af39ab1c8 100644 (file)
--- a/fips/fipshashes.sha1
+++ b/fips/fipshashes.sha1
@@ -24,6 +24,6 @@ HMAC-SHA1(rsa/fips_rsa_selftest.c)= 70553a5212e86f65b068564946d39b738a201e22
 HMAC-SHA1(sha1/fips_sha1dgst.c)= 10575600a9540eb15188a7d3b0b031e60aedbc18
 HMAC-SHA1(sha1/fips_standalone_sha1.c)= 93203c569097189b47a0085bc9fc55193867d4ce
 HMAC-SHA1(sha1/fips_sha1_selftest.c)= 98910a0c85eff1688bd7adb23e738dc75b39546e
-HMAC-SHA1(sha1/asm/sx86-elf.s)= ae66fb23ab8e1a2287e87a0a2dd30a4b9039fe63
+HMAC-SHA1(sha1/asm/fips-sx86-elf.s)= ae66fb23ab8e1a2287e87a0a2dd30a4b9039fe63
 HMAC-SHA1(sha1/fips_sha_locl.h)= c1b4c82eec5f0ee119658456690f3ea9d77ed1c5
 HMAC-SHA1(sha1/fips_md32_common.h)= 08a057a7b94acf5df4301ea6c894ce14082e1ec4

diff --git a/fips/sha1/Makefile b/fips/sha1/Makefile
index a1e27e3b0f13c7bddb3b7ff84ead88342f45ccc0..237faffede6e6782553f5c25407c142eec29d67d 100644 (file)
--- a/fips/sha1/Makefile
+++ b/fips/sha1/Makefile
@@ -25,7 +25,7 @@ APPS=
 EXE= fips_standalone_sha1$(EXE_EXT)
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_sha1dgst.c fips_sha1_selftest.c asm/sx86-elf.s
+LIBSRC=fips_sha1dgst.c fips_sha1_selftest.c asm/fips-sx86-elf.s
 LIBOBJ=fips_sha1dgst.o fips_sha1_selftest.o $(FIPS_SHA1_ASM_OBJ)
 
 SRC= $(LIBSRC) fips_standalone_sha1.c

diff --git a/fips/sha1/asm/sx86-elf.s b/fips/sha1/asm/fips-sx86-elf.s
similarity index 100%
rename from fips/sha1/asm/sx86-elf.s
rename to fips/sha1/asm/fips-sx86-elf.s

diff --git a/fips/sha1/standalone.sha1 b/fips/sha1/standalone.sha1
index 7279c82541f866818d90bb366a7a65357aa3ca59..eca3b9d79f70cfe7ac937c4184f3ca1fc49fdb45 100644 (file)
--- a/fips/sha1/standalone.sha1
+++ b/fips/sha1/standalone.sha1
@@ -1,6 +1,6 @@
 HMAC-SHA1(fips_sha1dgst.c)= 10575600a9540eb15188a7d3b0b031e60aedbc18
 HMAC-SHA1(fips_sha1_selftest.c)= 98910a0c85eff1688bd7adb23e738dc75b39546e
-HMAC-SHA1(asm/sx86-elf.s)= ae66fb23ab8e1a2287e87a0a2dd30a4b9039fe63
+HMAC-SHA1(asm/fips-sx86-elf.s)= ae66fb23ab8e1a2287e87a0a2dd30a4b9039fe63
 HMAC-SHA1(fips_standalone_sha1.c)= 93203c569097189b47a0085bc9fc55193867d4ce
 HMAC-SHA1(fips_sha_locl.h)= c1b4c82eec5f0ee119658456690f3ea9d77ed1c5
 HMAC-SHA1(fips_md32_common.h)= 08a057a7b94acf5df4301ea6c894ce14082e1ec4