diff options
author | jsing <> | 2017-06-22 17:47:56 +0000 |
---|---|---|
committer | jsing <> | 2017-06-22 17:47:56 +0000 |
commit | 9fc419bc78bd04af70a369f43fc36002e019a582 (patch) | |
tree | 22ede301d161eb7cd8918ce20b5b44e063299d08 /src | |
parent | 3ca55e76de066104cab4d7afc038b7a87708d9fd (diff) | |
download | openbsd-9fc419bc78bd04af70a369f43fc36002e019a582.tar.gz openbsd-9fc419bc78bd04af70a369f43fc36002e019a582.tar.bz2 openbsd-9fc419bc78bd04af70a369f43fc36002e019a582.zip |
Remove dead code that has remained hiding since ressl.c r1.14!
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libtls/tls.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c index 7906788b08..77b936ed37 100644 --- a/src/lib/libtls/tls.c +++ b/src/lib/libtls/tls.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls.c,v 1.63 2017/05/07 01:59:34 jsing Exp $ */ | 1 | /* $OpenBSD: tls.c,v 1.64 2017/06/22 17:47:56 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -309,7 +309,6 @@ tls_configure_ssl_keypair(struct tls *ctx, SSL_CTX *ssl_ctx, | |||
309 | struct tls_keypair *keypair, int required) | 309 | struct tls_keypair *keypair, int required) |
310 | { | 310 | { |
311 | EVP_PKEY *pkey = NULL; | 311 | EVP_PKEY *pkey = NULL; |
312 | X509 *cert = NULL; | ||
313 | BIO *bio = NULL; | 312 | BIO *bio = NULL; |
314 | 313 | ||
315 | if (!required && | 314 | if (!required && |
@@ -330,7 +329,6 @@ tls_configure_ssl_keypair(struct tls *ctx, SSL_CTX *ssl_ctx, | |||
330 | } | 329 | } |
331 | if (tls_keypair_cert_hash(keypair, &keypair->cert_hash) == -1) | 330 | if (tls_keypair_cert_hash(keypair, &keypair->cert_hash) == -1) |
332 | goto err; | 331 | goto err; |
333 | cert = NULL; | ||
334 | } | 332 | } |
335 | 333 | ||
336 | if (keypair->key_mem != NULL) { | 334 | if (keypair->key_mem != NULL) { |
@@ -379,7 +377,6 @@ tls_configure_ssl_keypair(struct tls *ctx, SSL_CTX *ssl_ctx, | |||
379 | 377 | ||
380 | err: | 378 | err: |
381 | EVP_PKEY_free(pkey); | 379 | EVP_PKEY_free(pkey); |
382 | X509_free(cert); | ||
383 | BIO_free(bio); | 380 | BIO_free(bio); |
384 | 381 | ||
385 | return (1); | 382 | return (1); |