Commit Graph

28 Commits

Author SHA1 Message Date
Jung-uk Kim
6cdb114c81 Merge OpenSSL 1.0.1u. 2016-09-22 15:05:38 +00:00
Jung-uk Kim
531ac1f984 Merge OpenSSL 1.0.1t.
Relnotes:	yes
2016-05-03 18:54:20 +00:00
Xin LI
2aab9f2e02 Merge OpenSSL 1.0.1s. This is a security update.
Relnotes:	yes
Approved by:	re (so@ implicit)
2016-03-02 15:43:01 +00:00
Jung-uk Kim
be17a92a4c Merge OpenSSL 1.0.1r.
Relnotes:	yes
2016-01-28 21:42:10 +00:00
Jung-uk Kim
2825c95787 Merge OpenSSL 1.0.1q. 2015-12-03 21:18:48 +00:00
Jung-uk Kim
9b07df3490 MFC: r285329
Merge OpenSSL 1.0.1p.

Approved by:	re (gjb)
Relnotes:	yes
2015-07-09 17:17:22 +00:00
Jung-uk Kim
471da71a08 MFC: r284329
Merge OpenSSL 1.0.1o.

Note it is instantly merged because it restores ABI compatibility broken by
the previous OpenSSL 1.0.1n.

Relnotes:	yes
2015-06-12 17:10:19 +00:00
Jung-uk Kim
be71513b0f MFC: r284283
Merge OpenSSL 1.0.1n.
2015-06-11 19:07:45 +00:00
Jung-uk Kim
d202442a08 MFC: r280297
Merge OpenSSL 1.0.1m.

Relnotes:	yes
2015-03-20 21:54:45 +00:00
Jung-uk Kim
342e8b2786 MFC: r277270
Merge OpenSSL 1.0.1l.

Relnotes:	yes
2015-01-23 19:14:36 +00:00
Jung-uk Kim
091098d058 MFC: r276861, r276863
Merge OpenSSL 1.0.1k.
2015-01-09 00:58:20 +00:00
Jung-uk Kim
7bd9d20d0c MFC: r273144, r273146
Merge OpenSSL 1.0.1j.

Relnotes:	yes
2014-10-15 19:59:43 +00:00
Jung-uk Kim
a9a79dc3ba MFC: r269682
Merge OpenSSL 1.0.1i.
2014-08-07 21:04:42 +00:00
Jung-uk Kim
31182c856c MFC: r267256
Merge OpenSSL 1.0.1h.

Approved by:	so (delphij)
2014-06-09 06:00:28 +00:00
Jung-uk Kim
cb73f780a7 MFC: r261037, r264278
Merge OpenSSL 1.0.1f and 1.0.1g.
2014-04-10 22:39:22 +00:00
Jung-uk Kim
09286989d3 Merge OpenSSL 1.0.1e.
Approved by:	secteam (simon), benl (silence)
2013-02-13 23:07:20 +00:00
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
72b8021a0a Merge OpenSSL 0.9.8q into head.
Security:	CVE-2010-4180
Security:	http://www.openssl.org/news/secadv_20101202.txt
MFC after:	3 days
2010-12-03 22:59:54 +00:00
Simon L. B. Nielsen
a3ddd25aba Merge OpenSSL 0.9.8p into head.
Security:	CVE-2010-3864
Security:	http://www.openssl.org/news/secadv_20101116.txt
2010-11-22 18:23:44 +00:00
Simon L. B. Nielsen
ab8565e267 Merge OpenSSL 0.9.8n into head.
This fixes CVE-2010-0740 which only affected -CURRENT (OpenSSL 0.9.8m)
but not -STABLE branches.

I have not yet been able to find out if CVE-2010-0433 impacts FreeBSD.
This will be investigated further.

Security:	CVE-2010-0433, CVE-2010-0740
Security:	http://www.openssl.org/news/secadv_20100324.txt
2010-04-01 15:19:51 +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
db522d3ae4 Merge OpenSSL 0.9.8k into head.
Approved by:	re
2009-06-14 19:45:16 +00:00
Simon L. B. Nielsen
c4a78426be Flatten OpenSSL vendor tree. 2008-08-23 10:51:00 +00:00
Simon L. B. Nielsen
5471f83ea7 Vendor import of OpenSSL 0.9.8e. 2007-03-15 20:03:30 +00:00
Simon L. B. Nielsen
ed5d4f9a94 Vendor import of OpenSSL 0.9.8d. 2006-10-01 07:38:44 +00:00
Simon L. B. Nielsen
3b4e3dcb9f Vendor import of OpenSSL 0.9.8b 2006-07-29 19:10:21 +00:00
Jacques Vidrine
6be8ae0724 Vendor import of OpenSSL 0.9.7e. 2005-02-25 05:39:05 +00:00