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
nectar
0f095e8a2a
Vendor import of OpenSSL 0.9.7d.
2004-03-17 15:49:33 +00:00
nectar
15b921d648
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
nectar
8c8a5a2b0b
Re-add the FreeBSD RCS keyword for the benefit of mergemaster.
...
PR: conf/50040
Requested by: Dimitry Andric <dim@xs4all.nl>
2004-01-09 14:46:11 +00:00
nectar
ee25ce74b3
Vendor import of OpenSSL 0.9.7c
2003-10-01 12:32:41 +00:00
nectar
d8e0ea4b40
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
nectar
0fee824237
Resolve conflicts after import of OpenSSL 0.9.7a.
2003-02-19 23:24:16 +00:00
nectar
6c9986c446
Vendor import of OpenSSL 0.9.7a.
2003-02-19 23:17:42 +00:00
nectar
21bb0e5fa9
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
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
markm
33af127a88
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
nectar
c48e8e3d25
Import of OpenSSL 0.9.6f.
2002-08-10 01:40:00 +00:00
nectar
15e4ff204e
This commit was generated by cvs2svn to compensate for changes in r101613,
...
which included commits to RCS files with non-trunk default branches.
2002-08-10 01:40:00 +00:00
nectar
2f13e09165
Import of OpenSSL 0.9.6e.
2002-07-30 13:38:06 +00:00
nectar
9b2d850453
This commit was generated by cvs2svn to compensate for changes in r100936,
...
which included commits to RCS files with non-trunk default branches.
2002-07-30 13:38:06 +00:00
nectar
0518ae8674
Remove many obsolete files. The majority of these are simply no
...
longer included as part of the OpenSSL distribution. However, a few
we just don't need and are explicitly excluded in FREEBSD-Xlist.
2002-07-30 12:51:09 +00:00
nectar
8b62a95bfc
Resolve conflicts after import of OpenSSL 0.9.6d.
2002-07-30 12:46:49 +00:00
nectar
0aed2eea83
Import of OpenSSL 0.9.6d.
2002-07-30 12:44:15 +00:00
nectar
050218e0d0
This commit was generated by cvs2svn to compensate for changes in r100928,
...
which included commits to RCS files with non-trunk default branches.
2002-07-30 12:44:15 +00:00
kris
1f8c2aa176
Initial import of OpenSSL 0.9.6c
2002-01-27 03:13:07 +00:00
kris
0b3d98771f
This commit was generated by cvs2svn to compensate for changes in r89837,
...
which included commits to RCS files with non-trunk default branches.
2002-01-27 03:13:07 +00:00
kris
18cbcd5eff
Resolve conflicts
2001-07-19 20:05:28 +00:00
kris
3b19ada1e8
Initial import of OpenSSL 0.9.6b
2001-07-19 19:59:37 +00:00
kris
84fabcda92
This commit was generated by cvs2svn to compensate for changes in r79998,
...
which included commits to RCS files with non-trunk default branches.
2001-07-19 19:59:37 +00:00
kris
445c7928a1
Resolve conflicts
2001-05-20 03:17:35 +00:00
kris
12896e829e
Initial import of OpenSSL 0.9.6a
2001-05-20 03:07:21 +00:00
kris
d8a086ad88
This commit was generated by cvs2svn to compensate for changes in r76866,
...
which included commits to RCS files with non-trunk default branches.
2001-05-20 03:07:21 +00:00