From b2c01adca87a476df9e30dd7c0b91b5c06d59cf6 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 4 Sep 2016 13:20:56 +0000
Subject: Maintain consistency with function naming.

---
 src/lib/libtls/tls_client.c | 8 ++++----
 src/lib/libtls/tls_server.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

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 @@
-/* $OpenBSD: tls_client.c,v 1.35 2016/09/04 12:26:43 bcook Exp $ */
+/* $OpenBSD: tls_client.c,v 1.36 2016/09/04 13:20:56 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -159,7 +159,7 @@ tls_connect_servername(struct tls *ctx, const char *host, const char *port,
 }
 
 static int
-connect_common(struct tls *ctx, const char *servername)
+tls_connect_common(struct tls *ctx, const char *servername)
 {
 	union tls_addr addrbuf;
 	int rv = -1;
@@ -245,7 +245,7 @@ tls_connect_fds(struct tls *ctx, int fd_read, int fd_write,
 		goto err;
 	}
 
-	if (connect_common(ctx, servername) != 0)
+	if (tls_connect_common(ctx, servername) != 0)
 		goto err;
 
 	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,
 {
 	int rv = -1;
 
-	if (connect_common(ctx, servername) != 0)
+	if (tls_connect_common(ctx, servername) != 0)
 		goto err;
 
 	if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0) {
diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c
index 01f9ed3b7f..fd352a8a94 100644
--- a/src/lib/libtls/tls_server.c
+++ b/src/lib/libtls/tls_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_server.c,v 1.26 2016/09/04 12:26:43 bcook Exp $ */
+/* $OpenBSD: tls_server.c,v 1.27 2016/09/04 13:20:56 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -280,7 +280,7 @@ tls_configure_server(struct tls *ctx)
 }
 
 static struct tls *
-accept_common(struct tls *ctx)
+tls_accept_common(struct tls *ctx)
 {
 	struct tls *conn_ctx = NULL;
 
@@ -323,7 +323,7 @@ tls_accept_fds(struct tls *ctx, struct tls **cctx, int fd_read, int fd_write)
 {
 	struct tls *conn_ctx;
 
-	if ((conn_ctx = accept_common(ctx)) == NULL)
+	if ((conn_ctx = tls_accept_common(ctx)) == NULL)
 		goto err;
 
 	if (SSL_set_rfd(conn_ctx->ssl_conn, fd_read) != 1 ||
@@ -348,7 +348,7 @@ tls_accept_cbs(struct tls *ctx, struct tls **cctx,
 {
 	struct tls *conn_ctx;
 
-	if ((conn_ctx = accept_common(ctx)) == NULL)
+	if ((conn_ctx = tls_accept_common(ctx)) == NULL)
 		goto err;
 
 	if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0) {
-- 
cgit v1.2.3-55-g6feb