summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/engines
Commit message (Collapse)AuthorAgeFilesLines
* Merge OpenSSL 1.0.1k.jkim2015-01-081-0/+2
|\
* \ Merge OpenSSL 1.0.1h.jkim2014-06-091-1/+1
|\ \ | |/ | | | | Approved by: so (delphij)
* | Merge OpenSSL 1.0.1g.jkim2014-04-081-10/+9
| | | | | | | | Approved by: benl (maintainer)
* | Merge OpenSSL 1.0.1f.jkim2014-01-221-4/+0
| | | | | | | | Approved by: so (delphij), benl (silence)
* | Merge OpenSSL 1.0.1e.jkim2013-02-136-12/+59
|\ \ | |/ | | | | Approved by: secteam (simon), benl (silence)
* | Merge OpenSSL 1.0.1c.jkim2012-07-1249-164/+7960
|\ \ | |/ | | | | Approved by: benl (maintainer)
* | Merge OpenSSL 0.9.8x.jkim2012-06-272-18/+36
| | | | | | | | | | | | Reviewed by: stas Approved by: benl (maintainer) MFC after: 3 days
* | Merge OpenSSL 0.9.8p into head.simon2010-11-223-40/+20
| | | | | | | | | | Security: CVE-2010-3864 Security: http://www.openssl.org/news/secadv_20101116.txt
* | Merge OpenSSL 0.9.8n into head.simon2010-04-012-2/+13
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge OpenSSL 0.9.8m into head.simon2010-03-137-28/+46
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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.simon2009-06-1419-112/+2328
|\ \ | |/ | | | | Approved by: re
| * Flatten OpenSSL vendor tree.simon2008-08-2347-12185/+0
|/
* Vendor import of OpenSSL 0.9.8bsimon2006-07-2947-0/+12185
OpenPOWER on IntegriCloud