jkim
6b741bee15
Merge OpenSSL 1.0.2d.
2015-10-30 20:51:33 +00:00
jkim
d962da16eb
Merge OpenSSL 1.0.1m.
2015-03-20 19:16:18 +00:00
jkim
4f9b1cef1a
Merge OpenSSL 1.0.1k.
2015-01-08 23:42:41 +00:00
jkim
411d431d45
Merge OpenSSL 1.0.1j.
2014-10-15 19:12:05 +00:00
jkim
3299c3be1a
Merge OpenSSL 1.0.1i.
2014-08-07 18:56:10 +00:00
jkim
e393e47b1e
Merge OpenSSL 1.0.1c.
...
Approved by: benl (maintainer)
2012-07-12 19:30:53 +00:00
simon
0d816bbd98
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
5fb395764b
Merge OpenSSL 0.9.8k into head.
...
Approved by: re
2009-06-14 19:45:16 +00:00
simon
64fcbc70db
Flatten OpenSSL vendor tree.
2008-08-23 10:51:00 +00:00
simon
394ba190a3
Resolve conflicts after import of OpenSSL 0.9.8e.
2007-03-15 20:07:27 +00:00
simon
ee48ceb6a8
Vendor import of OpenSSL 0.9.8e.
2007-03-15 20:03:30 +00:00
simon
e07cc0214a
Resolve conflicts after import of OpenSSL 0.9.8b.
2006-07-29 19:14:51 +00:00
simon
fb3c70eda8
Vendor import of OpenSSL 0.9.8b
2006-07-29 19:10:21 +00:00
cperciva
45ad656456
Correct a man-in-the-middle SSL version rollback vulnerability.
...
Security: FreeBSD-SA-05:21.openssl
2005-10-11 11:50:36 +00:00
markm
3f245d6325
Merge conflicts.
...
This is cunning doublespeak for "use vendor code".
2003-01-28 22:34:21 +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
kris
7b695f1ddd
Resolve conflicts.
2002-01-27 03:17:13 +00:00
kris
1f8c2aa176
Initial import of OpenSSL 0.9.6c
2002-01-27 03:13:07 +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
6b5aa79169
Resolve conflicts.
2000-04-13 07:15:03 +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
