merge from the 0.9.6 branch.
authorRichard Levitte <levitte@openssl.org>
Thu, 20 Dec 2001 09:43:59 +0000 (09:43 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 20 Dec 2001 09:43:59 +0000 (09:43 +0000)
commit6e19a0408070b1ef0127e7756ceedbadd28e330f
tree0638d4eccb2aa041bdd624c34f409f98bec6c251
parent91102def2e87c1ce4e136f5548873f4a83ed151d
merge from the 0.9.6 branch.
14 files changed:
CHANGES
Configure
TABLE
config
crypto/bio/b_print.c
crypto/objects/Makefile.ssl
crypto/objects/obj_dat.h
crypto/objects/obj_dat.pl
crypto/objects/obj_mac.h
crypto/objects/objects.h
crypto/objects/objects.pl
crypto/objects/objects.txt
crypto/pkcs7/pk7_doit.c
doc/ssleay.txt