- merged in the latest from the main trunk, fixed all conflicts
authorRichard Levitte <levitte@openssl.org>
Tue, 13 Jun 2000 16:21:06 +0000 (16:21 +0000)
committerRichard Levitte <levitte@openssl.org>
Tue, 13 Jun 2000 16:21:06 +0000 (16:21 +0000)
commit86787f93d6eaf0eac05fae34b1841e1068c73672
tree6b35b65cbb63cd3e65418d1cfdeb77c4c98948c4
parent05d909c5498c85e54417ce8ad9bc60365d9cbbd7
- merged in the latest from the main trunk, fixed all conflicts
- implemented nCipher support via the nfhwcrhk library (not well tested).
- make update + make depend
70 files changed:
CHANGES
Configure
TABLE
apps/Makefile.ssl
apps/genrsa.c
apps/x509.c
crypto/Makefile.ssl
crypto/asn1/Makefile.ssl
crypto/asn1/asn1.h
crypto/bio/Makefile.ssl
crypto/bn/Makefile.ssl
crypto/bn/bn.h
crypto/bn/bn_err.c
crypto/bn/bn_exp.c
crypto/bn/bn_exp2.c
crypto/bn/bn_lcl.h
crypto/buffer/Makefile.ssl
crypto/des/Makefile.ssl
crypto/dh/Makefile.ssl
crypto/dh/dh.h
crypto/dsa/Makefile.ssl
crypto/dsa/dsa.h
crypto/dso/Makefile.ssl
crypto/engine/Makefile.ssl
crypto/engine/engine.h
crypto/engine/engine_err.c
crypto/engine/hw_ncipher.c [new file with mode: 0644]
crypto/engine/vendor_defns/hwcryptohook.h [new file with mode: 0644]
crypto/err/err.h
crypto/evp/Makefile.ssl
crypto/evp/evp.h
crypto/evp/evp_locl.h
crypto/evp/p_open.c
crypto/evp/p_seal.c
crypto/lhash/Makefile.ssl
crypto/lhash/lh_stats.c
crypto/lhash/lhash.h
crypto/md2/Makefile.ssl
crypto/mdc2/Makefile.ssl
crypto/objects/Makefile.ssl
crypto/objects/objects.h
crypto/pem/Makefile.ssl
crypto/pem/pem.h
crypto/pkcs12/Makefile.ssl
crypto/pkcs7/Makefile.ssl
crypto/rand/Makefile.ssl
crypto/rsa/Makefile.ssl
crypto/rsa/rsa.h
crypto/stack/Makefile.ssl
crypto/stack/stack.c
crypto/txt_db/txt_db.h
crypto/x509/Makefile.ssl
crypto/x509/x509.h
crypto/x509/x509_vfy.h
crypto/x509v3/Makefile.ssl
crypto/x509v3/v3_lib.c
crypto/x509v3/v3_utl.c
crypto/x509v3/x509v3.h
doc/apps/x509.pod
doc/crypto/BN_mod_mul_montgomery.pod
doc/crypto/EVP_EncryptInit.pod
doc/crypto/EVP_OpenInit.pod
doc/crypto/EVP_SealInit.pod
e_os.h
rsaref/Makefile.ssl
ssl/Makefile.ssl
ssl/ssl.h
ssl/ssl3.h
test/Makefile.ssl
util/libeay.num