generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make FIPS work again.

Browse Source
This commit is contained in:
Ben Laurie 2003-09-25 20:04:40 +00:00
parent 577332db14
commit 899ffab2c9
13 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.org
View File

@ -184,7 +184,7 @@ SDIRS= objects \
buffer bio stack lhash rand err \ buffer bio stack lhash rand err \
evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 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 # tests to perform. "alltests" is a special word indicating that all tests
# should be performed. # should be performed.

4
fips/aes/fingerprint.sha1
View File

@ -1,3 +1,3 @@
SHA1(fips_aes_core.c)= 5298df7807877eed470a1ee5f8331fc0876689da SHA1(fips_aes_core.c)= 638c2707398fea4181243b0d7a2d6acd33084659
SHA1(fips_aes_selftest.c)= 49cd793c702170721385f4efc1dc15cf7b18eff0 SHA1(fips_aes_selftest.c)= b41f520aa90f813de815ee77ade4e7c73ef147b0
SHA1(fips_aes_locl.h)= a3c01d9a4f9d5211e9e785852f6f1a2febfd73b6 SHA1(fips_aes_locl.h)= a3c01d9a4f9d5211e9e785852f6f1a2febfd73b6

4
fips/des/fingerprint.sha1
View File

@ -1,3 +1,3 @@
SHA1(fips_des_enc.c)= a4b88bb16782604a298d74de04a8b3bc3a204c5a SHA1(fips_des_enc.c)= 75389f527cc456178e6a2e35f82bf49f98fe3e90
SHA1(fips_des_selftest.c)= f516832dcb9c49c20adc35c14e2b00ed0ebd36b2 SHA1(fips_des_selftest.c)= 4165967e54097aab14e6737525c7f34e052d7b16
SHA1(fips_des_locl.h)= a4cf60ca32476a2483b3e4460ec9a19c0444fd20 SHA1(fips_des_locl.h)= a4cf60ca32476a2483b3e4460ec9a19c0444fd20

3
fips/des/fips_des_selftest.c
View File

@ -51,8 +51,9 @@
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/fips.h> #include <openssl/fips.h>
#include <openssl/des.h> #include <openssl/des.h>
#include <openssl/opensslconf.h>
#ifdef FIPS #ifdef OPENSSL_FIPS
static struct static struct
{ {
DES_cblock key; DES_cblock key;

2
fips/dsa/Makefile.ssl
View File

@ -1,5 +1,5 @@
# #
# SSLeay/fips/sha1/Makefile # SSLeay/fips/dsa/Makefile
# #
DIR= dsa DIR= dsa

4
fips/dsa/fingerprint.sha1
View File

@ -1,2 +1,2 @@
SHA1(fips_dsa_ossl.c)= eb769361b524507754bcbfbda92b973e37433478 SHA1(fips_dsa_ossl.c)= 7902d159932771d749ecba2ebf78995240356990
SHA1(fips_dsa_gen.c)= 6cd992b01f8b612dcdda7273cdc2302b05e39175 SHA1(fips_dsa_gen.c)= 37549c7769084e9989a3a26f7732557d3b691812

6
fips/fingerprint.sha1
View File

@ -1,4 +1,4 @@
SHA1(fips.c)= e7af483a2ca3c0a845b4528b936e143bfdae945e SHA1(fips.c)= 3224544013a0115b0e1516f2b4c248b0b7f5e820
SHA1(fips_err_wrapper.c)= 527047304bfaa75f6ace20b4f7ac3afb6d89d480 SHA1(fips_err_wrapper.c)= ad4a2ffa18743c83827de398c811eb6124ba0b27
SHA1(fips.h)= 58386539af75f8f622b041a43bf1880fee8642f7 SHA1(fips.h)= 638e5f4d564fd503a6060bc49567c52fc21d8d10
SHA1(fips_err.h)= 8d9fd3ab3e6ca5297c5714e7f6cd9834e22b4cba SHA1(fips_err.h)= 8d9fd3ab3e6ca5297c5714e7f6cd9834e22b4cba

2
fips/fips_check_sha1
View File

@ -3,6 +3,6 @@
FP=$1 FP=$1
shift shift
egrep '^CFLAG=.*-DFIPS( |$)' $TOP/Makefile || exit 0 egrep 'define OPENSSL_FIPS' $TOP/include/openssl/opensslconf.h > /dev/null || exit 0
$TOP/fips/sha1/fips_standalone_sha1 $@ | diff -u $FP - || { echo; echo "*** Your source code does not match the FIPS certified source ***"; echo; exit 1; } $TOP/fips/sha1/fips_standalone_sha1 $@ | diff -u $FP - || { echo; echo "*** Your source code does not match the FIPS certified source ***"; echo; exit 1; }

2
fips/fips_err_wrapper.c
View File

@ -1,3 +1,5 @@
#include <openssl/opensslconf.h>
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
# include "fips_err.h" # include "fips_err.h"
#else #else

4
fips/sha1/fingerprint.sha1
View File

@ -1,4 +1,4 @@
SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5 SHA1(fips_sha1dgst.c)= c197020b866c1ab32f1e30f5599592e14fcaa925
SHA1(fips_sha1_selftest.c)= 2be7c82cba769de0bcce0539ecc854b74a1d16fd SHA1(fips_sha1_selftest.c)= 55fef82fa5f4aec6b1359847fe50555ff77cec49
SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c
SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0 SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0

1
fips/sha1/fips_sha1dgst.c
View File

@ -62,6 +62,7 @@
#define SHA_1 #define SHA_1
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include <openssl/opensslconf.h>
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
const char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT; const char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT;

1
fips/sha1/fips_standalone_sha1.c
View File

@ -48,6 +48,7 @@
*/ */
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/opensslconf.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

6
fips/sha1/standalone.sha1
View File

@ -1,5 +1,5 @@
SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5 SHA1(fips_sha1dgst.c)= c197020b866c1ab32f1e30f5599592e14fcaa925
SHA1(fips_sha1_selftest.c)= 2be7c82cba769de0bcce0539ecc854b74a1d16fd SHA1(fips_sha1_selftest.c)= 55fef82fa5f4aec6b1359847fe50555ff77cec49
SHA1(fips_standalone_sha1.c)= 3af5efe6edb65bd4ab2f5de5db425a8295a897b1 SHA1(fips_standalone_sha1.c)= cee2161ed76a5d5146ae2f2c28012d5764830d7f
SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c
SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0 SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0