Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MFC: r276861, r276863 | jkim | 2015-01-09 | 8 | -91/+89 |
| | | | | Merge OpenSSL 1.0.1k. | ||||
* | MFC: r273144, r273146 | jkim | 2014-10-15 | 1 | -0/+10 |
| | | | | | | Merge OpenSSL 1.0.1j. Relnotes: yes | ||||
* | MFC: r269682 | jkim | 2014-08-07 | 10 | -14/+47 |
| | | | | Merge OpenSSL 1.0.1i. | ||||
* | MFC: r267256 | jkim | 2014-06-09 | 6 | -11/+45 |
| | | | | | | Merge OpenSSL 1.0.1h. Approved by: so (delphij) | ||||
* | MFC: r261037, r264278 | jkim | 2014-04-10 | 9 | -22/+52 |
| | | | | Merge OpenSSL 1.0.1f and 1.0.1g. | ||||
* | Merge OpenSSL 1.0.1e. | jkim | 2013-02-13 | 15 | -58/+124 |
|\ | | | | | | | Approved by: secteam (simon), benl (silence) | ||||
* \ | Merge OpenSSL 1.0.1c. | jkim | 2012-07-12 | 57 | -3271/+8538 |
|\ \ | |/ | | | | | Approved by: benl (maintainer) | ||||
* | | Merge OpenSSL 0.9.8x. | jkim | 2012-06-27 | 8 | -647/+622 |
| | | | | | | | | | | | | Reviewed by: stas Approved by: benl (maintainer) MFC after: 3 days | ||||
* | | Merge OpenSSL 0.9.8p into head. | simon | 2010-11-22 | 16 | -68/+36 |
| | | | | | | | | | | Security: CVE-2010-3864 Security: http://www.openssl.org/news/secadv_20101116.txt | ||||
* | | Merge OpenSSL 0.9.8n into head. | simon | 2010-04-01 | 2 | -4/+16 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Readd $FreeBSD$ to the OpenSSL config file as that's useful for | simon | 2010-03-13 | 1 | -0/+1 |
| | | | | | | | | | | | | mergemaster. Suggested by: dougb | ||||
* | | Merge OpenSSL 0.9.8m into head. | simon | 2010-03-13 | 26 | -2986/+403 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Remove symlinks in OpenSSL's testing framework. These are not required | simon | 2009-08-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | 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) | ||||
* | | Merge OpenSSL 0.9.8k into head. | simon | 2009-06-14 | 41 | -428/+6152 |
|\ \ | |/ | | | | | Approved by: re | ||||
| * | Flatten OpenSSL vendor tree. | simon | 2008-08-23 | 98 | -36442/+0 |
| | | |||||
* | | Prevent cross-site forgery attacks on lukemftpd(8) due to splitting | simon | 2009-01-07 | 4 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r167612, | simon | 2007-03-15 | 10 | -39/+176 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.8e. | simon | 2007-03-15 | 10 | -39/+176 |
| | | |||||
* | | Resolve conflicts after import of OpenSSL 0.9.8d. | simon | 2006-10-01 | 1 | -6/+107 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r162911, | simon | 2006-10-01 | 11 | -13/+105 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.8d. | simon | 2006-10-01 | 12 | -19/+212 |
| | | |||||
* | | Resolve conflicts after import of OpenSSL 0.9.8b. | simon | 2006-07-29 | 4 | -634/+851 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r160814, | simon | 2006-07-29 | 46 | -1822/+4185 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.8b | simon | 2006-07-29 | 48 | -1846/+5036 |
| | | |||||
| * | Remove files that are no longer part of OpenSSL from the vendor | nectar | 2005-02-25 | 1 | -1146/+0 |
| | | | | | | | | branch. This time, these are mostly the `Makefile.ssl' files. | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r142430, | nectar | 2005-02-25 | 1 | -1146/+0 |
| | | | | | | | | which included commits to RCS files with non-trunk default branches. | ||||
* | | Resolve conflicts after import of OpenSSL 0.9.7e. | nectar | 2005-02-25 | 2 | -2/+3 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r142425, | nectar | 2005-02-25 | 16 | -212/+1716 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.7e. | nectar | 2005-02-25 | 18 | -214/+1719 |
| | | |||||
| * | Clean up the OpenSSL vendor branch by removing files that are not | nectar | 2005-02-25 | 8 | -1473/+0 |
| | | | | | | | | part of recent releases. | ||||
* | | Resolve conflicts after import of OpenSSL 0.9.7d. | nectar | 2004-03-17 | 2 | -0/+12 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r127128, | nectar | 2004-03-17 | 18 | -556/+821 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.7d. | nectar | 2004-03-17 | 20 | -556/+833 |
| | | |||||
* | | Re-add the FreeBSD RCS keyword for the benefit of mergemaster. | nectar | 2004-01-09 | 1 | -0/+1 |
| | | | | | | | | | | PR: conf/50040 Requested by: Dimitry Andric <dim@xs4all.nl> | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r120631, | nectar | 2003-10-01 | 15 | -51/+75 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.7c | nectar | 2003-10-01 | 15 | -51/+75 |
| | | |||||
* | | Resolve conflicts after import of OpenSSL 0.9.7a. | nectar | 2003-02-19 | 1 | -0/+10 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r111147, | nectar | 2003-02-19 | 30 | -28/+325 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.7a. | nectar | 2003-02-19 | 31 | -28/+335 |
| | | |||||
* | | Merge conflicts. | markm | 2003-01-28 | 2 | -320/+821 |
| | | | | | | | | This is cunning doublespeak for "use vendor code". | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r109998, | markm | 2003-01-28 | 49 | -1943/+7450 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL release 0.9.7. This release includes | markm | 2003-01-28 | 51 | -2260/+8271 |
| | | | | | | | | support for AES and OpenBSD's hardware crypto. | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r101613, | nectar | 2002-08-10 | 2 | -2/+2 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Import of OpenSSL 0.9.6f. | nectar | 2002-08-10 | 2 | -2/+2 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r100936, | nectar | 2002-07-30 | 8 | -16/+23 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Import of OpenSSL 0.9.6e. | nectar | 2002-07-30 | 8 | -16/+23 |
| | | |||||
* | | Remove many obsolete files. The majority of these are simply no | nectar | 2002-07-30 | 8 | -1473/+0 |
| | | | | | | | | | | longer included as part of the OpenSSL distribution. However, a few we just don't need and are explicitly excluded in FREEBSD-Xlist. | ||||
* | | Resolve conflicts after import of OpenSSL 0.9.6d. | nectar | 2002-07-30 | 1 | -6/+25 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r100928, | nectar | 2002-07-30 | 10 | -600/+604 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Import of OpenSSL 0.9.6d. | nectar | 2002-07-30 | 11 | -606/+629 |
| | |