Merge from main trunk, all conflicts resolved.
authorRichard Levitte <levitte@openssl.org>
Tue, 10 Oct 2000 08:40:05 +0000 (08:40 +0000)
committerRichard Levitte <levitte@openssl.org>
Tue, 10 Oct 2000 08:40:05 +0000 (08:40 +0000)
commit5209202f3bb5652808b7315a749ff6943e8c1ef9
treee69e679828767626e3dc288fc3362a06843166be
parent73701c27b3cb9aacead88c0a3f933a269e2c7113
Merge from main trunk, all conflicts resolved.
77 files changed:
CHANGES
Configure
Makefile.org
README
STATUS
apps/apps.c
apps/apps.h
apps/req.c
apps/x509.c
crypto/Makefile.ssl
crypto/asn1/Makefile.ssl
crypto/asn1/a_strex.c
crypto/asn1/a_strnid.c
crypto/asn1/t_x509.c
crypto/bf/Makefile.ssl
crypto/bio/Makefile.ssl
crypto/bio/b_sock.c
crypto/bn/Makefile.ssl
crypto/bn/asm/pa-risc2.s
crypto/bn/asm/pa-risc2W.s
crypto/buffer/Makefile.ssl
crypto/cast/Makefile.ssl
crypto/comp/Makefile.ssl
crypto/conf/Makefile.ssl
crypto/des/Makefile.ssl
crypto/dh/Makefile.ssl
crypto/dsa/Makefile.ssl
crypto/dso/Makefile.ssl
crypto/dso/dso.h
crypto/dso/dso_dl.c
crypto/dso/dso_dlfcn.c
crypto/dso/dso_err.c
crypto/dso/dso_lib.c
crypto/dso/dso_vms.c
crypto/dso/dso_win32.c
crypto/err/Makefile.ssl
crypto/evp/Makefile.ssl
crypto/evp/evp.h
crypto/hmac/Makefile.ssl
crypto/idea/Makefile.ssl
crypto/lhash/Makefile.ssl
crypto/md2/Makefile.ssl
crypto/md4/Makefile.ssl
crypto/md5/Makefile.ssl
crypto/mdc2/Makefile.ssl
crypto/objects/Makefile.ssl
crypto/opensslv.h
crypto/pem/Makefile.ssl
crypto/pkcs12/Makefile.ssl
crypto/pkcs7/Makefile.ssl
crypto/rand/Makefile.ssl
crypto/rc2/Makefile.ssl
crypto/rc4/Makefile.ssl
crypto/rc5/Makefile.ssl
crypto/ripemd/Makefile.ssl
crypto/rsa/Makefile.ssl
crypto/sha/Makefile.ssl
crypto/stack/Makefile.ssl
crypto/txt_db/Makefile.ssl
crypto/x509/Makefile.ssl
crypto/x509/x509.h
crypto/x509v3/Makefile.ssl
crypto/x509v3/v3_prn.c
crypto/x509v3/x509v3.h
doc/crypto/des.pod
doc/crypto/evp.pod
doc/ssl/SSL_pending.pod
doc/ssl/ssl.pod
e_os.h
ms/test.bat
openssl.spec
rsaref/Makefile.ssl
ssl/Makefile.ssl
ssl/ssl.h
ssl/ssl_lib.c
util/libeay.num
util/mkdef.pl