diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
| -rw-r--r-- | src/lib/libssl/ssl_lib.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index b772f5f810..0b094e8db6 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_lib.c,v 1.112 2015/09/12 19:45:16 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.113 2015/10/03 06:47:32 doug Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -359,15 +359,10 @@ SSL_new(SSL_CTX *ctx) | |||
| 359 | 359 | ||
| 360 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data); | 360 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data); |
| 361 | 361 | ||
| 362 | |||
| 363 | return (s); | 362 | return (s); |
| 363 | |||
| 364 | err: | 364 | err: |
| 365 | if (s != NULL) { | 365 | SSL_free(s); |
| 366 | if (s->cert != NULL) | ||
| 367 | ssl_cert_free(s->cert); | ||
| 368 | SSL_CTX_free(s->ctx); /* decrement reference count */ | ||
| 369 | free(s); | ||
| 370 | } | ||
| 371 | SSLerr(SSL_F_SSL_NEW, ERR_R_MALLOC_FAILURE); | 366 | SSLerr(SSL_F_SSL_NEW, ERR_R_MALLOC_FAILURE); |
| 372 | return (NULL); | 367 | return (NULL); |
| 373 | } | 368 | } |
