summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/engines/e_capi.c
Commit message (Collapse)AuthorAgeFilesLines
* MFC: r306193jkim2016-09-221-0/+13
| | | | Merge OpenSSL 1.0.2u.
* Merge OpenSSL 1.0.2g.jkim2016-03-011-0/+32
| | | | Relnotes: yes
* Merge OpenSSL 1.0.2d.jkim2015-10-301-32/+110
|
* Merge OpenSSL 1.0.1m.jkim2015-03-201-1617/+1545
|
* Merge OpenSSL 1.0.1e.jkim2013-02-131-1/+4
| | | | Approved by: secteam (simon), benl (silence)
* Merge OpenSSL 1.0.1c.jkim2012-07-121-2/+28
| | | | Approved by: benl (maintainer)
* Merge OpenSSL 0.9.8x.jkim2012-06-271-18/+32
| | | | | | Reviewed by: stas Approved by: benl (maintainer) MFC after: 3 days
* Merge OpenSSL 0.9.8n into head.simon2010-04-011-0/+4
| | | | | | | | | | | 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-131-18/+32
| | | | | | | | | | | 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-141-0/+1781
Approved by: re
OpenPOWER on IntegriCloud