Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MFC: r325328 | jkim | 2017-11-13 | 4 | -5/+19 |
| | | | | | | Merge OpenSSL 1.0.2m. (cherry picked from commit a88f0513c4cf81f98bab740e4f112f1a6d7f4d42) | ||||
* | MFC: r318899 | jkim | 2017-11-13 | 2 | -3/+4 |
| | | | | | | Merge OpenSSL 1.0.2l. (cherry picked from commit ffd1bb8c599181e0733f8e00d8d8198b4ea6a73b) | ||||
* | MFC: r312825 | jkim | 2017-01-26 | 2 | -5/+14 |
| | | | | Merge OpenSSL 1.0.2k. | ||||
* | MFC: r306193 | jkim | 2016-09-22 | 3 | -25/+43 |
| | | | | Merge OpenSSL 1.0.2u. | ||||
* | Merge OpenSSL 1.0.2h. | jkim | 2016-05-03 | 5 | -16/+32 |
|\ | | | | | | | Relnotes: yes | ||||
* \ | Merge OpenSSL 1.0.2g. | jkim | 2016-03-01 | 10 | -18/+22 |
|\ \ | |/ | | | | | Relnotes: yes | ||||
* | | Merge OpenSSL 1.0.2f. | jkim | 2016-01-28 | 3 | -4/+66 |
|\ \ | |/ | | | | | Relnotes: yes | ||||
* | | Merge OpenSSL 1.0.2e. | jkim | 2015-12-03 | 9 | -64/+44 |
|\ \ | |/ | |||||
* | | Merge OpenSSL 1.0.2d. | jkim | 2015-10-30 | 11 | -43/+730 |
|\ \ | |/ | |||||
* | | Merge OpenSSL 1.0.1n. | jkim | 2015-06-11 | 4 | -10/+17 |
| | | |||||
* | | Merge OpenSSL 1.0.1m. | jkim | 2015-03-20 | 6 | -68/+1228 |
|\ \ | |/ | |||||
* | | Merge OpenSSL 1.0.1l. | jkim | 2015-01-16 | 1 | -1/+1 |
| | | | | | | | | | | MFC after: 1 week Relnotes: yes | ||||
* | | MFV: r276862 | jkim | 2015-01-09 | 1 | -1/+1 |
| | | | | | | | | Fix build. | ||||
* | | Merge OpenSSL 1.0.1k. | jkim | 2015-01-08 | 6 | -13/+53 |
|\ \ | |/ | |||||
* | | Merge OpenSSL 1.0.1j. | jkim | 2014-10-15 | 3 | -5/+10 |
|\ \ | |/ | |||||
* | | Merge OpenSSL 1.0.1i. | jkim | 2014-08-07 | 4 | -3/+10 |
|\ \ | |/ | |||||
* | | Merge OpenSSL 1.0.1g. | jkim | 2014-04-08 | 3 | -6/+10 |
| | | | | | | | | Approved by: benl (maintainer) | ||||
* | | Merge OpenSSL 1.0.1f. | jkim | 2014-01-22 | 1 | -1/+5 |
| | | | | | | | | Approved by: so (delphij), benl (silence) | ||||
* | | Merge OpenSSL 1.0.1e. | jkim | 2013-02-13 | 2 | -2/+3 |
|\ \ | |/ | | | | | Approved by: secteam (simon), benl (silence) | ||||
* | | Clean some 'svn:executable' properties in the tree. | pfg | 2013-01-26 | 2 | -0/+0 |
| | | | | | | | | | | Submitted by: Christoph Mallon MFC after: 3 days | ||||
* | | Merge OpenSSL 1.0.1c. | jkim | 2012-07-12 | 23 | -1111/+1763 |
|\ \ | |/ | | | | | Approved by: benl (maintainer) | ||||
* | | Merge OpenSSL 0.9.8x. | jkim | 2012-06-27 | 3 | -6/+11 |
| | | | | | | | | | | | | Reviewed by: stas Approved by: benl (maintainer) MFC after: 3 days | ||||
* | | Merge OpenSSL 0.9.8p into head. | simon | 2010-11-22 | 3 | -3/+5 |
| | | | | | | | | | | Security: CVE-2010-3864 Security: http://www.openssl.org/news/secadv_20101116.txt | ||||
* | | Merge OpenSSL 0.9.8m into head. | simon | 2010-03-13 | 9 | -29/+64 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | 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 | 17 | -247/+1421 |
|\ \ | |/ | | | | | Approved by: re | ||||
| * | Flatten OpenSSL vendor tree. | simon | 2008-08-23 | 50 | -11944/+0 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r167612, | simon | 2007-03-15 | 5 | -6/+127 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.8e. | simon | 2007-03-15 | 5 | -6/+127 |
| | | |||||
* | | Resolve conflicts after import of OpenSSL 0.9.8d. | simon | 2006-10-01 | 1 | -1/+3 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r162911, | simon | 2006-10-01 | 4 | -4/+50 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.8d. | simon | 2006-10-01 | 5 | -5/+53 |
| | | |||||
* | | 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 | 24 | -389/+1842 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.8b | simon | 2006-07-29 | 25 | -398/+1846 |
| | | |||||
* | | 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 | 20 | -67/+176 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.7e. | nectar | 2005-02-25 | 21 | -70/+184 |
| | | |||||
| * | Clean up the OpenSSL vendor branch by removing files that are not | nectar | 2005-02-25 | 2 | -107/+0 |
| | | | | | | | | part of recent releases. | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r127128, | nectar | 2004-03-17 | 4 | -25/+59 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.7d. | nectar | 2004-03-17 | 4 | -25/+59 |
| | | |||||
* | | Merge conflicts after import of OpenSSL 0.9.7c. | nectar | 2003-10-01 | 2 | -91/+19 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r120631, | nectar | 2003-10-01 | 6 | -18/+26 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.7c | nectar | 2003-10-01 | 7 | -36/+44 |
| | | |||||
* | | This commit was generated by cvs2svn to compensate for changes in r111147, | nectar | 2003-02-19 | 5 | -116/+132 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Vendor import of OpenSSL 0.9.7a. | nectar | 2003-02-19 | 5 | -116/+132 |
| | | |||||
* | | 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 | 21 | -697/+2445 |
|\ \ | |/ | | | | | 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 | 22 | -703/+2453 |
| | | | | | | | | support for AES and OpenBSD's hardware crypto. | ||||
* | | This commit was generated by cvs2svn to compensate for changes in r101615, | nectar | 2002-08-10 | 1 | -1/+1 |
|\ \ | |/ | | | | | which included commits to RCS files with non-trunk default branches. | ||||
| * | Import of OpenSSL 0.9.6f. | nectar | 2002-08-10 | 1 | -1/+1 |
| | |