From 5dba0e506c763670b99dd2bb7568daa8713f4e2d Mon Sep 17 00:00:00 2001 From: bluhm <> Date: Fri, 30 Jan 2015 14:25:37 +0000 Subject: Make the TLS connect and accept error messages consistent. OK jsing@ --- src/lib/libtls/tls_client.c | 4 ++-- src/lib/libtls/tls_server.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/libtls/tls_client.c b/src/lib/libtls/tls_client.c index 4a9a4c976d..d9354c3140 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.9 2015/01/22 09:16:24 reyk Exp $ */ +/* $OpenBSD: tls_client.c,v 1.10 2015/01/30 14:25:37 bluhm Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -225,7 +225,7 @@ tls_connect_fds(struct tls *ctx, int fd_read, int fd_write, ctx->flags |= TLS_CONNECTING; return (TLS_WRITE_AGAIN); default: - tls_set_error(ctx, "SSL connect failed: %i", ssl_err); + tls_set_error(ctx, "TLS connect failed (%i)", ssl_err); goto err; } } diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c index 514148bd93..ac44f260ac 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.2 2015/01/16 14:34:51 reyk Exp $ */ +/* $OpenBSD: tls_server.c,v 1.3 2015/01/30 14:25:37 bluhm Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -133,8 +133,7 @@ tls_accept_socket(struct tls *ctx, struct tls **cctx, int socket) case SSL_ERROR_WANT_WRITE: return (TLS_WRITE_AGAIN); default: - tls_set_error(ctx, "ssl accept failure (%i)", - ssl_err); + tls_set_error(ctx, "TLS accept failed (%i)", ssl_err); goto err; } } -- cgit v1.2.3-55-g6feb