summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls_client.c
diff options
context:
space:
mode:
authorjsing <>2016-09-04 13:20:56 +0000
committerjsing <>2016-09-04 13:20:56 +0000
commitb2c01adca87a476df9e30dd7c0b91b5c06d59cf6 (patch)
treedc8a1bd6bdcde3b49317993e645200d3a8a2d696 /src/lib/libtls/tls_client.c
parent71cf0e2d9bd1fd282d8b7b8c5840f6ccdf3fdceb (diff)
downloadopenbsd-b2c01adca87a476df9e30dd7c0b91b5c06d59cf6.tar.gz
openbsd-b2c01adca87a476df9e30dd7c0b91b5c06d59cf6.tar.bz2
openbsd-b2c01adca87a476df9e30dd7c0b91b5c06d59cf6.zip
Maintain consistency with function naming.
Diffstat (limited to 'src/lib/libtls/tls_client.c')
-rw-r--r--src/lib/libtls/tls_client.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libtls/tls_client.c b/src/lib/libtls/tls_client.c
index f8d35a18c1..a1bceb7d97 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.35 2016/09/04 12:26:43 bcook Exp $ */ 1/* $OpenBSD: tls_client.c,v 1.36 2016/09/04 13:20:56 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -159,7 +159,7 @@ tls_connect_servername(struct tls *ctx, const char *host, const char *port,
159} 159}
160 160
161static int 161static int
162connect_common(struct tls *ctx, const char *servername) 162tls_connect_common(struct tls *ctx, const char *servername)
163{ 163{
164 union tls_addr addrbuf; 164 union tls_addr addrbuf;
165 int rv = -1; 165 int rv = -1;
@@ -245,7 +245,7 @@ tls_connect_fds(struct tls *ctx, int fd_read, int fd_write,
245 goto err; 245 goto err;
246 } 246 }
247 247
248 if (connect_common(ctx, servername) != 0) 248 if (tls_connect_common(ctx, servername) != 0)
249 goto err; 249 goto err;
250 250
251 if (SSL_set_rfd(ctx->ssl_conn, fd_read) != 1 || 251 if (SSL_set_rfd(ctx->ssl_conn, fd_read) != 1 ||
@@ -265,7 +265,7 @@ tls_connect_cbs(struct tls *ctx, tls_read_cb read_cb,
265{ 265{
266 int rv = -1; 266 int rv = -1;
267 267
268 if (connect_common(ctx, servername) != 0) 268 if (tls_connect_common(ctx, servername) != 0)
269 goto err; 269 goto err;
270 270
271 if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0) { 271 if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0) {