Merge from main, all conflicts resolved.
authorRichard Levitte <levitte@openssl.org>
Wed, 12 Jul 2000 16:34:34 +0000 (16:34 +0000)
committerRichard Levitte <levitte@openssl.org>
Wed, 12 Jul 2000 16:34:34 +0000 (16:34 +0000)
commitcb9c5dc571977e8a307b187e907d73567f294c9c
treea41f940782eb3f46f588f56c040ddc4c850029c3
parenta6f8bbcad9409c36ef9fdf596835d5aa8e24dd27
Merge from main, all conflicts resolved.

(I do this far too seldom...)
44 files changed:
CHANGES
FAQ
Makefile.org
STATUS
apps/Makefile.ssl
apps/apps.c
apps/apps.h
apps/smime.c
apps/speed.c
crypto/asn1/Makefile.ssl
crypto/asn1/a_bitstr.c
crypto/asn1/a_enum.c
crypto/asn1/a_int.c
crypto/asn1/asn1.h
crypto/asn1/asn1_lib.c
crypto/bio/Makefile.ssl
crypto/bn/bn_mont.c
crypto/bn/bn_rand.c
crypto/comp/Makefile.ssl
crypto/dh/Makefile.ssl
crypto/dsa/Makefile.ssl
crypto/engine/Makefile.ssl
crypto/err/Makefile.ssl
crypto/evp/Makefile.ssl
crypto/hmac/Makefile.ssl
crypto/objects/Makefile.ssl
crypto/objects/obj_dat.h
crypto/objects/objects.h
crypto/objects/objects.txt
crypto/pem/Makefile.ssl
crypto/pkcs12/Makefile.ssl
crypto/pkcs7/Makefile.ssl
crypto/rand/Makefile.ssl
crypto/rsa/Makefile.ssl
crypto/x509/Makefile.ssl
crypto/x509v3/Makefile.ssl
crypto/x509v3/v3_crld.c
doc/crypto/BN_CTX_start.pod
doc/crypto/RAND_egd.pod
ssl/Makefile.ssl
ssl/s3_clnt.c
ssl/ssl.h
test/Makefile.ssl
util/libeay.num