Finish moving FIPS_allow_md5().

This commit is contained in:
Ben Laurie
2004-04-27 13:38:14 +00:00
parent 50c3727624
commit 8435dc4e8d
11 changed files with 65 additions and 63 deletions

View File

@@ -168,7 +168,7 @@ des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
des_enc.o: ../../include/openssl/ui_compat.h des_enc.c des_locl.h ncbc_enc.c
des_enc.o: ../../include/openssl/ui_compat.h des_enc.c des_locl.h
des_old.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
des_old.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
des_old.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

View File

@@ -101,14 +101,8 @@ sha1_one.o: ../../include/openssl/opensslconf.h
sha1_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
sha1_one.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
sha1_one.o: ../../include/openssl/symhacks.h sha1_one.c
sha1dgst.o: ../../fips/fips_locl.h ../../include/openssl/bio.h
sha1dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
sha1dgst.o: ../../include/openssl/err.h ../../include/openssl/fips.h
sha1dgst.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
sha1dgst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
sha1dgst.o: ../../include/openssl/symhacks.h ../md32_common.h sha1dgst.c
sha1dgst.o: sha_locl.h
sha1dgst.o: ../../include/openssl/opensslconf.h
sha1dgst.o: ../../include/openssl/opensslv.h sha1dgst.c
sha_dgst.o: ../../fips/fips_locl.h ../../include/openssl/bio.h
sha_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
sha_dgst.o: ../../include/openssl/err.h ../../include/openssl/fips.h

View File

@@ -193,4 +193,10 @@ fips.o: ../include/openssl/safestack.h ../include/openssl/sha.h
fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
fips.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h fips.c
fips.o: fips_locl.h
fips_err_wrapper.o: ../include/openssl/opensslconf.h fips_err_wrapper.c
fips_err_wrapper.o: ../include/openssl/bio.h ../include/openssl/crypto.h
fips_err_wrapper.o: ../include/openssl/e_os2.h ../include/openssl/err.h
fips_err_wrapper.o: ../include/openssl/fips.h ../include/openssl/lhash.h
fips_err_wrapper.o: ../include/openssl/opensslconf.h
fips_err_wrapper.o: ../include/openssl/opensslv.h
fips_err_wrapper.o: ../include/openssl/safestack.h ../include/openssl/stack.h
fips_err_wrapper.o: ../include/openssl/symhacks.h fips_err.h fips_err_wrapper.c

View File

@@ -1,4 +1,4 @@
HMAC-SHA1(fips.c)= 4e9bf09e312073c9bc11420cc000c1ddc6f7013c
HMAC-SHA1(fips.c)= 5b66ece7a9df3e471f21937165887be733f251e0
HMAC-SHA1(fips_err_wrapper.c)= d3e2be316062510312269e98f964cb87e7577898
HMAC-SHA1(fips.h)= d6cd192b06fc002a2ca12296a4082de5f2ffa273
HMAC-SHA1(fips.h)= 4496c0e51c18d30bdc0ce440c384886870a61c40
HMAC-SHA1(fips_err.h)= f4203a47100a815c21cf3a97092f91a595938f7c

View File

@@ -112,8 +112,10 @@ fips_sha1_selftest.o: ../../include/openssl/opensslv.h
fips_sha1_selftest.o: ../../include/openssl/safestack.h
fips_sha1_selftest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
fips_sha1_selftest.o: ../../include/openssl/symhacks.h fips_sha1_selftest.c
fips_sha1dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/fips.h
fips_sha1dgst.o: ../../include/openssl/opensslconf.h
fips_sha1dgst.o: ../../include/openssl/opensslv.h fips_sha1dgst.c
fips_sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
fips_sha1dgst.o: fips_md32_common.h fips_sha1dgst.c fips_sha_locl.h
fips_sha1test.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
fips_sha1test.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
fips_sha1test.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h

View File

