Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MFC: r280297 | jkim | 2015-03-20 | 1 | -520/+507 |
| | | | | | | Merge OpenSSL 1.0.1m. Relnotes: yes | ||||
* | MFC: r276861, r276863 | jkim | 2015-01-09 | 1 | -2/+5 |
| | | | | Merge OpenSSL 1.0.1k. | ||||
* | MFC: r273144, r273146 | jkim | 2014-10-15 | 1 | -9/+12 |
| | | | | | | Merge OpenSSL 1.0.1j. Relnotes: yes | ||||
* | MFC: r269682 | jkim | 2014-08-07 | 1 | -7/+23 |
| | | | | Merge OpenSSL 1.0.1i. | ||||
* | Merge OpenSSL 1.0.1c. | jkim | 2012-07-12 | 1 | -8/+58 |
|\ | | | | | | | Approved by: benl (maintainer) | ||||
* \ | Merge OpenSSL 0.9.8m into head. | simon | 2010-03-13 | 1 | -1/+8 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+9 |
|\ \ | |/ | | | | | Approved by: re | ||||
| * | Flatten OpenSSL vendor tree. | simon | 2008-08-23 | 1 | -572/+0 |
| | | |||||
| * | Vendor import of OpenSSL 0.9.8e. | simon | 2007-03-15 | 1 | -1/+0 |
| | | |||||
| * | Vendor import of OpenSSL 0.9.8b | simon | 2006-07-29 | 1 | -29/+6 |
| | | |||||
| * | Vendor import of OpenSSL release 0.9.7. This release includes | markm | 2003-01-28 | 1 | -80/+31 |
| | | | | | | | | support for AES and OpenBSD's hardware crypto. | ||||
| * | Initial import of OpenSSL 0.9.6c | kris | 2002-01-27 | 1 | -11/+80 |
| | | |||||
| * | Initial import of OpenSSL 0.9.6 | kris | 2000-11-13 | 1 | -12/+20 |
| | | |||||
| * | Initial import of OpenSSL 0.9.5a | kris | 2000-04-13 | 1 | -35/+100 |
| | | |||||
* | | Resolve conflicts after import of OpenSSL 0.9.8e. | simon | 2007-03-15 | 1 | -1/+0 |
| | | |||||
* | | Resolve conflicts after import of OpenSSL 0.9.8b. | simon | 2006-07-29 | 1 | -23/+5 |
| | | |||||
* | | Correct a man-in-the-middle SSL version rollback vulnerability. | cperciva | 2005-10-11 | 1 | -6/+1 |
| | | | | | | | | Security: FreeBSD-SA-05:21.openssl | ||||
* | | Merge conflicts. | markm | 2003-01-28 | 1 | -82/+31 |
| | | | | | | | | This is cunning doublespeak for "use vendor code". | ||||
* | | Resolve conflicts. | kris | 2002-01-27 | 1 | -11/+80 |
| | | |||||
* | | Resolve conflicts, and garbage collect some local changes that are no | kris | 2000-11-13 | 1 | -12/+20 |
| | | | | | | | | longer required | ||||
* | | Resolve conflicts. | kris | 2000-04-13 | 1 | -37/+95 |
| | | |||||
* | | Fix breakage when NO_RSA specified. | kris | 2000-01-14 | 1 | -0/+9 |
|/ | | | | Reviewed by: Ben Laurie <ben@openssl.org> | ||||
* | Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent | kris | 2000-01-10 | 1 | -0/+503 |
infringement reasons. |