Jung-uk Kim
c4ad4dffb3
Merge OpenSSL 1.0.2n.
2017-12-07 18:02:57 +00:00
Jung-uk Kim
47902a71f3
Merge OpenSSL 1.0.2m.
2017-11-02 18:04:29 +00:00
Jung-uk Kim
ed7112f094
Merge OpenSSL 1.0.2l.
2017-05-25 20:52:16 +00:00
Jung-uk Kim
6cf8931a2f
Merge OpenSSL 1.0.2k.
2017-01-26 19:10:29 +00:00
Jung-uk Kim
aeb5019c48
Merge OpenSSL 1.0.2i.
2016-09-22 13:27:44 +00:00
Jung-uk Kim
b8721c1643
Merge OpenSSL 1.0.2h.
...
Relnotes: yes
2016-05-03 18:50:10 +00:00
Jung-uk Kim
4c6a0400b9
Merge OpenSSL 1.0.2g.
...
Relnotes: yes
2016-03-01 22:08:28 +00:00
Jung-uk Kim
8180e704ac
Merge OpenSSL 1.0.2f.
...
Relnotes: yes
2016-01-28 20:15:22 +00:00
Jung-uk Kim
80815a778e
Merge OpenSSL 1.0.2e.
2015-12-03 21:13:35 +00:00
Jung-uk Kim
7bded2db17
Merge OpenSSL 1.0.2d.
2015-10-30 20:51:33 +00:00
Jung-uk Kim
ed6b93be54
Merge OpenSSL 1.0.1n.
2015-06-11 19:00:55 +00:00
Jung-uk Kim
6f9291cea8
Merge OpenSSL 1.0.1m.
2015-03-20 19:16:18 +00:00
Jung-uk Kim
dc2b908f54
Merge OpenSSL 1.0.1l.
...
MFC after: 1 week
Relnotes: yes
2015-01-16 21:03:23 +00:00
Jung-uk Kim
de496999fe
MFV: r276862
...
Fix build.
2015-01-09 00:42:10 +00:00
Jung-uk Kim
751d29910b
Merge OpenSSL 1.0.1k.
2015-01-08 23:42:41 +00:00
Jung-uk Kim
fa5fddf171
Merge OpenSSL 1.0.1j.
2014-10-15 19:12:05 +00:00
Jung-uk Kim
a93cbc2be8
Merge OpenSSL 1.0.1i.
2014-08-07 18:56:10 +00:00
Jung-uk Kim
560ede85d4
Merge OpenSSL 1.0.1g.
...
Approved by: benl (maintainer)
2014-04-08 21:06:58 +00:00
Jung-uk Kim
de78d5d8fd
Merge OpenSSL 1.0.1f.
...
Approved by: so (delphij), benl (silence)
2014-01-22 19:57:11 +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
Pedro F. Giffuni
646a7fea0c
Clean some 'svn:executable' properties in the tree.
...
Submitted by: Christoph Mallon
MFC after: 3 days
2013-01-26 22:08:21 +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
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
03b688114f
This commit was generated by cvs2svn to compensate for changes in r167612,
...
which included commits to RCS files with non-trunk default branches.
2007-03-15 20:03:30 +00:00
Simon L. B. Nielsen
74608424ab
Resolve conflicts after import of OpenSSL 0.9.8d.
2006-10-01 07:46:16 +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
02d3319f28
This commit was generated by cvs2svn to compensate for changes in r162911,
...
which included commits to RCS files with non-trunk default branches.
2006-10-01 07:38:44 +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
Simon L. B. Nielsen
f6ab039488
This commit was generated by cvs2svn to compensate for changes in r160814,
...
which included commits to RCS files with non-trunk default branches.
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
eb8fd19957
This commit was generated by cvs2svn to compensate for changes in r142425,
...
which included commits to RCS files with non-trunk default branches.
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
8f1200ff6f
This commit was generated by cvs2svn to compensate for changes in r127128,
...
which included commits to RCS files with non-trunk default branches.
2004-03-17 15:49:33 +00:00
Jacques Vidrine
5fad2af4e3
Merge conflicts after import of OpenSSL 0.9.7c.
2003-10-01 12:37:51 +00:00
Jacques Vidrine
50ef009353
Vendor import of OpenSSL 0.9.7c
2003-10-01 12:32:41 +00:00
Jacques Vidrine
8ae0780c3a
This commit was generated by cvs2svn to compensate for changes in r120631,
...
which included commits to RCS files with non-trunk default branches.
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
Jacques Vidrine
015ec3c905
This commit was generated by cvs2svn to compensate for changes in r111147,
...
which included commits to RCS files with non-trunk default branches.
2003-02-19 23:17:42 +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
Mark Murray
5bd38a39ed
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
Jacques Vidrine
484549566e
Import of OpenSSL 0.9.6f.
2002-08-10 01:46:10 +00:00