diff options
| author | Kenny Root <kroot@google.com> | 2015-07-24 21:02:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 21:02:57 +0000 |
| commit | 3b2c60656d36f47063e972b9aa2c11ef235253a6 (patch) | |
| tree | 4d210b442e8e6742e9b0ff9dca4fc158c1a6a03e /src/ssl/t1_lib.c | |
| parent | ffd8e0a5b40ce124e6dce4cb7546a26680d33d16 (diff) | |
| parent | 07f4f42347557420f105a72d9a93bc8ee88a3dc5 (diff) | |
| download | external_boringssl-3b2c60656d36f47063e972b9aa2c11ef235253a6.zip external_boringssl-3b2c60656d36f47063e972b9aa2c11ef235253a6.tar.gz external_boringssl-3b2c60656d36f47063e972b9aa2c11ef235253a6.tar.bz2 | |
am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533
* commit '07f4f42347557420f105a72d9a93bc8ee88a3dc5':
Handle RDRAND failures.
dsa_pub_encode: Write out DSA parameters (p, q, g) in addition to key.
Fix for CVE-2015-1789.
Fixes for CVE-2015-1791.
Diffstat (limited to 'src/ssl/t1_lib.c')
| -rw-r--r-- | src/ssl/t1_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ssl/t1_lib.c b/src/ssl/t1_lib.c index 9e5c011..213a647 100644 --- a/src/ssl/t1_lib.c +++ b/src/ssl/t1_lib.c @@ -2184,7 +2184,7 @@ static int tls_decrypt_ticket(SSL *s, const uint8_t *etick, int eticklen, EVP_CIPHER_CTX_cleanup(&ctx); p = sdec; - sess = d2i_SSL_SESSION(NULL, &p, slen); + sess = SSL_SESSION_from_bytes(sdec, slen); OPENSSL_free(sdec); if (sess) { /* The session ID, if non-empty, is used by some clients to detect that the |