From e726e5f1705ac530bb8162a8aa535c538bb7db53 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 5 Sep 2003 13:26:52 +0000 Subject: [PATCH] Make sure the compilation of the FIPS stuff goes through even in non-FIPS mode. Update the appropriate fingerprints accordingly. (something is weird, someone else was working on the same stuff, and removed fips_sha1_selftest.c from fips/sha1/standalone.sha1...) --- fips/aes/fingerprint.sha1 | 2 +- fips/aes/fips_aes_selftest.c | 2 ++ fips/des/fingerprint.sha1 | 2 +- fips/des/fips_des_selftest.c | 2 ++ fips/sha1/fingerprint.sha1 | 2 +- fips/sha1/fips_sha1_selftest.c | 3 +++ fips/sha1/standalone.sha1 | 3 ++- 7 files changed, 12 insertions(+), 4 deletions(-) diff --git a/fips/aes/fingerprint.sha1 b/fips/aes/fingerprint.sha1 index 58728b0f41..8ffba23ecf 100644 --- a/fips/aes/fingerprint.sha1 +++ b/fips/aes/fingerprint.sha1 @@ -1,3 +1,3 @@ SHA1(fips_aes_core.c)= 5298df7807877eed470a1ee5f8331fc0876689da -SHA1(fips_aes_selftest.c)= 56ffcd2eb43b8b19aa4e0f60d3733031b3f54e84 +SHA1(fips_aes_selftest.c)= 49cd793c702170721385f4efc1dc15cf7b18eff0 SHA1(fips_aes_locl.h)= a3c01d9a4f9d5211e9e785852f6f1a2febfd73b6 diff --git a/fips/aes/fips_aes_selftest.c b/fips/aes/fips_aes_selftest.c index 13375f4b82..0bb9f3e48e 100644 --- a/fips/aes/fips_aes_selftest.c +++ b/fips/aes/fips_aes_selftest.c @@ -52,6 +52,7 @@ #include #include +#ifdef FIPS static struct { unsigned char key[16]; @@ -88,3 +89,4 @@ int FIPS_selftest_aes() } return 1; } +#endif diff --git a/fips/des/fingerprint.sha1 b/fips/des/fingerprint.sha1 index ef736b971c..555b9e1384 100644 --- a/fips/des/fingerprint.sha1 +++ b/fips/des/fingerprint.sha1 @@ -1,3 +1,3 @@ SHA1(fips_des_enc.c)= a4b88bb16782604a298d74de04a8b3bc3a204c5a -SHA1(fips_des_selftest.c)= 7f958a8b8fdb1227ec189e5948d7bfa87876fb3b +SHA1(fips_des_selftest.c)= f516832dcb9c49c20adc35c14e2b00ed0ebd36b2 SHA1(fips_des_locl.h)= 5e5128f074485e72d6fdee00d22d46a694bd5abe diff --git a/fips/des/fips_des_selftest.c b/fips/des/fips_des_selftest.c index 0285b00121..30d5e6fa2c 100644 --- a/fips/des/fips_des_selftest.c +++ b/fips/des/fips_des_selftest.c @@ -52,6 +52,7 @@ #include #include +#ifdef FIPS static struct { DES_cblock key; @@ -90,3 +91,4 @@ int FIPS_selftest_des() } return 1; } +#endif diff --git a/fips/sha1/fingerprint.sha1 b/fips/sha1/fingerprint.sha1 index 843ce5ca30..4037968ac8 100644 --- a/fips/sha1/fingerprint.sha1 +++ b/fips/sha1/fingerprint.sha1 @@ -1,4 +1,4 @@ SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5 -SHA1(fips_sha1_selftest.c)= 103e32b34f518cc2f6995e752644fd102cc8d602 +SHA1(fips_sha1_selftest.c)= 2be7c82cba769de0bcce0539ecc854b74a1d16fd SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0 diff --git a/fips/sha1/fips_sha1_selftest.c b/fips/sha1/fips_sha1_selftest.c index 7d2c0f2962..4dd880e537 100644 --- a/fips/sha1/fips_sha1_selftest.c +++ b/fips/sha1/fips_sha1_selftest.c @@ -52,6 +52,7 @@ #include #include +#ifdef FIPS static char *test[]= { "", @@ -87,3 +88,5 @@ int FIPS_selftest_sha1() } return 1; } + +#endif diff --git a/fips/sha1/standalone.sha1 b/fips/sha1/standalone.sha1 index 82be9d326d..bb16f7d29e 100644 --- a/fips/sha1/standalone.sha1 +++ b/fips/sha1/standalone.sha1 @@ -1,4 +1,5 @@ -SHA1(fips_standalone_sha1.c)= bab1d8e16317a02247067f2a47722a721a4a103e SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5 +SHA1(fips_sha1_selftest.c)= 2be7c82cba769de0bcce0539ecc854b74a1d16fd +SHA1(fips_standalone_sha1.c)= bab1d8e16317a02247067f2a47722a721a4a103e SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0 -- 2.25.1