diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
| commit | 626c2706b1f7abdc6af1216873b7687e59025d1f (patch) | |
| tree | 0617ebb1e49364082071482aa9a977dd1da45940 /main/openssl/ssl/ssl_sess.c | |
| parent | 614b8790e5fc0bb3864eb2e3dd8c15016333d016 (diff) | |
Update OpenSSL to aosp/masterc0.6.13
--HG--
extra : rebase_source : a2f70c1a7529c7fcfc88f8dd1882e66e6ba42167
Diffstat (limited to 'main/openssl/ssl/ssl_sess.c')
| -rw-r--r-- | main/openssl/ssl/ssl_sess.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/main/openssl/ssl/ssl_sess.c b/main/openssl/ssl/ssl_sess.c index 920b763e..ec088404 100644 --- a/main/openssl/ssl/ssl_sess.c +++ b/main/openssl/ssl/ssl_sess.c @@ -427,6 +427,18 @@ int ssl_get_new_session(SSL *s, int session) } #endif #endif +#ifndef OPENSSL_NO_PSK + if (s->psk_identity_hint) + { + ss->psk_identity_hint = BUF_strdup(s->psk_identity_hint); + if (ss->psk_identity_hint == NULL) + { + SSLerr(SSL_F_SSL_GET_NEW_SESSION, ERR_R_MALLOC_FAILURE); + SSL_SESSION_free(ss); + return 0; + } + } +#endif } else { |