From 59ff7134625d24322cbf998470a80195a543fb4e Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Sat, 30 Jan 1999 13:40:34 +0000 Subject: [PATCH] Break circular dependency between pem and err. --- apps/Makefile.ssl | 204 ++++++++++++++++++++----------------- crypto/asn1/Makefile.ssl | 20 ++-- crypto/err/Makefile.ssl | 2 +- crypto/err/err_all.c | 2 +- crypto/pem/Makefile.ssl | 14 +-- crypto/pem/pem.org | 3 +- crypto/pem/pem2.h | 60 +++++++++++ crypto/x509/Makefile.ssl | 48 ++++----- crypto/x509v3/Makefile.ssl | 74 +++++++------- ssl/Makefile.ssl | 20 ++-- 10 files changed, 262 insertions(+), 185 deletions(-) create mode 100644 crypto/pem/pem2.h diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl index e20e826121..47ed3cccdc 100644 --- a/apps/Makefile.ssl +++ b/apps/Makefile.ssl @@ -145,19 +145,21 @@ asn1pars.o: ../include/crypto.h ../include/des.h ../include/dh.h asn1pars.o: ../include/dsa.h ../include/e_os.h ../include/err.h asn1pars.o: ../include/evp.h ../include/idea.h ../include/md2.h asn1pars.o: ../include/md5.h ../include/mdc2.h ../include/objects.h -asn1pars.o: ../include/pem.h ../include/pkcs7.h ../include/rc2.h -asn1pars.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -asn1pars.o: ../include/rsa.h ../include/sha.h ../include/stack.h -asn1pars.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h +asn1pars.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h +asn1pars.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h +asn1pars.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +asn1pars.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h +asn1pars.o: progs.h ca.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h ca.o: ../include/buffer.h ../include/cast.h ../include/conf.h ca.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h ca.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h ca.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h -ca.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h ../include/rc2.h -ca.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h ../include/rsa.h -ca.o: ../include/sha.h ../include/stack.h ../include/txt_db.h ../include/x509.h -ca.o: ../include/x509_vfy.h ../include/x509v3.h apps.h progs.h +ca.o: ../include/objects.h ../include/pem.h ../include/pem2.h +ca.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +ca.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h +ca.o: ../include/txt_db.h ../include/x509.h ../include/x509_vfy.h +ca.o: ../include/x509v3.h apps.h progs.h ciphers.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ciphers.o: ../include/bn.h ../include/buffer.h ../include/cast.h ciphers.o: ../include/crypto.h ../include/des.h ../include/dh.h @@ -175,16 +177,17 @@ crl.o: ../include/buffer.h ../include/cast.h ../include/crypto.h crl.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h crl.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h crl.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h -crl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -crl.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h -crl.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h +crl.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +crl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h +crl.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h +crl.o: progs.h crl2p7.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h crl2p7.o: ../include/bn.h ../include/buffer.h ../include/cast.h crl2p7.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h crl2p7.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h crl2p7.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -crl2p7.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -crl2p7.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h +crl2p7.o: ../include/objects.h ../include/pem.h ../include/pem2.h +crl2p7.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h crl2p7.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h crl2p7.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h crl2p7.o: progs.h @@ -193,45 +196,48 @@ dgst.o: ../include/bn.h ../include/buffer.h ../include/cast.h dgst.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h dgst.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h dgst.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -dgst.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -dgst.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h -dgst.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h -dgst.o: ../include/x509_vfy.h apps.h progs.h +dgst.o: ../include/objects.h ../include/pem.h ../include/pem2.h +dgst.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +dgst.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +dgst.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h +dgst.o: progs.h dh.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h dh.o: ../include/buffer.h ../include/cast.h ../include/crypto.h dh.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h dh.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h dh.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h -dh.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -dh.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h -dh.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h +dh.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +dh.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h +dh.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h progs.h dsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h dsa.o: ../include/buffer.h ../include/cast.h ../include/crypto.h dsa.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h dsa.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h dsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h -dsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -dsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h -dsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h +dsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +dsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h +dsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h +dsa.o: progs.h dsaparam.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h dsaparam.o: ../include/bn.h ../include/buffer.h ../include/cast.h dsaparam.o: ../include/crypto.h ../include/des.h ../include/dh.h dsaparam.o: ../include/dsa.h ../include/e_os.h ../include/err.h dsaparam.o: ../include/evp.h ../include/idea.h ../include/md2.h dsaparam.o: ../include/md5.h ../include/mdc2.h ../include/objects.h -dsaparam.o: ../include/pem.h ../include/pkcs7.h ../include/rand.h -dsaparam.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -dsaparam.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -dsaparam.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h -dsaparam.o: progs.h +dsaparam.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h +dsaparam.o: ../include/rand.h ../include/rc2.h ../include/rc4.h +dsaparam.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h +dsaparam.o: ../include/sha.h ../include/stack.h ../include/x509.h +dsaparam.o: ../include/x509_vfy.h apps.h progs.h enc.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h enc.o: ../include/buffer.h ../include/cast.h ../include/crypto.h enc.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h enc.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h enc.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h -enc.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -enc.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h -enc.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h +enc.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +enc.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h +enc.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h +enc.o: progs.h errstr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h errstr.o: ../include/bn.h ../include/buffer.h ../include/cast.h errstr.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h @@ -248,9 +254,9 @@ gendh.o: ../include/bn.h ../include/buffer.h ../include/cast.h gendh.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h gendh.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h gendh.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -gendh.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -gendh.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -gendh.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +gendh.o: ../include/objects.h ../include/pem.h ../include/pem2.h +gendh.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h ../include/rc4.h +gendh.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h gendh.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h gendh.o: progs.h gendsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h @@ -258,69 +264,73 @@ gendsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h gendsa.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h gendsa.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h gendsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -gendsa.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -gendsa.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -gendsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -gendsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h -gendsa.o: progs.h +gendsa.o: ../include/objects.h ../include/pem.h ../include/pem2.h +gendsa.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h +gendsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +gendsa.o: ../include/rsa.h ../include/sha.h ../include/stack.h +gendsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h genrsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h genrsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h genrsa.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h genrsa.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h genrsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -genrsa.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -genrsa.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -genrsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -genrsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h -genrsa.o: progs.h +genrsa.o: ../include/objects.h ../include/pem.h ../include/pem2.h +genrsa.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h +genrsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +genrsa.o: ../include/rsa.h ../include/sha.h ../include/stack.h +genrsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h nseq.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h nseq.o: ../include/bn.h ../include/buffer.h ../include/cast.h nseq.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h nseq.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h nseq.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -nseq.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -nseq.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h -nseq.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h -nseq.o: ../include/x509_vfy.h apps.h progs.h +nseq.o: ../include/objects.h ../include/pem.h ../include/pem2.h +nseq.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +nseq.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +nseq.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h +nseq.o: progs.h openssl.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h openssl.o: ../include/bn.h ../include/buffer.h ../include/cast.h openssl.o: ../include/conf.h ../include/crypto.h ../include/des.h openssl.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h openssl.o: ../include/evp.h ../include/idea.h ../include/lhash.h openssl.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -openssl.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -openssl.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -openssl.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -openssl.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h -openssl.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h -openssl.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h +openssl.o: ../include/objects.h ../include/pem.h ../include/pem2.h +openssl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +openssl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h +openssl.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h +openssl.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h +openssl.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h +openssl.o: progs.h s_apps.h pkcs7.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h pkcs7.o: ../include/bn.h ../include/buffer.h ../include/cast.h pkcs7.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h pkcs7.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h pkcs7.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -pkcs7.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -pkcs7.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h -pkcs7.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h -pkcs7.o: ../include/x509_vfy.h apps.h progs.h +pkcs7.o: ../include/objects.h ../include/pem.h ../include/pem2.h +pkcs7.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +pkcs7.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +pkcs7.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h +pkcs7.o: progs.h req.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h req.o: ../include/buffer.h ../include/cast.h ../include/conf.h req.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h req.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h req.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h -req.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -req.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -req.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h -req.o: ../include/x509.h ../include/x509_vfy.h ../include/x509v3.h apps.h -req.o: progs.h +req.o: ../include/objects.h ../include/pem.h ../include/pem2.h +req.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h ../include/rc4.h +req.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h +req.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h +req.o: ../include/x509v3.h apps.h progs.h rsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h rsa.o: ../include/buffer.h ../include/cast.h ../include/crypto.h rsa.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h rsa.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h rsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h -rsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -rsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h -rsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h +rsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +rsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h +rsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h +rsa.o: progs.h s_cb.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s_cb.o: ../include/bn.h ../include/buffer.h ../include/cast.h s_cb.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h @@ -337,24 +347,26 @@ s_client.o: ../include/crypto.h ../include/des.h ../include/dh.h s_client.o: ../include/dsa.h ../include/e_os.h ../include/err.h s_client.o: ../include/evp.h ../include/idea.h ../include/lhash.h s_client.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -s_client.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -s_client.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s_client.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s_client.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h -s_client.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h -s_client.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h +s_client.o: ../include/objects.h ../include/pem.h ../include/pem2.h +s_client.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +s_client.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h +s_client.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h +s_client.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h +s_client.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h +s_client.o: progs.h s_apps.h s_server.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s_server.o: ../include/bn.h ../include/buffer.h ../include/cast.h s_server.o: ../include/crypto.h ../include/des.h ../include/dh.h s_server.o: ../include/dsa.h ../include/e_os.h ../include/err.h s_server.o: ../include/evp.h ../include/idea.h ../include/lhash.h s_server.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -s_server.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -s_server.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s_server.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s_server.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h -s_server.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h -s_server.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h +s_server.o: ../include/objects.h ../include/pem.h ../include/pem2.h +s_server.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +s_server.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h +s_server.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h +s_server.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h +s_server.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h +s_server.o: progs.h s_apps.h s_socket.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s_socket.o: ../include/bn.h ../include/buffer.h ../include/cast.h s_socket.o: ../include/crypto.h ../include/des.h ../include/dh.h @@ -373,23 +385,24 @@ s_time.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h s_time.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h s_time.o: ../include/lhash.h ../include/md2.h ../include/md5.h s_time.o: ../include/mdc2.h ../include/objects.h ../include/pem.h -s_time.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -s_time.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s_time.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h -s_time.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h -s_time.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h +s_time.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h +s_time.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +s_time.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h +s_time.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h +s_time.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h +s_time.o: progs.h s_apps.h sess_id.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h sess_id.o: ../include/bn.h ../include/buffer.h ../include/cast.h sess_id.o: ../include/crypto.h ../include/des.h ../include/dh.h sess_id.o: ../include/dsa.h ../include/e_os.h ../include/err.h ../include/evp.h sess_id.o: ../include/idea.h ../include/lhash.h ../include/md2.h sess_id.o: ../include/md5.h ../include/mdc2.h ../include/objects.h -sess_id.o: ../include/pem.h ../include/pkcs7.h ../include/rc2.h -sess_id.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -sess_id.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h -sess_id.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h -sess_id.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h -sess_id.o: progs.h +sess_id.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h +sess_id.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h +sess_id.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +sess_id.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h +sess_id.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h +sess_id.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h speed.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h speed.o: ../include/bn.h ../include/buffer.h ../include/cast.h speed.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h @@ -404,8 +417,8 @@ verify.o: ../include/bn.h ../include/buffer.h ../include/cast.h verify.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h verify.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h verify.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -verify.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -verify.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h +verify.o: ../include/objects.h ../include/pem.h ../include/pem2.h +verify.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h verify.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h verify.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h verify.o: progs.h @@ -422,7 +435,8 @@ x509.o: ../include/bn.h ../include/buffer.h ../include/cast.h x509.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h x509.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h x509.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -x509.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -x509.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h -x509.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h -x509.o: ../include/x509_vfy.h ../include/x509v3.h apps.h progs.h +x509.o: ../include/objects.h ../include/pem.h ../include/pem2.h +x509.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +x509.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +x509.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h +x509.o: ../include/x509v3.h apps.h progs.h diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl index 00a80b0775..2cdbfbe9f3 100644 --- a/crypto/asn1/Makefile.ssl +++ b/crypto/asn1/Makefile.ssl @@ -230,11 +230,11 @@ a_sign.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h a_sign.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h a_sign.o: ../../include/err.h ../../include/evp.h ../../include/idea.h a_sign.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h -a_sign.o: ../../include/objects.h ../../include/pem.h ../../include/pkcs7.h -a_sign.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -a_sign.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -a_sign.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -a_sign.o: ../cryptlib.h ../crypto.h asn1.h +a_sign.o: ../../include/objects.h ../../include/pem.h ../../include/pem2.h +a_sign.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h +a_sign.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h +a_sign.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h +a_sign.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h a_time.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h a_time.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h a_time.o: ../cryptlib.h ../crypto.h asn1.h @@ -256,11 +256,11 @@ a_verify.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h a_verify.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h a_verify.o: ../../include/err.h ../../include/evp.h ../../include/idea.h a_verify.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h -a_verify.o: ../../include/objects.h ../../include/pem.h ../../include/pkcs7.h -a_verify.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -a_verify.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -a_verify.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -a_verify.o: ../cryptlib.h ../crypto.h asn1.h +a_verify.o: ../../include/objects.h ../../include/pem.h ../../include/pem2.h +a_verify.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h +a_verify.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h +a_verify.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h +a_verify.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h asn1_err.o: ../../include/bn.h ../../include/err.h ../../include/stack.h asn1.h asn1_lib.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h asn1_lib.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl index a8a1341383..d7d163e536 100644 --- a/crypto/err/Makefile.ssl +++ b/crypto/err/Makefile.ssl @@ -87,7 +87,7 @@ err_all.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h err_all.o: ../../include/conf.h ../../include/des.h ../../include/dh.h err_all.o: ../../include/dsa.h ../../include/evp.h ../../include/idea.h err_all.o: ../../include/lhash.h ../../include/md2.h ../../include/md5.h -err_all.o: ../../include/mdc2.h ../../include/objects.h ../../include/pem.h +err_all.o: ../../include/mdc2.h ../../include/objects.h ../../include/pem2.h err_all.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h err_all.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h err_all.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 423216e7c1..6917b48fb2 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -75,7 +75,7 @@ #endif #include "evp.h" #include "objects.h" -#include "pem.h" +#include "pem2.h" #include "x509.h" #include "x509v3.h" #include "conf.h" diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl index 42787f1336..e1b1318d08 100644 --- a/crypto/pem/Makefile.ssl +++ b/crypto/pem/Makefile.ssl @@ -30,7 +30,7 @@ LIBOBJ= pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o $(ERRC).o SRC= $(LIBSRC) -EXHEADER= pem.h +EXHEADER= pem.h pem2.h HEADER= $(EXHEADER) ALL= $(GENERAL) $(SRC) $(HEADER) @@ -115,7 +115,7 @@ pem_all.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h pem_all.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h pem_all.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h pem_all.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -pem_all.o: ../cryptlib.h ../crypto.h pem.h +pem_all.o: ../cryptlib.h ../crypto.h pem.h pem2.h pem_err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h pem_err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h pem_err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h @@ -124,7 +124,7 @@ pem_err.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h pem_err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h pem_err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h pem_err.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h -pem_err.o: ../../include/x509_vfy.h ../crypto.h pem.h +pem_err.o: ../../include/x509_vfy.h ../crypto.h pem.h pem2.h pem_info.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h pem_info.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h pem_info.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -134,7 +134,7 @@ pem_info.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h pem_info.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h pem_info.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h pem_info.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -pem_info.o: ../cryptlib.h ../crypto.h pem.h +pem_info.o: ../cryptlib.h ../crypto.h pem.h pem2.h pem_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h pem_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h pem_lib.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -144,7 +144,7 @@ pem_lib.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h pem_lib.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h pem_lib.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h pem_lib.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h -pem_lib.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h +pem_lib.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h pem2.h pem_seal.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h pem_seal.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h pem_seal.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -154,7 +154,7 @@ pem_seal.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h pem_seal.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h pem_seal.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h pem_seal.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h -pem_seal.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h +pem_seal.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h pem2.h pem_sign.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h pem_sign.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h pem_sign.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -164,4 +164,4 @@ pem_sign.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h pem_sign.o: ../../include/rand.h ../../include/rc2.h ../../include/rc4.h pem_sign.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h pem_sign.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h -pem_sign.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h +pem_sign.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h pem.h pem2.h diff --git a/crypto/pem/pem.org b/crypto/pem/pem.org index 37d19021e1..3d78699ffd 100644 --- a/crypto/pem/pem.org +++ b/crypto/pem/pem.org @@ -73,6 +73,7 @@ extern "C" { #include "evp.h" #include "x509.h" +#include "pem2.h" #define PEM_OBJ_UNDEF 0 #define PEM_OBJ_X509 1 @@ -397,8 +398,6 @@ void PEM_SignUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt); int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, EVP_PKEY *pkey); -void ERR_load_PEM_strings(void); - void PEM_proc_type(char *buf, int type); void PEM_dek_info(char *buf, char *type, int len, char *str); diff --git a/crypto/pem/pem2.h b/crypto/pem/pem2.h new file mode 100644 index 0000000000..4a016aacd2 --- /dev/null +++ b/crypto/pem/pem2.h @@ -0,0 +1,60 @@ +/* ==================================================================== + * Copyright (c) 1999 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * licensing@OpenSSL.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +/* + * This header only exists to break a circular dependency between pem and err + * Ben 30 Jan 1999. + */ + +void ERR_load_PEM_strings(void); diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl index 2c0a0b4f63..67d51f9642 100644 --- a/crypto/x509/Makefile.ssl +++ b/crypto/x509/Makefile.ssl @@ -103,20 +103,20 @@ by_dir.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h by_dir.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h by_dir.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h by_dir.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h -by_dir.o: ../../include/pem.h ../../include/pkcs7.h ../../include/rc2.h -by_dir.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h -by_dir.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h -by_dir.o: ../cryptlib.h ../crypto.h x509.h x509_vfy.h +by_dir.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h +by_dir.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h +by_dir.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h +by_dir.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h by_file.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h by_file.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h by_file.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h by_file.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h by_file.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h by_file.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h -by_file.o: ../../include/pem.h ../../include/pkcs7.h ../../include/rc2.h -by_file.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h -by_file.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h -by_file.o: ../cryptlib.h ../crypto.h x509.h x509_vfy.h +by_file.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h +by_file.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h +by_file.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h +by_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h v3_net.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_net.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_net.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -206,20 +206,20 @@ x509_r2x.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h x509_r2x.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_r2x.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509_r2x.o: ../../include/mdc2.h ../../include/objects.h ../../include/pem.h -x509_r2x.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h -x509_r2x.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h -x509_r2x.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h -x509_r2x.o: x509.h x509_vfy.h +x509_r2x.o: ../../include/pem2.h ../../include/pkcs7.h ../../include/rc2.h +x509_r2x.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h +x509_r2x.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h +x509_r2x.o: ../cryptlib.h ../crypto.h x509.h x509_vfy.h x509_req.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_req.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_req.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h x509_req.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_req.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509_req.o: ../../include/mdc2.h ../../include/objects.h ../../include/pem.h -x509_req.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h -x509_req.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h -x509_req.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h -x509_req.o: x509.h x509_vfy.h +x509_req.o: ../../include/pem2.h ../../include/pkcs7.h ../../include/rc2.h +x509_req.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h +x509_req.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h +x509_req.o: ../cryptlib.h ../crypto.h x509.h x509_vfy.h x509_set.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_set.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_set.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -235,10 +235,10 @@ x509_txt.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h x509_txt.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_txt.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h x509_txt.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h -x509_txt.o: ../../include/pem.h ../../include/pkcs7.h ../../include/rc2.h -x509_txt.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h -x509_txt.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h -x509_txt.o: ../cryptlib.h ../crypto.h x509.h x509_vfy.h +x509_txt.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h +x509_txt.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h +x509_txt.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h +x509_txt.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h x509_v3.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_v3.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_v3.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -254,10 +254,10 @@ x509_vfy.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h x509_vfy.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_vfy.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h x509_vfy.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h -x509_vfy.o: ../../include/pem.h ../../include/pkcs7.h ../../include/rc2.h -x509_vfy.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h -x509_vfy.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h -x509_vfy.o: ../cryptlib.h ../crypto.h x509.h x509_vfy.h +x509_vfy.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h +x509_vfy.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h +x509_vfy.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h +x509_vfy.o: ../../include/stack.h ../cryptlib.h ../crypto.h x509.h x509_vfy.h x509name.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509name.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509name.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl index daa2114cdb..1f414caa11 100644 --- a/crypto/x509v3/Makefile.ssl +++ b/crypto/x509v3/Makefile.ssl @@ -93,21 +93,21 @@ v3_bcons.o: ../../include/conf.h ../../include/crypto.h ../../include/des.h v3_bcons.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h v3_bcons.o: ../../include/evp.h ../../include/idea.h ../../include/lhash.h v3_bcons.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h -v3_bcons.o: ../../include/objects.h ../../include/pem.h ../../include/pkcs7.h -v3_bcons.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -v3_bcons.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -v3_bcons.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_bcons.o: x509v3.h +v3_bcons.o: ../../include/objects.h ../../include/pem.h ../../include/pem2.h +v3_bcons.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h +v3_bcons.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h +v3_bcons.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h +v3_bcons.o: ../../include/x509_vfy.h x509v3.h v3_bitstr.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h v3_bitstr.o: ../../include/blowfish.h ../../include/bn.h ../../include/cast.h v3_bitstr.o: ../../include/conf.h ../../include/crypto.h ../../include/des.h v3_bitstr.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h v3_bitstr.o: ../../include/evp.h ../../include/idea.h ../../include/lhash.h v3_bitstr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h -v3_bitstr.o: ../../include/objects.h ../../include/pem.h ../../include/pkcs7.h -v3_bitstr.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -v3_bitstr.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -v3_bitstr.o: ../../include/stack.h ../../include/x509.h +v3_bitstr.o: ../../include/objects.h ../../include/pem.h ../../include/pem2.h +v3_bitstr.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h +v3_bitstr.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h +v3_bitstr.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h v3_bitstr.o: ../../include/x509_vfy.h x509v3.h v3_conf.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_conf.o: ../../include/bn.h ../../include/cast.h ../../include/conf.h @@ -115,62 +115,66 @@ v3_conf.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h v3_conf.o: ../../include/dsa.h ../../include/err.h ../../include/evp.h v3_conf.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h v3_conf.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h -v3_conf.o: ../../include/pem.h ../../include/pkcs7.h ../../include/rc2.h -v3_conf.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h -v3_conf.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h -v3_conf.o: ../../include/x509.h ../../include/x509_vfy.h x509v3.h +v3_conf.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h +v3_conf.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h +v3_conf.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h +v3_conf.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h +v3_conf.o: x509v3.h v3_extku.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h v3_extku.o: ../../include/blowfish.h ../../include/bn.h ../../include/cast.h v3_extku.o: ../../include/conf.h ../../include/crypto.h ../../include/des.h v3_extku.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h v3_extku.o: ../../include/evp.h ../../include/idea.h ../../include/lhash.h v3_extku.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h -v3_extku.o: ../../include/objects.h ../../include/pem.h ../../include/pkcs7.h -v3_extku.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -v3_extku.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -v3_extku.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_extku.o: x509v3.h +v3_extku.o: ../../include/objects.h ../../include/pem.h ../../include/pem2.h +v3_extku.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h +v3_extku.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h +v3_extku.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h +v3_extku.o: ../../include/x509_vfy.h x509v3.h v3_ia5.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h v3_ia5.o: ../../include/blowfish.h ../../include/bn.h ../../include/cast.h v3_ia5.o: ../../include/conf.h ../../include/crypto.h ../../include/des.h v3_ia5.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h v3_ia5.o: ../../include/evp.h ../../include/idea.h ../../include/lhash.h v3_ia5.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h -v3_ia5.o: ../../include/objects.h ../../include/pem.h ../../include/pkcs7.h -v3_ia5.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -v3_ia5.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -v3_ia5.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_ia5.o: x509v3.h +v3_ia5.o: ../../include/objects.h ../../include/pem.h ../../include/pem2.h +v3_ia5.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h +v3_ia5.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h +v3_ia5.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h +v3_ia5.o: ../../include/x509_vfy.h x509v3.h v3_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_lib.o: ../../include/bn.h ../../include/cast.h ../../include/conf.h v3_lib.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h v3_lib.o: ../../include/dsa.h ../../include/err.h ../../include/evp.h v3_lib.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h v3_lib.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h -v3_lib.o: ../../include/pem.h ../../include/pkcs7.h ../../include/rc2.h -v3_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h -v3_lib.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h -v3_lib.o: ../../include/x509.h ../../include/x509_vfy.h x509v3.h +v3_lib.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h +v3_lib.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h +v3_lib.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h +v3_lib.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h +v3_lib.o: x509v3.h v3_prn.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_prn.o: ../../include/bn.h ../../include/cast.h ../../include/conf.h v3_prn.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h v3_prn.o: ../../include/dsa.h ../../include/err.h ../../include/evp.h v3_prn.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h v3_prn.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h -v3_prn.o: ../../include/pem.h ../../include/pkcs7.h ../../include/rc2.h -v3_prn.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h -v3_prn.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h -v3_prn.o: ../../include/x509.h ../../include/x509_vfy.h x509v3.h +v3_prn.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h +v3_prn.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h +v3_prn.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h +v3_prn.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h +v3_prn.o: x509v3.h v3_utl.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_utl.o: ../../include/bn.h ../../include/cast.h ../../include/conf.h v3_utl.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h v3_utl.o: ../../include/dsa.h ../../include/err.h ../../include/evp.h v3_utl.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h v3_utl.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h -v3_utl.o: ../../include/pem.h ../../include/pkcs7.h ../../include/rc2.h -v3_utl.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h -v3_utl.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h -v3_utl.o: ../../include/x509.h ../../include/x509_vfy.h x509v3.h +v3_utl.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h +v3_utl.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h +v3_utl.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h +v3_utl.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h +v3_utl.o: x509v3.h v3err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3err.o: ../../include/bn.h ../../include/cast.h ../../include/crypto.h v3err.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl index f146a90966..3d7e8ef810 100644 --- a/ssl/Makefile.ssl +++ b/ssl/Makefile.ssl @@ -337,11 +337,11 @@ ssl_cert.o: ../include/comp.h ../include/crypto.h ../include/des.h ssl_cert.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h ssl_cert.o: ../include/evp.h ../include/idea.h ../include/lhash.h ssl_cert.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -ssl_cert.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -ssl_cert.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -ssl_cert.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -ssl_cert.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -ssl_cert.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +ssl_cert.o: ../include/objects.h ../include/pem.h ../include/pem2.h +ssl_cert.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +ssl_cert.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h +ssl_cert.o: ../include/sha.h ../include/stack.h ../include/x509.h +ssl_cert.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h ssl_ciph.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_ciph.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_ciph.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -390,11 +390,11 @@ ssl_rsa.o: ../include/comp.h ../include/crypto.h ../include/des.h ssl_rsa.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h ssl_rsa.o: ../include/evp.h ../include/idea.h ../include/lhash.h ssl_rsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -ssl_rsa.o: ../include/objects.h ../include/pem.h ../include/pkcs7.h -ssl_rsa.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -ssl_rsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -ssl_rsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -ssl_rsa.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +ssl_rsa.o: ../include/objects.h ../include/pem.h ../include/pem2.h +ssl_rsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +ssl_rsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h +ssl_rsa.o: ../include/sha.h ../include/stack.h ../include/x509.h +ssl_rsa.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h ssl_sess.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_sess.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_sess.o: ../include/comp.h ../include/crypto.h ../include/des.h -- 2.34.1