summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2017-06-22 17:47:56 +0000
committerjsing <jsing@openbsd.org>2017-06-22 17:47:56 +0000
commit781c225768f7169d3b20f2814045ab6f82a7b70e (patch)
tree3f7c9b0fe1e4bfb1ca3be79b6eda26ba4f3c397d
parentUse the standard `rv' idiom in tls_keypair_load_cert(), rather than (diff)
downloadwireguard-openbsd-781c225768f7169d3b20f2814045ab6f82a7b70e.tar.xz
wireguard-openbsd-781c225768f7169d3b20f2814045ab6f82a7b70e.zip
Remove dead code that has remained hiding since ressl.c r1.14!
-rw-r--r--lib/libtls/tls.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/libtls/tls.c b/lib/libtls/tls.c
index 7906788b083..77b936ed37c 100644
--- a/lib/libtls/tls.c
+++ b/lib/libtls/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.63 2017/05/07 01:59:34 jsing Exp $ */
+/* $OpenBSD: tls.c,v 1.64 2017/06/22 17:47:56 jsing Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
*
@@ -309,7 +309,6 @@ tls_configure_ssl_keypair(struct tls *ctx, SSL_CTX *ssl_ctx,
struct tls_keypair *keypair, int required)
{
EVP_PKEY *pkey = NULL;
- X509 *cert = NULL;
BIO *bio = NULL;
if (!required &&
@@ -330,7 +329,6 @@ tls_configure_ssl_keypair(struct tls *ctx, SSL_CTX *ssl_ctx,
}
if (tls_keypair_cert_hash(keypair, &keypair->cert_hash) == -1)
goto err;
- cert = NULL;
}
if (keypair->key_mem != NULL) {
@@ -379,7 +377,6 @@ tls_configure_ssl_keypair(struct tls *ctx, SSL_CTX *ssl_ctx,
err:
EVP_PKEY_free(pkey);
- X509_free(cert);
BIO_free(bio);
return (1);