From c27b566051d2b4e6e3c0feba9c2723fdabfef889 Mon Sep 17 00:00:00 2001 From: Joel Sing Date: Wed, 9 Sep 2015 19:49:08 +0000 Subject: Indent labels with a space so that diff -p is more friendly. Requested by bluhm@ --- lib/libtls/tls.c | 8 ++++---- lib/libtls/tls_client.c | 8 ++++---- lib/libtls/tls_config.c | 4 ++-- lib/libtls/tls_server.c | 6 +++--- lib/libtls/tls_util.c | 6 +++--- lib/libtls/tls_verify.c | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/libtls/tls.c b/lib/libtls/tls.c index 0c4793cc9a2..6b9834565c9 100644 --- a/lib/libtls/tls.c +++ b/lib/libtls/tls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls.c,v 1.18 2015/09/09 19:23:04 beck Exp $ */ +/* $OpenBSD: tls.c,v 1.19 2015/09/09 19:49:07 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -83,7 +83,7 @@ tls_set_verror(struct tls *ctx, int errnum, const char *fmt, va_list ap) } rv = 0; -err: + err: free(errmsg); return (rv); @@ -221,7 +221,7 @@ tls_configure_keypair(struct tls *ctx, int required) return (0); -err: + err: EVP_PKEY_free(pkey); X509_free(cert); BIO_free(bio); @@ -259,7 +259,7 @@ tls_configure_ssl(struct tls *ctx) return (0); -err: + err: return (-1); } diff --git a/lib/libtls/tls_client.c b/lib/libtls/tls_client.c index 056526ddc37..81e47da0e1d 100644 --- a/lib/libtls/tls_client.c +++ b/lib/libtls/tls_client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_client.c,v 1.24 2015/09/09 19:23:04 beck Exp $ */ +/* $OpenBSD: tls_client.c,v 1.25 2015/09/09 19:49:07 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -148,7 +148,7 @@ tls_connect_servername(struct tls *ctx, const char *host, const char *port, rv = 0; -err: + err: free(hs); free(ps); @@ -230,7 +230,7 @@ tls_connect_fds(struct tls *ctx, int fd_read, int fd_write, } } -connecting: + connecting: if ((ret = SSL_connect(ctx->ssl_conn)) != 1) { err = tls_ssl_error(ctx, ctx->ssl_conn, ret, "connect"); if (err == TLS_READ_AGAIN || err == TLS_WRITE_AGAIN) { @@ -258,7 +258,7 @@ connecting: return (0); -err: + err: X509_free(cert); return (-1); diff --git a/lib/libtls/tls_config.c b/lib/libtls/tls_config.c index 73073d8ff7f..2a0033b3bdf 100644 --- a/lib/libtls/tls_config.c +++ b/lib/libtls/tls_config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_config.c,v 1.10 2015/09/09 19:23:04 beck Exp $ */ +/* $OpenBSD: tls_config.c,v 1.11 2015/09/09 19:49:07 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -84,7 +84,7 @@ tls_config_new(void) return (config); -err: + err: tls_config_free(config); return (NULL); } diff --git a/lib/libtls/tls_server.c b/lib/libtls/tls_server.c index 6f8daa0acab..8fa876c6fd5 100644 --- a/lib/libtls/tls_server.c +++ b/lib/libtls/tls_server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_server.c,v 1.12 2015/09/09 19:23:04 beck Exp $ */ +/* $OpenBSD: tls_server.c,v 1.13 2015/09/09 19:49:07 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -101,7 +101,7 @@ tls_configure_server(struct tls *ctx) return (0); -err: + err: return (-1); } @@ -148,7 +148,7 @@ tls_accept_fds(struct tls *ctx, struct tls **cctx, int fd_read, int fd_write) return (0); -err: + err: return (-1); } diff --git a/lib/libtls/tls_util.c b/lib/libtls/tls_util.c index a7b9faabbea..919ea9a6ac1 100644 --- a/lib/libtls/tls_util.c +++ b/lib/libtls/tls_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_util.c,v 1.2 2015/02/07 23:25:37 reyk Exp $ */ +/* $OpenBSD: tls_util.c,v 1.3 2015/09/09 19:49:07 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing * Copyright (c) 2015 Reyk Floeter @@ -73,14 +73,14 @@ tls_host_port(const char *hostport, char **host, char **port) rv = 0; goto done; -fail: + fail: free(*host); *host = NULL; free(*port); *port = NULL; rv = -1; -done: + done: free(s); return (rv); diff --git a/lib/libtls/tls_verify.c b/lib/libtls/tls_verify.c index c603ca8f73d..7fd0b3d545b 100644 --- a/lib/libtls/tls_verify.c +++ b/lib/libtls/tls_verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_verify.c,v 1.10 2015/08/27 15:26:50 jsing Exp $ */ +/* $OpenBSD: tls_verify.c,v 1.11 2015/09/09 19:49:07 jsing Exp $ */ /* * Copyright (c) 2014 Jeremie Courreges-Anglas * @@ -240,7 +240,7 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name) if (tls_match_name(common_name, name) == 0) rv = 0; -out: + out: free(common_name); return rv; } -- cgit v1.2.3