summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/s3_both.c
Commit message (Collapse)AuthorAgeFilesLines
* MFC: r306193jkim2016-09-221-15/+26
| | | | Merge OpenSSL 1.0.2u.
* Merge OpenSSL 1.0.2e.jkim2015-12-031-2/+2
|\
* \ Merge OpenSSL 1.0.2d.jkim2015-10-301-95/+24
|\ \ | |/
* | Merge OpenSSL 1.0.1n.jkim2015-06-111-1/+1
| |
* | Merge OpenSSL 1.0.1m.jkim2015-03-201-645/+609
|\ \ | |/
* | Merge OpenSSL 1.0.1k.jkim2015-01-081-0/+1
|\ \ | |/
* | Merge OpenSSL 1.0.1f.jkim2014-01-221-0/+2
| | | | | | | | Approved by: so (delphij), benl (silence)
* | MFV r260399:delphij2014-01-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply vendor commits: 197e0ea Fix for TLS record tampering bug. (CVE-2013-4353). 3462896 For DTLS we might need to retransmit messages from the previous session so keep a copy of write context in DTLS retransmission buffers instead of replacing it after sending CCS. (CVE-2013-6450). ca98926 When deciding whether to use TLS 1.2 PRF and record hash algorithms use the version number in the corresponding SSL_METHOD structure instead of the SSL structure. The SSL structure version is sometimes inaccurate. Note: OpenSSL 1.0.2 and later effectively do this already. (CVE-2013-6449). Security: CVE-2013-4353 Security: CVE-2013-6449 Security: CVE-2013-6450
* | Merge OpenSSL 1.0.1e.jkim2013-02-131-5/+9
|\ \ | |/ | | | | Approved by: secteam (simon), benl (silence)
* | Merge OpenSSL 1.0.1c.jkim2012-07-121-36/+218
|\ \ | |/ | | | | Approved by: benl (maintainer)
* | Merge OpenSSL 0.9.8p into head.simon2010-11-221-0/+2
| | | | | | | | | | Security: CVE-2010-3864 Security: http://www.openssl.org/news/secadv_20101116.txt
* | Merge OpenSSL 0.9.8m into head.simon2010-03-131-45/+82
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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
| * Flatten OpenSSL vendor tree.simon2008-08-231-622/+0
|/
* Vendor import of OpenSSL 0.9.8bsimon2006-07-291-27/+14
|
* Vendor import of OpenSSL 0.9.7a.nectar2003-02-191-3/+14
|
* Vendor import of OpenSSL release 0.9.7. This release includesmarkm2003-01-281-20/+40
| | | | support for AES and OpenBSD's hardware crypto.
* Import of OpenSSL 0.9.6d.nectar2002-07-301-7/+18
|
* Initial import of OpenSSL 0.9.6ckris2002-01-271-0/+5
|
* Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10kris2001-02-181-2/+2
|
* Initial import of OpenSSL 0.9.6kris2000-11-131-2/+2
|
* Initial import of OpenSSL 0.9.5akris2000-04-131-22/+142
|
* Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patentkris2000-01-101-0/+468
infringement reasons.
OpenPOWER on IntegriCloud