jkim
d6ebbcc6a2
Merge OpenSSL 1.1.1b.
2019-02-26 19:31:33 +00:00
jkim
af5a2716ea
Merge OpenSSL 1.1.1a.
2018-11-20 21:10:04 +00:00
jkim
7c22a3dd9e
Add generated header file for openssl(1).
2018-09-19 00:32:48 +00:00
jkim
ed55404d57
Update OpenSSL to 1.1.1.
...
Note it does not update build infrastructure.
2018-09-13 20:40:51 +00:00
jkim
58e331e535
Merge OpenSSL 1.0.2p.
2018-08-14 17:48:02 +00:00
jkim
28f14cb177
Merge OpenSSL 1.0.2o.
2018-03-27 17:17:58 +00:00
jkim
2aa41898b2
Merge OpenSSL 1.0.2n.
2017-12-07 18:02:57 +00:00
jkim
9d098cf136
Merge OpenSSL 1.0.2m.
2017-11-02 18:04:29 +00:00
jkim
986f17341f
Merge OpenSSL 1.0.2l.
2017-05-25 20:52:16 +00:00
jkim
4834c2f7b9
Merge OpenSSL 1.0.2k.
2017-01-26 19:10:29 +00:00
jkim
97091e1369
Merge OpenSSL 1.0.2i.
2016-09-22 13:27:44 +00:00
jkim
00a878d06e
Merge OpenSSL 1.0.2h.
...
Relnotes: yes
2016-05-03 18:50:10 +00:00
jkim
de2249f81c
Merge OpenSSL 1.0.2g.
...
Relnotes: yes
2016-03-01 22:08:28 +00:00
jkim
f91c9c2798
Merge OpenSSL 1.0.2f.
...
Relnotes: yes
2016-01-28 20:15:22 +00:00
jkim
8d77ecefb7
Merge OpenSSL 1.0.2e.
2015-12-03 21:13:35 +00:00
jkim
6b741bee15
Merge OpenSSL 1.0.2d.
2015-10-30 20:51:33 +00:00
jkim
d675e841ef
Merge OpenSSL 1.0.1n.
2015-06-11 19:00:55 +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
68fed3306b
Merge OpenSSL 1.0.1h.
...
Approved by: so (delphij)
2014-06-09 05:50:57 +00:00
jkim
89b378c4b3
Merge OpenSSL 1.0.1g.
...
Approved by: benl (maintainer)
2014-04-08 21:06:58 +00:00
jkim
a8c44ea5cf
Merge OpenSSL 1.0.1f.
...
Approved by: so (delphij), benl (silence)
2014-01-22 19:57:11 +00:00
jkim
754bee5776
Merge OpenSSL 1.0.1e.
...
Approved by: secteam (simon), benl (silence)
2013-02-13 23:07:20 +00:00
jkim
e393e47b1e
Merge OpenSSL 1.0.1c.
...
Approved by: benl (maintainer)
2012-07-12 19:30:53 +00:00
jkim
299ab12592
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
7a23485c98
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
2176e0cd52
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
a93ba965a7
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
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
af8069fdc9
Remove symlinks in OpenSSL's testing framework. These are not required
...
for normal build, and doesn't export well to CVS.
If they are needed later a script will be added to recreate the symlinks
when needed at build time.
Approved by: re (rwatson)
2009-08-12 12:10:00 +00:00
simon
5fb395764b
Merge OpenSSL 0.9.8k into head.
...
Approved by: re
2009-06-14 19:45:16 +00:00
simon
abe6016909
Prevent cross-site forgery attacks on lukemftpd(8) due to splitting
...
long commands into multiple requests. [09:01]
Fix incorrect OpenSSL checks for malformed signatures due to invalid
check of return value from EVP_VerifyFinal(), DSA_verify, and
DSA_do_verify. [09:02]
Security: FreeBSD-SA-09:01.lukemftpd
Security: FreeBSD-SA-09:02.openssl
Obtained from: NetBSD [SA-09:01]
Obtained from: OpenSSL Project [SA-09:02]
Approved by: so (simon)
2009-01-07 20:17:55 +00:00
simon
64fcbc70db
Flatten OpenSSL vendor tree.
2008-08-23 10:51:00 +00:00
simon
ee48ceb6a8
Vendor import of OpenSSL 0.9.8e.
2007-03-15 20:03:30 +00:00
simon
699a8581f9
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
de193995a6
Resolve conflicts after import of OpenSSL 0.9.8d.
2006-10-01 07:46:16 +00:00
simon
387e65d767
Vendor import of OpenSSL 0.9.8d.
2006-10-01 07:38:44 +00:00
simon
b2881e9eb1
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
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
simon
9159ca2b0e
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
nectar
3c8d7d9993
Remove files that are no longer part of OpenSSL from the vendor
...
branch. This time, these are mostly the `Makefile.ssl' files.
2005-02-25 06:14:53 +00:00
nectar
0d4d2c2cec
This commit was generated by cvs2svn to compensate for changes in r142430,
...
which included commits to RCS files with non-trunk default branches.
2005-02-25 06:14:53 +00:00
nectar
ced877b043
Resolve conflicts after import of OpenSSL 0.9.7e.
2005-02-25 05:49:44 +00:00
nectar
78a59572b3
Vendor import of OpenSSL 0.9.7e.
2005-02-25 05:39:05 +00:00
nectar
52bc459a40
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
nectar
a55ec1447a
Clean up the OpenSSL vendor branch by removing files that are not
...
part of recent releases.
2005-02-25 05:25:37 +00:00
nectar
2283471bb5
Resolve conflicts after import of OpenSSL 0.9.7d.
2004-03-17 17:44:39 +00:00