5 Commits

Author SHA1 Message Date
kris
6b5aa79169 Resolve conflicts. 2000-04-13 07:15:03 +00:00
kris
40ba664ca8 This commit was generated by cvs2svn to compensate for changes in r59191,
which included commits to RCS files with non-trunk default branches.
2000-04-13 06:33:22 +00:00
kris
54c77f990d Initial import of OpenSSL 0.9.5a 2000-04-13 06:33:22 +00:00
kris
728ac76565 Fix breakage when NO_RSA specified.
Reviewed by:	Ben Laurie <ben@openssl.org>
2000-01-14 05:24:08 +00:00
kris
2e467dc342 Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent
infringement reasons.
2000-01-10 06:22:05 +00:00