Have tls_keypair_pubkey_hash() call tls_keypair_load_cert() instead of

rolling its own certificate loading. This also means we get better error
reporting on failure.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index fdf4a981a8..0e206e2c7e 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.73 2018/02/08 08:09:10 jsing Exp $ */
+/* $OpenBSD: tls.c,v 1.74 2018/02/08 10:19:31 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -313,7 +313,8 @@ tls_configure_ssl_keypair(struct tls *ctx, SSL_CTX *ssl_ctx,
                         tls_set_errorx(ctx, "failed to load certificate");
                         goto err;
                 }
-                if (tls_keypair_pubkey_hash(keypair, &keypair->pubkey_hash) == -1)
+                if (tls_keypair_pubkey_hash(keypair, &ctx->error,
+                    &keypair->pubkey_hash) == -1)
                         goto err;
         }