diff options
| author |   jsing <jsing@openbsd.org> | 2017-06-22 17:34:25 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2017-06-22 17:34:25 +0000 |
| commit | ae6dba76668bd8245e9073ca37f7742b08f93f0c (patch) | |
| tree | aecf18f57fb2af97938dd4473468b386d22d2367 /lib/libtls/tls_server.c | |
| parent | Distinguish between self-issued certificates and self-signed certificates. (diff) | |
| download | wireguard-openbsd-ae6dba76668bd8245e9073ca37f7742b08f93f0c.tar.xz wireguard-openbsd-ae6dba76668bd8245e9073ca37f7742b08f93f0c.zip | |
Use the standard `rv' idiom in tls_keypair_load_cert(), rather than
duplicating clean up code.
Diffstat (limited to 'lib/libtls/tls_server.c')
| -rw-r--r-- | lib/libtls/tls_server.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/libtls/tls_server.c b/lib/libtls/tls_server.c index abac01ca5cf..ea8f0ce7286 100644 --- a/lib/libtls/tls_server.c +++ b/lib/libtls/tls_server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_server.c,v 1.37 2017/05/06 20:59:28 jsing Exp $ */ +/* $OpenBSD: tls_server.c,v 1.38 2017/06/22 17:34:25 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -201,6 +201,7 @@ tls_keypair_load_cert(struct tls_keypair *keypair, struct tls_error *error, char *errstr = "unknown"; BIO *cert_bio = NULL; int ssl_err; + int rv = -1; X509_free(*cert); *cert = NULL; @@ -221,14 +222,12 @@ tls_keypair_load_cert(struct tls_keypair *keypair, struct tls_error *error, goto err; } - BIO_free(cert_bio); - - return (0); + rv = 0; err: BIO_free(cert_bio); - return (-1); + return (rv); } static int |