summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2015-09-09 19:49:07 +0000
committerjsing <>2015-09-09 19:49:07 +0000
commit1026adae92a3c284751ab73faea7136a9594331d (patch)
treee6651be08db7a4d75c4beabb228f380270626afb /src
parent5a0fee68a31acf1157290844d560687560e65007 (diff)
downloadopenbsd-1026adae92a3c284751ab73faea7136a9594331d.tar.gz
openbsd-1026adae92a3c284751ab73faea7136a9594331d.tar.bz2
openbsd-1026adae92a3c284751ab73faea7136a9594331d.zip
Indent labels with a space so that diff -p is more friendly.
Requested by bluhm@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libtls/tls.c8
-rw-r--r--src/lib/libtls/tls_client.c8
-rw-r--r--src/lib/libtls/tls_config.c4
-rw-r--r--src/lib/libtls/tls_server.c6
-rw-r--r--src/lib/libtls/tls_util.c6
-rw-r--r--src/lib/libtls/tls_verify.c4
6 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index 0c4793cc9a..6b9834565c 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls.c,v 1.18 2015/09/09 19:23:04 beck Exp $ */ 1/* $OpenBSD: tls.c,v 1.19 2015/09/09 19:49:07 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -83,7 +83,7 @@ tls_set_verror(struct tls *ctx, int errnum, const char *fmt, va_list ap)
83 } 83 }
84 rv = 0; 84 rv = 0;
85 85
86err: 86 err:
87 free(errmsg); 87 free(errmsg);
88 88
89 return (rv); 89 return (rv);
@@ -221,7 +221,7 @@ tls_configure_keypair(struct tls *ctx, int required)
221 221
222 return (0); 222 return (0);
223 223
224err: 224 err:
225 EVP_PKEY_free(pkey); 225 EVP_PKEY_free(pkey);
226 X509_free(cert); 226 X509_free(cert);
227 BIO_free(bio); 227 BIO_free(bio);
@@ -259,7 +259,7 @@ tls_configure_ssl(struct tls *ctx)
259 259
260 return (0); 260 return (0);
261 261
262err: 262 err:
263 return (-1); 263 return (-1);
264} 264}
265 265
diff --git a/src/lib/libtls/tls_client.c b/src/lib/libtls/tls_client.c
index 056526ddc3..81e47da0e1 100644
--- a/src/lib/libtls/tls_client.c
+++ b/src/lib/libtls/tls_client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_client.c,v 1.24 2015/09/09 19:23:04 beck Exp $ */ 1/* $OpenBSD: tls_client.c,v 1.25 2015/09/09 19:49:07 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -148,7 +148,7 @@ tls_connect_servername(struct tls *ctx, const char *host, const char *port,
148 148
149 rv = 0; 149 rv = 0;
150 150
151err: 151 err:
152 free(hs); 152 free(hs);
153 free(ps); 153 free(ps);
154 154
@@ -230,7 +230,7 @@ tls_connect_fds(struct tls *ctx, int fd_read, int fd_write,
230 } 230 }
231 } 231 }
232 232
233connecting: 233 connecting:
234 if ((ret = SSL_connect(ctx->ssl_conn)) != 1) { 234 if ((ret = SSL_connect(ctx->ssl_conn)) != 1) {
235 err = tls_ssl_error(ctx, ctx->ssl_conn, ret, "connect"); 235 err = tls_ssl_error(ctx, ctx->ssl_conn, ret, "connect");
236 if (err == TLS_READ_AGAIN || err == TLS_WRITE_AGAIN) { 236 if (err == TLS_READ_AGAIN || err == TLS_WRITE_AGAIN) {
@@ -258,7 +258,7 @@ connecting:
258 258
259 return (0); 259 return (0);
260 260
261err: 261 err:
262 X509_free(cert); 262 X509_free(cert);
263 263
264 return (-1); 264 return (-1);
diff --git a/src/lib/libtls/tls_config.c b/src/lib/libtls/tls_config.c
index 73073d8ff7..2a0033b3bd 100644
--- a/src/lib/libtls/tls_config.c
+++ b/src/lib/libtls/tls_config.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_config.c,v 1.10 2015/09/09 19:23:04 beck Exp $ */ 1/* $OpenBSD: tls_config.c,v 1.11 2015/09/09 19:49:07 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -84,7 +84,7 @@ tls_config_new(void)
84 84
85 return (config); 85 return (config);
86 86
87err: 87 err:
88 tls_config_free(config); 88 tls_config_free(config);
89 return (NULL); 89 return (NULL);
90} 90}
diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c
index 6f8daa0aca..8fa876c6fd 100644
--- a/src/lib/libtls/tls_server.c
+++ b/src/lib/libtls/tls_server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_server.c,v 1.12 2015/09/09 19:23:04 beck Exp $ */ 1/* $OpenBSD: tls_server.c,v 1.13 2015/09/09 19:49:07 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -101,7 +101,7 @@ tls_configure_server(struct tls *ctx)
101 101
102 return (0); 102 return (0);
103 103
104err: 104 err:
105 return (-1); 105 return (-1);
106} 106}
107 107
@@ -148,7 +148,7 @@ tls_accept_fds(struct tls *ctx, struct tls **cctx, int fd_read, int fd_write)
148 148
149 return (0); 149 return (0);
150 150
151err: 151 err:
152 return (-1); 152 return (-1);
153} 153}
154 154
diff --git a/src/lib/libtls/tls_util.c b/src/lib/libtls/tls_util.c
index a7b9faabbe..919ea9a6ac 100644
--- a/src/lib/libtls/tls_util.c
+++ b/src/lib/libtls/tls_util.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_util.c,v 1.2 2015/02/07 23:25:37 reyk Exp $ */ 1/* $OpenBSD: tls_util.c,v 1.3 2015/09/09 19:49:07 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> 4 * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -73,14 +73,14 @@ tls_host_port(const char *hostport, char **host, char **port)
73 rv = 0; 73 rv = 0;
74 goto done; 74 goto done;
75 75
76fail: 76 fail:
77 free(*host); 77 free(*host);
78 *host = NULL; 78 *host = NULL;
79 free(*port); 79 free(*port);
80 *port = NULL; 80 *port = NULL;
81 rv = -1; 81 rv = -1;
82 82
83done: 83 done:
84 free(s); 84 free(s);
85 85
86 return (rv); 86 return (rv);
diff --git a/src/lib/libtls/tls_verify.c b/src/lib/libtls/tls_verify.c
index c603ca8f73..7fd0b3d545 100644
--- a/src/lib/libtls/tls_verify.c
+++ b/src/lib/libtls/tls_verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_verify.c,v 1.10 2015/08/27 15:26:50 jsing Exp $ */ 1/* $OpenBSD: tls_verify.c,v 1.11 2015/09/09 19:49:07 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> 3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org>
4 * 4 *
@@ -240,7 +240,7 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name)
240 240
241 if (tls_match_name(common_name, name) == 0) 241 if (tls_match_name(common_name, name) == 0)
242 rv = 0; 242 rv = 0;
243out: 243 out:
244 free(common_name); 244 free(common_name);
245 return rv; 245 return rv;
246} 246}