diff options
author | jkim <jkim@FreeBSD.org> | 2016-09-22 14:57:48 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2016-09-22 14:57:48 +0000 |
commit | 5ced369491e2445d728a27ad06e09d01930f0c6b (patch) | |
tree | 73fe15f4db2d52cd64cd8952bb5f8f991a9dc558 /crypto/openssl/ssl/ssl_rsa.c | |
parent | 65eee2e6f94289d9f4d416f06c304a714747b721 (diff) | |
download | FreeBSD-src-5ced369491e2445d728a27ad06e09d01930f0c6b.zip FreeBSD-src-5ced369491e2445d728a27ad06e09d01930f0c6b.tar.gz |
MFC: r306193
Merge OpenSSL 1.0.2u.
Diffstat (limited to 'crypto/openssl/ssl/ssl_rsa.c')
-rw-r--r-- | crypto/openssl/ssl/ssl_rsa.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/openssl/ssl/ssl_rsa.c b/crypto/openssl/ssl/ssl_rsa.c index 8202247..f679801 100644 --- a/crypto/openssl/ssl/ssl_rsa.c +++ b/crypto/openssl/ssl/ssl_rsa.c @@ -912,6 +912,8 @@ static int serverinfo_process_buffer(const unsigned char *serverinfo, int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo, size_t serverinfo_length) { + unsigned char *new_serverinfo; + if (ctx == NULL || serverinfo == NULL || serverinfo_length == 0) { SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO, ERR_R_PASSED_NULL_PARAMETER); return 0; @@ -928,12 +930,13 @@ int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo, SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO, ERR_R_INTERNAL_ERROR); return 0; } - ctx->cert->key->serverinfo = OPENSSL_realloc(ctx->cert->key->serverinfo, - serverinfo_length); - if (ctx->cert->key->serverinfo == NULL) { + new_serverinfo = OPENSSL_realloc(ctx->cert->key->serverinfo, + serverinfo_length); + if (new_serverinfo == NULL) { SSLerr(SSL_F_SSL_CTX_USE_SERVERINFO, ERR_R_MALLOC_FAILURE); return 0; } + ctx->cert->key->serverinfo = new_serverinfo; memcpy(ctx->cert->key->serverinfo, serverinfo, serverinfo_length); ctx->cert->key->serverinfo_length = serverinfo_length; |