Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge OpenSSL 1.0.1s. This is a security update. | delphij | 2016-03-02 | 8 | -17/+17 |
| | | | | | Relnotes: yes Approved by: re (so@ implicit) | ||||
* | Merge OpenSSL 1.0.1r. | jkim | 2016-01-28 | 1 | -2/+6 |
| | | | | Relnotes: yes | ||||
* | Merge OpenSSL 1.0.1q. | jkim | 2015-12-03 | 1 | -2/+5 |
| | |||||
* | MFC: r284283 | jkim | 2015-06-11 | 2 | -2/+2 |
| | | | | Merge OpenSSL 1.0.1n. | ||||
* | MFC: r276861, r276863 | jkim | 2015-01-09 | 1 | -1/+1 |
| | | | | Merge OpenSSL 1.0.1k. | ||||
* | MFC: r261037, r264278 | jkim | 2014-04-10 | 2 | -6/+9 |
| | | | | Merge OpenSSL 1.0.1f and 1.0.1g. | ||||
* | Merge OpenSSL 1.0.1e. | jkim | 2013-02-13 | 1 | -1/+1 |
|\ | | | | | | | Approved by: secteam (simon), benl (silence) | ||||
* \ | Merge OpenSSL 1.0.1c. | jkim | 2012-07-12 | 4 | -195/+119 |
|\ \ | |/ | | | | | Approved by: benl (maintainer) | ||||
* | | Merge OpenSSL 0.9.8x. | jkim | 2012-06-27 | 1 | -2/+2 |
| | | | | | | | | | | | | Reviewed by: stas Approved by: benl (maintainer) MFC after: 3 days | ||||
* | | Merge OpenSSL 0.9.8p into head. | simon | 2010-11-22 | 1 | -2/+2 |
| | | | | | | | | | | Security: CVE-2010-3864 Security: http://www.openssl.org/news/secadv_20101116.txt | ||||
* | | Merge OpenSSL 0.9.8m into head. | simon | 2010-03-13 | 2 | -4/+20 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge OpenSSL 0.9.8k into head. | simon | 2009-06-14 | 2 | -122/+469 |
|\ \ | |/ | | | | | Approved by: re | ||||
| * | Flatten OpenSSL vendor tree. | simon | 2008-08-23 | 11 | -1686/+0 |
| | | |||||
| * | Vendor import of OpenSSL 0.9.8d. | simon | 2006-10-01 | 1 | -1/+3 |
| | | |||||
* | | Resolve conflicts after import of OpenSSL 0.9.8d. | simon | 2006-10-01 | 1 | -1/+3 |
| | | |||||
* | | Resolve conflicts after import of OpenSSL 0.9.8b. | simon | 2006-07-29 | 4 | -453/+4 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r160814, | simon | 2006-07-29 | 7 | -72/+546 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.8b | simon | 2006-07-29 | 8 | -81/+550 |
| | | |||||
* | | Resolve conflicts after import of OpenSSL 0.9.7e. | nectar | 2005-02-25 | 1 | -3/+8 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r142425, | nectar | 2005-02-25 | 9 | -30/+75 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.7e. | nectar | 2005-02-25 | 10 | -33/+83 |
| | | |||||
| * | Clean up the OpenSSL vendor branch by removing files that are not | nectar | 2005-02-25 | 1 | -73/+0 |
| | | | | | | | | part of recent releases. | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r127128, | nectar | 2004-03-17 | 1 | -20/+22 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.7d. | nectar | 2004-03-17 | 1 | -20/+22 |
| | | |||||
| * | Vendor import of OpenSSL 0.9.7c | nectar | 2003-10-01 | 1 | -18/+18 |
| | | |||||
* | | Merge conflicts after import of OpenSSL 0.9.7c. | nectar | 2003-10-01 | 2 | -91/+19 |
| | | |||||
* | | Merge conflicts. | markm | 2003-01-28 | 1 | -7/+8 |
| | | | | | | | | This is cunning doublespeak for "use vendor code". | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r109998, | markm | 2003-01-28 | 6 | -13/+238 |
|\ \ | |/ | | | | | 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 | 7 | -19/+246 |
| | | | | | | | | support for AES and OpenBSD's hardware crypto. | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r100936, | nectar | 2002-07-30 | 2 | -36/+36 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Import of OpenSSL 0.9.6e. | nectar | 2002-07-30 | 2 | -36/+36 |
| | | |||||
* | | Resolve conflicts, and garbage collect some local changes that are no | kris | 2000-11-13 | 1 | -3/+26 |
| | | | | | | | | longer required | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r68651, | kris | 2000-11-13 | 4 | -6/+11 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Initial import of OpenSSL 0.9.6 | kris | 2000-11-13 | 5 | -9/+37 |
| | | |||||
* | | Internat diff reducer. | markm | 2000-04-16 | 1 | -0/+1 |
|/ | |||||
* | Initial import of OpenSSL 0.9.5a | kris | 2000-04-13 | 2 | -3/+3 |
| | |||||
* | Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent | kris | 2000-01-10 | 9 | -0/+981 |
infringement reasons. |