@@ -456,15 +456,15 @@ s3_both.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
s3_both.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
s3_both.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_both.c
s3_both.o: ssl_locl.h
s3_clnt.o: ../e_os.h ../fips/fips_locl.h ../include/openssl/aes.h
s3_clnt.o: ../include/openssl/asn1.h ../include/openssl/bio.h
s3_clnt.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
s3_clnt.o: ../include/openssl/buffer.h ../include/openssl/cast.h
s3_clnt.o: ../include/openssl/comp.h ../include/openssl/crypto.h
s3_clnt.o: ../include/openssl/des.h ../include/openssl/des_old.h
s3_clnt.o: ../include/openssl/dh.h ../include/openssl/dsa.h
s3_clnt.o: ../include/openssl/e_os2.h ../include/openssl/err.h
s3_clnt.o: ../include/openssl/evp.h ../include/openssl/idea.h
s3_clnt.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
s3_clnt.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
s3_clnt.o: ../include/openssl/bn.h ../include/openssl/buffer.h
s3_clnt.o: ../include/openssl/cast.h ../include/openssl/comp.h
s3_clnt.o: ../include/openssl/crypto.h ../include/openssl/des.h
s3_clnt.o: ../include/openssl/des_old.h ../include/openssl/dh.h
s3_clnt.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
s3_clnt.o: ../include/openssl/err.h ../include/openssl/evp.h
s3_clnt.o: ../include/openssl/fips.h ../include/openssl/idea.h
s3_clnt.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
s3_clnt.o: ../include/openssl/md2.h ../include/openssl/md4.h
s3_clnt.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
@@ -582,15 +582,15 @@ s3_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
s3_pkt.o: ../include/openssl/tls1.h ../include/openssl/ui.h
s3_pkt.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
s3_pkt.o: ../include/openssl/x509_vfy.h s3_pkt.c ssl_locl.h
s3_srvr.o: ../e_os.h ../fips/fips_locl.h ../include/openssl/aes.h
s3_srvr.o: ../include/openssl/asn1.h ../include/openssl/bio.h
s3_srvr.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
s3_srvr.o: ../include/openssl/buffer.h ../include/openssl/cast.h
s3_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h
s3_srvr.o: ../include/openssl/des.h ../include/openssl/des_old.h
s3_srvr.o: ../include/openssl/dh.h ../include/openssl/dsa.h
s3_srvr.o: ../include/openssl/e_os2.h ../include/openssl/err.h
s3_srvr.o: ../include/openssl/evp.h ../include/openssl/idea.h
s3_srvr.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
s3_srvr.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
s3_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
s3_srvr.o: ../include/openssl/cast.h ../include/openssl/comp.h
s3_srvr.o: ../include/openssl/crypto.h ../include/openssl/des.h
s3_srvr.o: ../include/openssl/des_old.h ../include/openssl/dh.h
s3_srvr.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
s3_srvr.o: ../include/openssl/err.h ../include/openssl/evp.h
s3_srvr.o: ../include/openssl/fips.h ../include/openssl/idea.h
s3_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
s3_srvr.o: ../include/openssl/md2.h ../include/openssl/md4.h
s3_srvr.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
@@ -659,15 +659,15 @@ ssl_asn1.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
ssl_asn1.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
ssl_asn1.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_asn1.c
ssl_asn1.o: ssl_locl.h
ssl_cert.o: ../e_os.h ../fips/fips_locl.h ../include/openssl/aes.h
ssl_cert.o: ../include/openssl/asn1.h ../include/openssl/bio.h
ssl_cert.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
ssl_cert.o: ../include/openssl/buffer.h ../include/openssl/cast.h
ssl_cert.o: ../include/openssl/comp.h ../include/openssl/conf.h
ssl_cert.o: ../include/openssl/crypto.h ../include/openssl/des.h
ssl_cert.o: ../include/openssl/des_old.h ../include/openssl/dh.h
ssl_cert.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
ssl_cert.o: ../include/openssl/err.h ../include/openssl/evp.h
ssl_cert.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
ssl_cert.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
ssl_cert.o: ../include/openssl/bn.h ../include/openssl/buffer.h
ssl_cert.o: ../include/openssl/cast.h ../include/openssl/comp.h
ssl_cert.o: ../include/openssl/conf.h ../include/openssl/crypto.h
ssl_cert.o: ../include/openssl/des.h ../include/openssl/des_old.h
ssl_cert.o: ../include/openssl/dh.h ../include/openssl/dsa.h
ssl_cert.o: ../include/openssl/e_os2.h ../include/openssl/err.h
ssl_cert.o: ../include/openssl/evp.h ../include/openssl/fips.h
ssl_cert.o: ../include/openssl/idea.h ../include/openssl/kssl.h
ssl_cert.o: ../include/openssl/lhash.h ../include/openssl/md2.h
ssl_cert.o: ../include/openssl/md4.h ../include/openssl/md5.h
@@ -761,15 +761,15 @@ ssl_err2.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
ssl_err2.o: ../include/openssl/tls1.h ../include/openssl/ui.h
ssl_err2.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
ssl_err2.o: ../include/openssl/x509_vfy.h ssl_err2.c
ssl_lib.o: ../e_os.h ../fips/fips_locl.h ../include/openssl/aes.h
ssl_lib.o: ../include/openssl/asn1.h ../include/openssl/bio.h
ssl_lib.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
ssl_lib.o: ../include/openssl/buffer.h ../include/openssl/cast.h
ssl_lib.o: ../include/openssl/comp.h ../include/openssl/conf.h
ssl_lib.o: ../include/openssl/crypto.h ../include/openssl/des.h
ssl_lib.o: ../include/openssl/des_old.h ../include/openssl/dh.h
ssl_lib.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
ssl_lib.o: ../include/openssl/err.h ../include/openssl/evp.h
ssl_lib.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
ssl_lib.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
ssl_lib.o: ../include/openssl/bn.h ../include/openssl/buffer.h
ssl_lib.o: ../include/openssl/cast.h ../include/openssl/comp.h
ssl_lib.o: ../include/openssl/conf.h ../include/openssl/crypto.h
ssl_lib.o: ../include/openssl/des.h ../include/openssl/des_old.h
ssl_lib.o: ../include/openssl/dh.h ../include/openssl/dsa.h
ssl_lib.o: ../include/openssl/e_os2.h ../include/openssl/err.h
ssl_lib.o: ../include/openssl/evp.h ../include/openssl/fips.h
ssl_lib.o: ../include/openssl/idea.h ../include/openssl/kssl.h
ssl_lib.o: ../include/openssl/lhash.h ../include/openssl/md2.h
ssl_lib.o: ../include/openssl/md4.h ../include/openssl/md5.h
@@ -915,15 +915,15 @@ t1_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
t1_clnt.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
t1_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
t1_clnt.o: t1_clnt.c
t1_enc.o: ../e_os.h ../fips/fips_locl.h ../include/openssl/aes.h
t1_enc.o: ../include/openssl/asn1.h ../include/openssl/bio.h
t1_enc.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
t1_enc.o: ../include/openssl/buffer.h ../include/openssl/cast.h
t1_enc.o: ../include/openssl/comp.h ../include/openssl/crypto.h
t1_enc.o: ../include/openssl/des.h ../include/openssl/des_old.h
t1_enc.o: ../include/openssl/dh.h ../include/openssl/dsa.h
t1_enc.o: ../include/openssl/e_os2.h ../include/openssl/err.h
t1_enc.o: ../include/openssl/evp.h ../include/openssl/hmac.h
t1_enc.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
t1_enc.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
t1_enc.o: ../include/openssl/bn.h ../include/openssl/buffer.h
t1_enc.o: ../include/openssl/cast.h ../include/openssl/comp.h
t1_enc.o: ../include/openssl/crypto.h ../include/openssl/des.h
t1_enc.o: ../include/openssl/des_old.h ../include/openssl/dh.h
t1_enc.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
t1_enc.o: ../include/openssl/err.h ../include/openssl/evp.h
t1_enc.o: ../include/openssl/fips.h ../include/openssl/hmac.h
t1_enc.o: ../include/openssl/idea.h ../include/openssl/kssl.h
t1_enc.o: ../include/openssl/lhash.h ../include/openssl/md2.h
t1_enc.o: ../include/openssl/md4.h ../include/openssl/md5.h

