Jung-uk Kim
1f13597d10
Merge OpenSSL 1.0.1c.
...
Approved by: benl (maintainer)
2012-07-12 19:30:53 +00:00
Jung-uk Kim
12de4ed299
Merge OpenSSL 0.9.8x.
...
Reviewed by: stas
Approved by: benl (maintainer)
MFC after: 3 days
2012-06-27 18:44:36 +00:00
Simon L. B. Nielsen
ac7fbc6abd
Readd $FreeBSD$ to the OpenSSL config file as that's useful for
...
mergemaster.
Suggested by: dougb
2010-03-13 22:37:07 +00:00
Simon L. B. Nielsen
6a599222bb
Merge OpenSSL 0.9.8m into head.
...
This also "reverts" some FreeBSD local changes so we should now
be back to using entirely stock OpenSSL. The local changes were
simple $FreeBSD$ lines additions, which were required in the CVS
days, and the patch for FreeBSD-SA-09:15.ssl which has been
superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation
extension' support.
MFC after: 3 weeks
2010-03-13 19:22:41 +00:00
Simon L. B. Nielsen
c4a78426be
Flatten OpenSSL vendor tree.
2008-08-23 10:51:00 +00:00
Simon L. B. Nielsen
09bf29a41f
Resolve conflicts after import of OpenSSL 0.9.8b.
2006-07-29 19:14:51 +00:00
Simon L. B. Nielsen
3b4e3dcb9f
Vendor import of OpenSSL 0.9.8b
2006-07-29 19:10:21 +00:00
Jacques Vidrine
5203f6dc3a
Resolve conflicts after import of OpenSSL 0.9.7e.
2005-02-25 05:49:44 +00:00
Jacques Vidrine
6be8ae0724
Vendor import of OpenSSL 0.9.7e.
2005-02-25 05:39:05 +00:00
Jacques Vidrine
902aa2e784
Resolve conflicts after import of OpenSSL 0.9.7d.
2004-03-17 17:44:39 +00:00
Jacques Vidrine
ced566fd0b
Vendor import of OpenSSL 0.9.7d.
2004-03-17 15:49:33 +00:00
Jacques Vidrine
ede6693b54
Re-add the FreeBSD RCS keyword for the benefit of mergemaster.
...
PR: conf/50040
Requested by: Dimitry Andric <dim@xs4all.nl>
2004-01-09 14:46:11 +00:00
Mark Murray
bff3688511
Merge conflicts.
...
This is cunning doublespeak for "use vendor code".
2003-01-28 22:34:21 +00:00
Mark Murray
5c87c606cd
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
Doug Barton
ea8f54b543
Add a CVS Id tag
2000-10-29 10:00:58 +00:00
Kris Kennaway
f579bf8ec7
Initial import of OpenSSL 0.9.5a
2000-04-13 06:33:22 +00:00
Kris Kennaway
7466462628
Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent
...
infringement reasons.
2000-01-10 06:22:05 +00:00
