Main trunk changes merged into BRANCH_engine. There were no
authorRichard Levitte <levitte@openssl.org>
Tue, 30 May 2000 07:16:56 +0000 (07:16 +0000)
committerRichard Levitte <levitte@openssl.org>
Tue, 30 May 2000 07:16:56 +0000 (07:16 +0000)
commit6a1129837ab4b803202a910b707f776f39206705
tree40837ba6741441cd5374951dc4742993c88d3306
parent20ca3d49e76dab44e1a418cb83024b4f77d2299e
Main trunk changes merged into BRANCH_engine.  There were no
conflicts, which is a good thing.  Propper tagging of merge point
done.
48 files changed:
CHANGES
Configure
STATUS
crypto/asn1/a_utctm.c
crypto/conf/conf.h
crypto/dso/dso_win32.c
crypto/evp/Makefile.ssl
crypto/evp/e_cbc_3d.c [deleted file]
crypto/evp/e_cbc_bf.c [deleted file]
crypto/evp/e_cbc_c.c [deleted file]
crypto/evp/e_cbc_d.c [deleted file]
crypto/evp/e_cbc_i.c [deleted file]
crypto/evp/e_cbc_r2.c [deleted file]
crypto/evp/e_cbc_r5.c [deleted file]
crypto/evp/e_cfb_3d.c [deleted file]
crypto/evp/e_cfb_bf.c [deleted file]
crypto/evp/e_cfb_c.c [deleted file]
crypto/evp/e_cfb_d.c [deleted file]
crypto/evp/e_cfb_i.c [deleted file]
crypto/evp/e_cfb_r2.c [deleted file]
crypto/evp/e_cfb_r5.c [deleted file]
crypto/evp/e_ecb_3d.c [deleted file]
crypto/evp/e_ecb_bf.c [deleted file]
crypto/evp/e_ecb_c.c [deleted file]
crypto/evp/e_ecb_d.c [deleted file]
crypto/evp/e_ecb_i.c [deleted file]
crypto/evp/e_ecb_r2.c [deleted file]
crypto/evp/e_ecb_r5.c [deleted file]
crypto/evp/e_null.c
crypto/evp/e_ofb_3d.c [deleted file]
crypto/evp/e_ofb_bf.c [deleted file]
crypto/evp/e_ofb_c.c [deleted file]
crypto/evp/e_ofb_d.c [deleted file]
crypto/evp/e_ofb_i.c [deleted file]
crypto/evp/e_ofb_r2.c [deleted file]
crypto/evp/e_ofb_r5.c [deleted file]
crypto/evp/e_rc4.c
crypto/evp/e_xcbc_d.c
crypto/evp/evp.h
crypto/evp/evp_enc.c
crypto/evp/evp_err.c
crypto/pkcs7/pk7_doit.c
doc/apps/speed.pod
doc/crypto/DH_set_method.pod
doc/crypto/DSA_set_method.pod
ssl/s2_clnt.c
ssl/s3_clnt.c
util/libeay.num