From 4177c7f8bc7857a5f0c5af534f54330115e8ccaf Mon Sep 17 00:00:00 2001 From: bcook <> Date: Thu, 10 Jul 2014 08:18:55 +0000 Subject: remove unused ecc_pkey_size. ok jsing@ miod@ --- src/lib/libssl/src/ssl/ssl_lib.c | 6 ++---- src/lib/libssl/ssl_lib.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c index 51772eb618..a5f2f3f751 100644 --- a/src/lib/libssl/src/ssl/ssl_lib.c +++ b/src/lib/libssl/src/ssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.70 2014/07/09 11:25:42 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.71 2014/07/10 08:18:55 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1957,7 +1957,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) CERT_PKEY *cpk; int rsa_enc, rsa_tmp, rsa_sign, dh_tmp, dh_rsa, dh_dsa, dsa_sign; unsigned long mask_k, mask_a; - int have_ecc_cert, ecdh_ok, ecdsa_ok, ecc_pkey_size; + int have_ecc_cert, ecdh_ok, ecdsa_ok; int have_ecdh_tmp; X509 *x = NULL; EVP_PKEY *ecc_pkey = NULL; @@ -2030,8 +2030,6 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) ecdsa_ok = (x->ex_flags & EXFLAG_KUSAGE) ? (x->ex_kusage & X509v3_KU_DIGITAL_SIGNATURE) : 1; ecc_pkey = X509_get_pubkey(x); - ecc_pkey_size = (ecc_pkey != NULL) ? - EVP_PKEY_bits(ecc_pkey) : 0; EVP_PKEY_free(ecc_pkey); if ((x->sig_alg) && (x->sig_alg->algorithm)) { signature_nid = OBJ_obj2nid(x->sig_alg->algorithm); diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 51772eb618..a5f2f3f751 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.70 2014/07/09 11:25:42 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.71 2014/07/10 08:18:55 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1957,7 +1957,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) CERT_PKEY *cpk; int rsa_enc, rsa_tmp, rsa_sign, dh_tmp, dh_rsa, dh_dsa, dsa_sign; unsigned long mask_k, mask_a; - int have_ecc_cert, ecdh_ok, ecdsa_ok, ecc_pkey_size; + int have_ecc_cert, ecdh_ok, ecdsa_ok; int have_ecdh_tmp; X509 *x = NULL; EVP_PKEY *ecc_pkey = NULL; @@ -2030,8 +2030,6 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) ecdsa_ok = (x->ex_flags & EXFLAG_KUSAGE) ? (x->ex_kusage & X509v3_KU_DIGITAL_SIGNATURE) : 1; ecc_pkey = X509_get_pubkey(x); - ecc_pkey_size = (ecc_pkey != NULL) ? - EVP_PKEY_bits(ecc_pkey) : 0; EVP_PKEY_free(ecc_pkey); if ((x->sig_alg) && (x->sig_alg->algorithm)) { signature_nid = OBJ_obj2nid(x->sig_alg->algorithm); -- cgit v1.2.3-55-g6feb