Merge from main trunk, conflicts resolved
authorRichard Levitte <levitte@openssl.org>
Tue, 1 Aug 2000 12:21:46 +0000 (12:21 +0000)
committerRichard Levitte <levitte@openssl.org>
Tue, 1 Aug 2000 12:21:46 +0000 (12:21 +0000)
commit1ba5b1b53029f4997e9b671881312ce55dad6c59
tree114050ece107b3ed6925b18281e285a80044e982
parentd786112124e325f9704d904d3d05a5ef4b995b99
Merge from main trunk, conflicts resolved
51 files changed:
.cvsignore
CHANGES
Configure
INSTALL.W32
Makefile.org
TABLE
apps/apps.c
apps/apps.h
apps/asn1pars.c
apps/passwd.c
apps/req.c
apps/smime.c
apps/verify.c
apps/x509.c
crypto/asn1/Makefile.ssl
crypto/asn1/a_enum.c
crypto/asn1/a_int.c
crypto/asn1/a_object.c
crypto/asn1/asn1.h
crypto/asn1/asn1_par.c
crypto/asn1/d2i_dsap.c
crypto/asn1/d2i_r_pu.c
crypto/asn1/d2i_s_pu.c
crypto/bio/b_dump.c
crypto/bio/b_sock.c
crypto/bio/bio.h
crypto/bn/bn_mul.c
crypto/bn/bn_word.c
crypto/crypto.h
crypto/err/err.c
crypto/evp/bio_b64.c
crypto/opensslv.h
crypto/rand/Makefile.ssl
crypto/rand/md_rand.c
crypto/rand/rand.h
crypto/rand/rand_win.c
crypto/rsa/rsa_ssl.c
crypto/x509/x509.h
crypto/x509/x509_set.c
crypto/x509/x509_vfy.c
doc/apps/CA.pl.pod
doc/apps/passwd.pod
doc/apps/smime.pod
doc/apps/x509.pod
doc/standards.txt
ssl/s23_clnt.c
ssl/s23_srvr.c
util/libeay.num
util/mk1mf.pl
util/mkerr.pl
util/pl/linux.pl