diff options
| author | jkim <jkim@FreeBSD.org> | 2017-01-26 19:14:14 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2017-01-26 19:14:14 +0000 |
| commit | 4aed7e4ccd53660aa6e7f0b024a4ce55a3227abc (patch) | |
| tree | f87776322a432fb3baf9f4ce835356d8b54ff8a7 /crypto/openssl/ssl/ssl_cert.c | |
| parent | 778f6f84c2d897983421773093f18137a785cb40 (diff) | |
| download | FreeBSD-src-4aed7e4ccd53660aa6e7f0b024a4ce55a3227abc.zip FreeBSD-src-4aed7e4ccd53660aa6e7f0b024a4ce55a3227abc.tar.gz | |
MFC: r312825
Merge OpenSSL 1.0.2k.
Diffstat (limited to 'crypto/openssl/ssl/ssl_cert.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_cert.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/openssl/ssl/ssl_cert.c b/crypto/openssl/ssl/ssl_cert.c index f48ebae..1be6fb0 100644 --- a/crypto/openssl/ssl/ssl_cert.c +++ b/crypto/openssl/ssl/ssl_cert.c @@ -315,7 +315,7 @@ CERT *ssl_cert_dup(CERT *cert) OPENSSL_malloc(cert->pkeys[i].serverinfo_length); if (ret->pkeys[i].serverinfo == NULL) { SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_MALLOC_FAILURE); - return NULL; + goto err; } ret->pkeys[i].serverinfo_length = cert->pkeys[i].serverinfo_length; @@ -392,9 +392,7 @@ CERT *ssl_cert_dup(CERT *cert) return (ret); -#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_ECDH) err: -#endif #ifndef OPENSSL_NO_RSA if (ret->rsa_tmp != NULL) RSA_free(ret->rsa_tmp); |
