diff options
-rw-r--r-- | src/lib/libtls/tls_client.c | 8 | ||||
-rw-r--r-- | src/lib/libtls/tls_server.c | 8 |
2 files changed, 8 insertions, 8 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 | ||
161 | static int | 161 | static int |
162 | connect_common(struct tls *ctx, const char *servername) | 162 | tls_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) { |
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 @@ | |||
1 | /* $OpenBSD: tls_server.c,v 1.26 2016/09/04 12:26:43 bcook Exp $ */ | 1 | /* $OpenBSD: tls_server.c,v 1.27 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 | * |
@@ -280,7 +280,7 @@ tls_configure_server(struct tls *ctx) | |||
280 | } | 280 | } |
281 | 281 | ||
282 | static struct tls * | 282 | static struct tls * |
283 | accept_common(struct tls *ctx) | 283 | tls_accept_common(struct tls *ctx) |
284 | { | 284 | { |
285 | struct tls *conn_ctx = NULL; | 285 | struct tls *conn_ctx = NULL; |
286 | 286 | ||
@@ -323,7 +323,7 @@ tls_accept_fds(struct tls *ctx, struct tls **cctx, int fd_read, int fd_write) | |||
323 | { | 323 | { |
324 | struct tls *conn_ctx; | 324 | struct tls *conn_ctx; |
325 | 325 | ||
326 | if ((conn_ctx = accept_common(ctx)) == NULL) | 326 | if ((conn_ctx = tls_accept_common(ctx)) == NULL) |
327 | goto err; | 327 | goto err; |
328 | 328 | ||
329 | if (SSL_set_rfd(conn_ctx->ssl_conn, fd_read) != 1 || | 329 | if (SSL_set_rfd(conn_ctx->ssl_conn, fd_read) != 1 || |
@@ -348,7 +348,7 @@ tls_accept_cbs(struct tls *ctx, struct tls **cctx, | |||
348 | { | 348 | { |
349 | struct tls *conn_ctx; | 349 | struct tls *conn_ctx; |
350 | 350 | ||
351 | if ((conn_ctx = accept_common(ctx)) == NULL) | 351 | if ((conn_ctx = tls_accept_common(ctx)) == NULL) |
352 | goto err; | 352 | goto err; |
353 | 353 | ||
354 | if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0) { | 354 | if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0) { |