From 2a5c8a2aac92f6b7274d00080eb7e865b9d4ff56 Mon Sep 17 00:00:00 2001 From: bcook <> Date: Sun, 7 Dec 2014 15:48:02 +0000 Subject: revert previous change for now, adjusting based on comments from jsing@ --- src/lib/libtls/tls_client.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/lib/libtls/tls_client.c') diff --git a/src/lib/libtls/tls_client.c b/src/lib/libtls/tls_client.c index c5849a6897..b851a6ecd0 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.3 2014/12/07 15:00:32 bcook Exp $ */ +/* $OpenBSD: tls_client.c,v 1.4 2014/12/07 15:48:02 bcook Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -209,11 +209,9 @@ tls_connect_fds(struct tls *ctx, int fd_read, int fd_write, tls_set_error(ctx, "no server certificate"); goto err; } - tls_clear_error(ctx); - if (tls_check_hostname(ctx, cert, hostname) != 0) { - if (tls_error(ctx) == NULL) - tls_set_error(ctx, "host `%s' not present in" - " server certificate", hostname); + if (tls_check_hostname(cert, hostname) != 0) { + tls_set_error(ctx, "host `%s' not present in" + " server certificate", hostname); goto err; } } -- cgit v1.2.3-55-g6feb