diff options
| author | Kenny Root <kroot@google.com> | 2014-11-17 19:23:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 19:23:58 +0000 |
| commit | a955aadf7f0ddcfa05ade9f9d9d995cefb9ae681 (patch) | |
| tree | 9be152621569253fe4f791f02251e362472752d9 | |
| parent | d3efa0eaa9ec7894f959bc1a8a84ca5bc3f54f10 (diff) | |
| parent | eb90b9851be9363739e46546e8e7955f2ee15fde (diff) | |
| download | openssl-a955aadf7f0ddcfa05ade9f9d9d995cefb9ae681.tar.gz | |
am eb90b985: Merge "Follow-up for 1.0.1j upgrade"
* commit 'eb90b9851be9363739e46546e8e7955f2ee15fde':
Follow-up for 1.0.1j upgrade
| -rw-r--r-- | patches/0013-tls_psk_hint.patch | 2 | ||||
| -rw-r--r-- | ssl/s3_clnt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/0013-tls_psk_hint.patch b/patches/0013-tls_psk_hint.patch index e9237eba2c..60fbf73dc1 100644 --- a/patches/0013-tls_psk_hint.patch +++ b/patches/0013-tls_psk_hint.patch @@ -170,7 +170,7 @@ index 12c3fe8..17367a2 100644 + memset(identity, 0, sizeof(identity)); - psk_len = s->psk_client_callback(s, s->ctx->psk_identity_hint, + psk_len = s->psk_client_callback(s, s->session->psk_identity_hint, - identity, sizeof(identity - 1), psk, sizeof(psk)); + identity, sizeof(identity) - 1, psk, sizeof(psk)); if (psk_len > PSK_MAX_PSK_LEN) { @@ -2374,21 +2378,6 @@ int ssl3_send_client_key_exchange(SSL *s) diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 8a81793e98..61ff8db6c9 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -2490,7 +2490,7 @@ int ssl3_send_client_key_exchange(SSL *s) memset(identity, 0, sizeof(identity)); psk_len = s->psk_client_callback(s, s->session->psk_identity_hint, - identity, sizeof(identity - 1), psk, sizeof(psk)); + identity, sizeof(identity) - 1, psk, sizeof(psk)); if (psk_len > PSK_MAX_PSK_LEN) { SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, |