summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbluhm <>2015-01-30 14:25:37 +0000
committerbluhm <>2015-01-30 14:25:37 +0000
commit5dba0e506c763670b99dd2bb7568daa8713f4e2d (patch)
tree8987efe6389cdd2e7a575ffaa1c7ea5e6a18ec91 /src
parentba252189625c65f9cf5d3737694778ed5ae1ac0b (diff)
downloadopenbsd-5dba0e506c763670b99dd2bb7568daa8713f4e2d.tar.gz
openbsd-5dba0e506c763670b99dd2bb7568daa8713f4e2d.tar.bz2
openbsd-5dba0e506c763670b99dd2bb7568daa8713f4e2d.zip
Make the TLS connect and accept error messages consistent.
OK jsing@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libtls/tls_client.c4
-rw-r--r--src/lib/libtls/tls_server.c5
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 @@
1/* $OpenBSD: tls_client.c,v 1.9 2015/01/22 09:16:24 reyk Exp $ */ 1/* $OpenBSD: tls_client.c,v 1.10 2015/01/30 14:25:37 bluhm Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -225,7 +225,7 @@ tls_connect_fds(struct tls *ctx, int fd_read, int fd_write,
225 ctx->flags |= TLS_CONNECTING; 225 ctx->flags |= TLS_CONNECTING;
226 return (TLS_WRITE_AGAIN); 226 return (TLS_WRITE_AGAIN);
227 default: 227 default:
228 tls_set_error(ctx, "SSL connect failed: %i", ssl_err); 228 tls_set_error(ctx, "TLS connect failed (%i)", ssl_err);
229 goto err; 229 goto err;
230 } 230 }
231 } 231 }
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 @@
1/* $OpenBSD: tls_server.c,v 1.2 2015/01/16 14:34:51 reyk Exp $ */ 1/* $OpenBSD: tls_server.c,v 1.3 2015/01/30 14:25:37 bluhm Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -133,8 +133,7 @@ tls_accept_socket(struct tls *ctx, struct tls **cctx, int socket)
133 case SSL_ERROR_WANT_WRITE: 133 case SSL_ERROR_WANT_WRITE:
134 return (TLS_WRITE_AGAIN); 134 return (TLS_WRITE_AGAIN);
135 default: 135 default:
136 tls_set_error(ctx, "ssl accept failure (%i)", 136 tls_set_error(ctx, "TLS accept failed (%i)", ssl_err);
137 ssl_err);
138 goto err; 137 goto err;
139 } 138 }
140 } 139 }