diff options
| author |   jsing <jsing@openbsd.org> | 2014-06-08 14:43:57 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-06-08 14:43:57 +0000 |
| commit | 07ae8dc851cc3b6f3d4b3bb984b905bac2c1e1b7 (patch) | |
| tree | d305fcb76a8a76c0b3ba9f59d6439fbae8cb9d78 /lib/libssl/src | |
| parent | Be explicit with types. No binary change. (diff) | |
| download | wireguard-openbsd-07ae8dc851cc3b6f3d4b3bb984b905bac2c1e1b7.tar.xz wireguard-openbsd-07ae8dc851cc3b6f3d4b3bb984b905bac2c1e1b7.zip | |
Clean up BIO_free() handling in bio_ssl.c - BIO_free() has its own NULL
check, so do not duplicate it here. Make the error handling consistent
by always using 'goto err' rather than returning in certain cases. Also
add a missing BIO_free(ssl) in BIO_new_ssl_connect().
ok deraadt@
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/bio_ssl.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/lib/libssl/src/ssl/bio_ssl.c b/lib/libssl/src/ssl/bio_ssl.c index 3cd462e06f2..649f7513b3b 100644 --- a/lib/libssl/src/ssl/bio_ssl.c +++ b/lib/libssl/src/ssl/bio_ssl.c @@ -494,17 +494,16 @@ BIO_new_buffer_ssl_connect(SSL_CTX *ctx) BIO *ret = NULL, *buf = NULL, *ssl = NULL; if ((buf = BIO_new(BIO_f_buffer())) == NULL) - return (NULL); + goto err; if ((ssl = BIO_new_ssl_connect(ctx)) == NULL) goto err; if ((ret = BIO_push(buf, ssl)) == NULL) goto err; return (ret); + err: - if (buf != NULL) - BIO_free(buf); - if (ssl != NULL) - BIO_free(ssl); + BIO_free(buf); + BIO_free(ssl); return (NULL); } @@ -514,15 +513,16 @@ BIO_new_ssl_connect(SSL_CTX *ctx) BIO *ret = NULL, *con = NULL, *ssl = NULL; if ((con = BIO_new(BIO_s_connect())) == NULL) - return (NULL); + goto err; if ((ssl = BIO_new_ssl(ctx, 1)) == NULL) goto err; if ((ret = BIO_push(ssl, con)) == NULL) goto err; return (ret); + err: - if (con != NULL) - BIO_free(con); + BIO_free(con); + BIO_free(ssl); return (NULL); } @@ -533,11 +533,10 @@ BIO_new_ssl(SSL_CTX *ctx, int client) SSL *ssl; if ((ret = BIO_new(BIO_f_ssl())) == NULL) - return (NULL); - if ((ssl = SSL_new(ctx)) == NULL) { - BIO_free(ret); - return (NULL); - } + goto err; + if ((ssl = SSL_new(ctx)) == NULL) + goto err; + if (client) SSL_set_connect_state(ssl); else @@ -545,6 +544,10 @@ BIO_new_ssl(SSL_CTX *ctx, int client) BIO_set_ssl(ret, ssl, BIO_CLOSE); return (ret); + +err: + BIO_free(ret); + return (NULL); } int |