summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2005-04-17 22:17:51 +0000
committerAndy Polyakov <appro@openssl.org>2005-04-17 22:17:51 +0000
commit45bc841b2251fc8bd9ad3ab9650711f6d039a784 (patch)
tree85ccce97f1fbdda2ddd03337a8c8b3204a740177
parent7a111bc864a051a90e0ff3e38cdf63a0ed6928bf (diff)
Rename fips/sha1/sx86-elf.s to fips/sha1/fips-sx86-elf.s.
-rwxr-xr-xConfigure2
-rw-r--r--fips/fipshashes.sha12
-rw-r--r--fips/sha1/Makefile2
-rw-r--r--fips/sha1/asm/fips-sx86-elf.s (renamed from fips/sha1/asm/sx86-elf.s)0
-rw-r--r--fips/sha1/standalone.sha12
5 files changed, 4 insertions, 4 deletions
diff --git a/Configure b/Configure
index 3c66a0e19a..21e1d0d427 100755
--- 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 8c43b003aa..04dbdcb506 100644
--- 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 a1e27e3b0f..237faffede 100644
--- 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
index 2a4d98791d..2a4d98791d 100644
--- a/fips/sha1/asm/sx86-elf.s
+++ b/fips/sha1/asm/fips-sx86-elf.s
diff --git a/fips/sha1/standalone.sha1 b/fips/sha1/standalone.sha1
index 7279c82541..eca3b9d79f 100644
--- 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