Merge of stuff from main trunk, all conflicts resolved.
authorRichard Levitte <levitte@openssl.org>
Mon, 19 Jun 2000 14:44:57 +0000 (14:44 +0000)
committerRichard Levitte <levitte@openssl.org>
Mon, 19 Jun 2000 14:44:57 +0000 (14:44 +0000)
commit7ed20a21587bf02890c4db6b8b5482b823bb9aa6
tree618d3f040dc81dd18e8088955fd40b126801eaa6
parent6c621506745b80e6485d5d12416662f0615810ae
Merge ... stuff from main trunk, all conflicts resolved.
48 files changed:
CHANGES
Makefile.org
STATUS
VMS/vms_idhacks.h
apps/rsa.c
crypto/asn1/asn1.h
crypto/asn1/d2i_s_pr.c
crypto/asn1/n_pkey.c
crypto/bio/bio.h
crypto/bio/bss_log.c
crypto/bn/bn_shift.c
crypto/conf/conf.h
crypto/cpt_err.c
crypto/cryptlib.c
crypto/crypto-lib.com
crypto/crypto.h
crypto/dso/README
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_null.c
crypto/dso/dso_win32.c
crypto/engine/hw_ncipher.c
crypto/evp/evp_key.c
crypto/install.com
crypto/objects/o_names.c
crypto/pkcs12/pkcs12.h
crypto/pkcs7/pk7_mime.c
crypto/pkcs7/pkcs7.h
crypto/rand/randfile.c
crypto/rsa/rsa.h
crypto/stack/safestack.h
crypto/stack/stack.c
crypto/stack/stack.h
crypto/x509/x509.h
crypto/x509/x509_vfy.h
crypto/x509v3/x509v3.h
doc/apps/rsa.pod
doc/c-indentation.el
doc/crypto/threads.pod
makevms.com
ssl/ssl.h
util/libeay.num
util/mkdef.pl
util/mklink.pl
util/mkstack.pl