diff options
author | jkim <jkim@FreeBSD.org> | 2015-07-09 17:07:45 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2015-07-09 17:07:45 +0000 |
commit | ce8a66609232f69cc268075df7abdfde80626372 (patch) | |
tree | 8d10fc72dd2b2fa9b34ff167b059ca5cf5402917 /crypto/openssl/ssl/s3_srvr.c | |
parent | 2c26f2224bb10b17bc0beebf9d71485455603f87 (diff) | |
parent | e5911a7a89e76432a8d4607068e9171b30272e08 (diff) | |
download | FreeBSD-src-ce8a66609232f69cc268075df7abdfde80626372.zip FreeBSD-src-ce8a66609232f69cc268075df7abdfde80626372.tar.gz |
Merge OpenSSL 1.0.1p.
Diffstat (limited to 'crypto/openssl/ssl/s3_srvr.c')
-rw-r--r-- | crypto/openssl/ssl/s3_srvr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s3_srvr.c b/crypto/openssl/ssl/s3_srvr.c index 9aa3292..3a5f71d 100644 --- a/crypto/openssl/ssl/s3_srvr.c +++ b/crypto/openssl/ssl/s3_srvr.c @@ -2792,7 +2792,7 @@ int ssl3_get_client_key_exchange(SSL *s) if (s->session->psk_identity != NULL) OPENSSL_free(s->session->psk_identity); - s->session->psk_identity = BUF_strdup((char *)p); + s->session->psk_identity = BUF_strndup((char *)p, i); if (s->session->psk_identity == NULL) { SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE); goto psk_err; |