jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
196,653 Commits 78 Branches 140 Tags 3.5 GiB
5ac1c8e14e
Commit Graph

42 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
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
Xin LI
4d7eabc985 Fix multiple OpenSSL vulnerabilities. 
Security:	FreeBSD-SA-15:06.openssl
Security:	CVE-2015-0209
Security:	CVE-2015-0286
Security:	CVE-2015-0287
Security:	CVE-2015-0288
Security:	CVE-2015-0289
Security:	CVE-2015-0293
 2015-03-19 17:40:43 +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
b39da7f721 Change "the the" to "the". It is a continuation of r226436 and missed in 
r237658.

Approved by:	benl (maintainer, implicit)
 2013-02-13 22:38: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
77db8b179b Partially redo r226436, i. e., change "the the" to "the". ca(1), dgst(1), 
and engine(3) are generated from these pod files during merge process and
we do not want to re-apply these changes over and over again.

Approved by:	benl (maintainer, implicit)
 2012-06-27 19:23:29 +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
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
Jacques Vidrine
01c0bb1d8a Clean up the OpenSSL vendor branch by removing files that are not 
part of recent releases.
 2005-02-25 05:25:37 +00:00
Jacques Vidrine
ced566fd0b Vendor import of OpenSSL 0.9.7d. 2004-03-17 15:49:33 +00:00
Jacques Vidrine
50ef009353 Vendor import of OpenSSL 0.9.7c 2003-10-01 12:32:41 +00:00
Jacques Vidrine
fceca8a377 Vendor import of OpenSSL 0.9.7a. 2003-02-19 23:17:42 +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
Jacques Vidrine
4f20a5a274 Import of OpenSSL 0.9.6e. 2002-07-30 13:38:06 +00:00
Jacques Vidrine
c1803d7836 Import of OpenSSL 0.9.6d. 2002-07-30 12:44:15 +00:00
Kris Kennaway
a21b1b381e Initial import of OpenSSL 0.9.6c 2002-01-27 03:13:07 +00:00
Kris Kennaway
26d191b459 Initial import of OpenSSL 0.9.6b 2001-07-19 19:59:37 +00:00
Kris Kennaway
5740a5e34c Initial import of OpenSSL 0.9.6a 2001-05-20 03:07:21 +00:00
Kris Kennaway
de7cdddab1 Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10 2001-02-18 03:17:36 +00:00
Kris Kennaway
ddd58736f0 Initial import of OpenSSL 0.9.6 2000-11-13 01:03: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