Commit Graph

12 Commits

Author SHA1 Message Date
nectar
367ddb50f9 Merge conflicts after import of OpenSSL 0.9.7c. 2003-10-01 12:37:51 +00:00
markm
3f245d6325 Merge conflicts.
This is cunning doublespeak for "use vendor code".
2003-01-28 22:34:21 +00:00
markm
33af127a88 This commit was generated by cvs2svn to compensate for changes in r109998,
which included commits to RCS files with non-trunk default branches.
2003-01-28 21:43:22 +00:00
markm
aad1d64cb5 Vendor import of OpenSSL release 0.9.7. This release includes
support for AES and OpenBSD's hardware crypto.
2003-01-28 21:43:22 +00:00
nectar
2f13e09165 Import of OpenSSL 0.9.6e. 2002-07-30 13:38:06 +00:00
nectar
9b2d850453 This commit was generated by cvs2svn to compensate for changes in r100936,
which included commits to RCS files with non-trunk default branches.
2002-07-30 13:38:06 +00:00
kris
76c54c9ba3 Resolve conflicts, and garbage collect some local changes that are no
longer required
2000-11-13 02:20:29 +00:00
kris
539b977eff Initial import of OpenSSL 0.9.6 2000-11-13 01:03:58 +00:00
kris
f648020584 This commit was generated by cvs2svn to compensate for changes in r68651,
which included commits to RCS files with non-trunk default branches.
2000-11-13 01:03:58 +00:00
markm
f8f9ad64d4 Internat diff reducer. 2000-04-16 17:49:31 +00:00
kris
54c77f990d Initial import of OpenSSL 0.9.5a 2000-04-13 06:33:22 +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