summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2001-07-30 23:57:25 +0000
committerBen Laurie <ben@openssl.org>2001-07-30 23:57:25 +0000
commitdbad169019598981174ff46c7a9bf58373b0e53a (patch)
treece8ca1188d5614648f24b03967785543f1edc8f5
parent3ba5d1cf2eb6ef28ac5f6d9f3d28020d00c5be50 (diff)
Really add the EVP and all of the DES changes.
-rw-r--r--CHANGES9
-rw-r--r--apps/Makefile.ssl1074
-rw-r--r--apps/passwd.c23
-rw-r--r--apps/speed.c16
-rw-r--r--apps/version.c5
-rw-r--r--crypto/asn1/Makefile.ssl726
-rw-r--r--crypto/asn1/a_sign.c6
-rw-r--r--crypto/asn1/a_verify.c4
-rw-r--r--crypto/bf/Makefile.ssl10
-rw-r--r--crypto/bio/Makefile.ssl95
-rw-r--r--crypto/bn/Makefile.ssl47
-rw-r--r--crypto/buffer/Makefile.ssl4
-rw-r--r--crypto/cast/Makefile.ssl10
-rw-r--r--crypto/comp/Makefile.ssl5
-rw-r--r--crypto/conf/Makefile.ssl5
-rw-r--r--crypto/dh/Makefile.ssl45
-rw-r--r--crypto/dsa/Makefile.ssl115
-rw-r--r--crypto/dsa/dsa_gen.c1
-rw-r--r--crypto/dso/Makefile.ssl16
-rw-r--r--crypto/ec/Makefile.ssl15
-rw-r--r--crypto/engine/Makefile.ssl225
-rw-r--r--crypto/err/Makefile.ssl26
-rw-r--r--crypto/evp/Makefile.ssl980
-rw-r--r--crypto/evp/bio_md.c24
-rw-r--r--crypto/evp/bio_ok.c38
-rw-r--r--crypto/evp/digest.c69
-rw-r--r--crypto/evp/e_aes.c10
-rw-r--r--crypto/evp/e_bf.c12
-rw-r--r--crypto/evp/e_cast.c14
-rw-r--r--crypto/evp/e_des.c13
-rw-r--r--crypto/evp/e_des3.c46
-rw-r--r--crypto/evp/e_idea.c20
-rw-r--r--crypto/evp/e_null.c2
-rw-r--r--crypto/evp/e_rc2.c55
-rw-r--r--crypto/evp/e_rc4.c27
-rw-r--r--crypto/evp/e_rc5.c63
-rw-r--r--crypto/evp/e_xcbc_d.c31
-rw-r--r--crypto/evp/evp.h20
-rw-r--r--crypto/evp/evp_enc.c7
-rw-r--r--crypto/evp/evp_key.c3
-rw-r--r--crypto/evp/evp_locl.h43
-rw-r--r--crypto/evp/m_md2.c1
-rw-r--r--crypto/evp/m_md4.c1
-rw-r--r--crypto/evp/m_md5.c1
-rw-r--r--crypto/evp/m_mdc2.c1
-rw-r--r--crypto/evp/p5_crpt.c2
-rw-r--r--crypto/evp/p5_crpt2.c4
-rw-r--r--crypto/evp/p_sign.c2
-rw-r--r--crypto/evp/p_verify.c2
-rw-r--r--crypto/hmac/Makefile.ssl21
-rw-r--r--crypto/hmac/hmac.c30
-rw-r--r--crypto/hmac/hmac.h4
-rw-r--r--crypto/hmac/hmactest.c1
-rw-r--r--crypto/idea/Makefile.ssl10
-rw-r--r--crypto/krb5/Makefile.ssl1
-rw-r--r--crypto/lhash/Makefile.ssl4
-rw-r--r--crypto/md2/Makefile.ssl6
-rw-r--r--crypto/md2/md2test.c1
-rw-r--r--crypto/md4/Makefile.ssl5
-rw-r--r--crypto/md4/md4test.c1
-rw-r--r--crypto/md5/Makefile.ssl5
-rw-r--r--crypto/md5/md5test.c1
-rw-r--r--crypto/mdc2/Makefile.ssl3
-rw-r--r--crypto/mdc2/mdc2dgst.c8
-rw-r--r--crypto/mdc2/mdc2test.c6
-rw-r--r--crypto/objects/Makefile.ssl7
-rw-r--r--crypto/ocsp/Makefile.ssl172
-rw-r--r--crypto/pem/Makefile.ssl202
-rw-r--r--crypto/pem/pem.h3
-rw-r--r--crypto/pem/pem_seal.c27
-rw-r--r--crypto/pkcs12/Makefile.ssl289
-rw-r--r--crypto/pkcs12/p12_key.c2
-rw-r--r--crypto/pkcs12/p12_mutl.c4
-rw-r--r--crypto/pkcs7/Makefile.ssl143
-rw-r--r--crypto/pkcs7/pk7_doit.c9
-rw-r--r--crypto/rand/Makefile.ssl102
-rw-r--r--crypto/rand/md_rand.c12
-rw-r--r--crypto/rand/rand_lcl.h5
-rw-r--r--crypto/rc2/Makefile.ssl10
-rw-r--r--crypto/rc4/Makefile.ssl4
-rw-r--r--crypto/rc5/Makefile.ssl10
-rw-r--r--crypto/rijndael/Makefile.ssl2
-rw-r--r--crypto/ripemd/Makefile.ssl4
-rw-r--r--crypto/ripemd/rmdtest.c1
-rw-r--r--crypto/rsa/Makefile.ssl123
-rw-r--r--crypto/rsa/rsa_oaep.c3
-rw-r--r--crypto/sha/Makefile.ssl8
-rw-r--r--crypto/sha/sha1test.c3
-rw-r--r--crypto/sha/shatest.c3
-rw-r--r--crypto/stack/Makefile.ssl2
-rw-r--r--crypto/txt_db/Makefile.ssl2
-rw-r--r--crypto/ui/Makefile.ssl8
-rw-r--r--crypto/x509/Makefile.ssl436
-rw-r--r--crypto/x509/x509.h4
-rw-r--r--crypto/x509/x509_cmp.c2
-rw-r--r--crypto/x509v3/Makefile.ssl439
-rw-r--r--ssl/Makefile.ssl1192
-rw-r--r--ssl/s2_clnt.c3
-rw-r--r--ssl/s2_enc.c3
-rw-r--r--ssl/s2_lib.c4
-rw-r--r--ssl/s2_srvr.c3
-rw-r--r--ssl/s3_clnt.c5
-rw-r--r--ssl/s3_enc.c15
-rw-r--r--ssl/s3_lib.c5
-rw-r--r--ssl/s3_srvr.c5
-rw-r--r--ssl/t1_enc.c15
-rw-r--r--test/Makefile.ssl235
107 files changed, 2990 insertions, 4616 deletions
diff --git a/CHANGES b/CHANGES
index 03cee2a3e4..224c809508 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,15 @@
*) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
+) applies to 0.9.7 only
+ +) Rationalise EVP so it can be extended: don't include a union of
+ cipher/digest structures, add init/cleanup functions. This also reduces
+ the number of header dependencies.
+ [Ben Laurie]
+
+ +) Make DES key schedule conform to the usual scheme, as well as correcting
+ its structure.
+ [Ben Laurie]
+
+) Enhanced support for IA-64 Unix platforms (well, Linux and HP-UX).
[Andy Polyakov]
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 4bc385a75d..8800c867c5 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -149,820 +149,587 @@ progs.h: progs.pl
# DO NOT DELETE THIS LINE -- make depend depends on it.
app_rand.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-app_rand.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
-app_rand.o: ../include/openssl/buffer.h ../include/openssl/cast.h
+app_rand.o: ../include/openssl/bn.h ../include/openssl/buffer.h
app_rand.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-app_rand.o: ../include/openssl/des.h ../include/openssl/dh.h
-app_rand.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
-app_rand.o: ../include/openssl/engine.h ../include/openssl/evp.h
-app_rand.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-app_rand.o: ../include/openssl/md2.h ../include/openssl/md4.h
-app_rand.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+app_rand.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+app_rand.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+app_rand.o: ../include/openssl/evp.h ../include/openssl/lhash.h
app_rand.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
app_rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
app_rand.o: ../include/openssl/pem.h ../include/openssl/pem2.h
app_rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-app_rand.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-app_rand.o: ../include/openssl/rc5.h ../include/openssl/rd_fst.h
-app_rand.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
app_rand.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
app_rand.o: ../include/openssl/sha.h ../include/openssl/stack.h
-app_rand.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
-app_rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h app_rand.c
-app_rand.o: apps.h
+app_rand.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
+app_rand.o: ../include/openssl/ui.h ../include/openssl/x509.h
+app_rand.o: ../include/openssl/x509_vfy.h app_rand.c apps.h
apps.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-apps.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
-apps.o: ../include/openssl/buffer.h ../include/openssl/cast.h
+apps.o: ../include/openssl/bn.h ../include/openssl/buffer.h
apps.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-apps.o: ../include/openssl/des.h ../include/openssl/dh.h
-apps.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
-apps.o: ../include/openssl/engine.h ../include/openssl/err.h
-apps.o: ../include/openssl/evp.h ../include/openssl/idea.h
-apps.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-apps.o: ../include/openssl/md4.h ../include/openssl/md5.h
-apps.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+apps.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+apps.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+apps.o: ../include/openssl/err.h ../include/openssl/evp.h
+apps.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
apps.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
apps.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
apps.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
apps.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-apps.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-apps.o: ../include/openssl/rc5.h ../include/openssl/rd_fst.h
-apps.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
apps.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
apps.o: ../include/openssl/sha.h ../include/openssl/stack.h
-apps.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
-apps.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-apps.o: ../include/openssl/x509v3.h apps.c apps.h
+apps.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
+apps.o: ../include/openssl/ui.h ../include/openssl/x509.h
+apps.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.c apps.h
asn1pars.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-asn1pars.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
-asn1pars.o: ../include/openssl/buffer.h ../include/openssl/cast.h
+asn1pars.o: ../include/openssl/bn.h ../include/openssl/buffer.h
asn1pars.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-asn1pars.o: ../include/openssl/des.h ../include/openssl/dh.h
-asn1pars.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
-asn1pars.o: ../include/openssl/engine.h ../include/openssl/err.h
-asn1pars.o: ../include/openssl/evp.h ../include/openssl/idea.h
-asn1pars.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-asn1pars.o: ../include/openssl/md4.h ../include/openssl/md5.h
-asn1pars.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+asn1pars.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+asn1pars.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+asn1pars.o: ../include/openssl/err.h ../include/openssl/evp.h
+asn1pars.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
asn1pars.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
asn1pars.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
asn1pars.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-asn1pars.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-asn1pars.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-asn1pars.o: ../include/openssl/rd_fst.h ../include/openssl/rijndael.h
-asn1pars.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+asn1pars.o: ../include/openssl/rand.h ../include/openssl/rsa.h
asn1pars.o: ../include/openssl/safestack.h ../include/openssl/sha.h
asn1pars.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-asn1pars.o: ../include/openssl/ui.h ../include/openssl/x509.h
-asn1pars.o: ../include/openssl/x509_vfy.h apps.h asn1pars.c
+asn1pars.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
+asn1pars.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+asn1pars.o: asn1pars.c
ca.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-ca.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
-ca.o: ../include/openssl/buffer.h ../include/openssl/cast.h
+ca.o: ../include/openssl/bn.h ../include/openssl/buffer.h
ca.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-ca.o: ../include/openssl/des.h ../include/openssl/dh.h ../include/openssl/dsa.h
+ca.o: ../include/openssl/dh.h ../include/openssl/dsa.h
ca.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
ca.o: ../include/openssl/err.h ../include/openssl/evp.h
-ca.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-ca.o: ../include/openssl/md2.h ../include/openssl/md4.h
-ca.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-ca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-ca.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-ca.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ca.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ca.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-ca.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-ca.o: ../include/openssl/rd_fst.h ../include/openssl/rijndael.h
-ca.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-ca.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ca.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
-ca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ca.o: ../include/openssl/x509v3.h apps.h ca.c
+ca.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+ca.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
+ca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ca.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ca.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+ca.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+ca.o: ../include/openssl/sha.h ../include/openssl/stack.h
+ca.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
+ca.o: ../include/openssl/ui.h ../include/openssl/x509.h
+ca.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ca.c
ciphers.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-ciphers.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
-ciphers.o: ../include/openssl/buffer.h ../include/openssl/cast.h
+ciphers.o: ../include/openssl/bn.h ../include/openssl/buffer.h