View File

@@ -117,7 +117,7 @@
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/md5.h>
#include "../fips/fips_locl.h"
#include <openssl/fips.h>
static SSL_METHOD *ssl3_get_client_method(int ver);
static int ssl3_client_hello(SSL *s);

View File

@@ -125,7 +125,7 @@
#include <openssl/krb5_asn.h>
#endif
#include <openssl/md5.h>
#include "../fips/fips_locl.h"
#include <openssl/fips.h>
static SSL_METHOD *ssl3_get_server_method(int ver);
static int ssl3_get_client_hello(SSL *s);

View File

@@ -129,7 +129,7 @@
#include <openssl/pem.h>
#include <openssl/x509v3.h>
#include "ssl_locl.h"
#include "../fips/fips_locl.h"
#include <openssl/fips.h>
int SSL_get_ex_data_X509_STORE_CTX_idx(void)
{

View File

@@ -121,7 +121,7 @@
#include <openssl/objects.h>
#include <openssl/lhash.h>
#include <openssl/x509v3.h>
#include "../fips/fips_locl.h"
#include <openssl/fips.h>
const char *SSL_version_str=OPENSSL_VERSION_TEXT;

View File

@@ -115,7 +115,7 @@
#include <openssl/evp.h>
#include <openssl/hmac.h>
#include <openssl/md5.h>
#include "../fips/fips_locl.h"
#include <openssl/fips.h>
static void tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
int sec_len, unsigned char *seed, int seed_len,