summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbcook <>2014-07-10 08:18:55 +0000
committerbcook <>2014-07-10 08:18:55 +0000
commit4177c7f8bc7857a5f0c5af534f54330115e8ccaf (patch)
tree9f520c9dbd4ddfcd471600f9e10f88229b5e3331
parenta4e67b1c13f505b2c40c8ea01a2d2c2d80b07750 (diff)
downloadopenbsd-4177c7f8bc7857a5f0c5af534f54330115e8ccaf.tar.gz
openbsd-4177c7f8bc7857a5f0c5af534f54330115e8ccaf.tar.bz2
openbsd-4177c7f8bc7857a5f0c5af534f54330115e8ccaf.zip
remove unused ecc_pkey_size.
ok jsing@ miod@
-rw-r--r--src/lib/libssl/src/ssl/ssl_lib.c6
-rw-r--r--src/lib/libssl/ssl_lib.c6
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 @@
1/* $OpenBSD: ssl_lib.c,v 1.70 2014/07/09 11:25:42 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.71 2014/07/10 08:18:55 bcook Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1957,7 +1957,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
1957 CERT_PKEY *cpk; 1957 CERT_PKEY *cpk;
1958 int rsa_enc, rsa_tmp, rsa_sign, dh_tmp, dh_rsa, dh_dsa, dsa_sign; 1958 int rsa_enc, rsa_tmp, rsa_sign, dh_tmp, dh_rsa, dh_dsa, dsa_sign;
1959 unsigned long mask_k, mask_a; 1959 unsigned long mask_k, mask_a;
1960 int have_ecc_cert, ecdh_ok, ecdsa_ok, ecc_pkey_size; 1960 int have_ecc_cert, ecdh_ok, ecdsa_ok;
1961 int have_ecdh_tmp; 1961 int have_ecdh_tmp;
1962 X509 *x = NULL; 1962 X509 *x = NULL;
1963 EVP_PKEY *ecc_pkey = NULL; 1963 EVP_PKEY *ecc_pkey = NULL;
@@ -2030,8 +2030,6 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
2030 ecdsa_ok = (x->ex_flags & EXFLAG_KUSAGE) ? 2030 ecdsa_ok = (x->ex_flags & EXFLAG_KUSAGE) ?
2031 (x->ex_kusage & X509v3_KU_DIGITAL_SIGNATURE) : 1; 2031 (x->ex_kusage & X509v3_KU_DIGITAL_SIGNATURE) : 1;
2032 ecc_pkey = X509_get_pubkey(x); 2032 ecc_pkey = X509_get_pubkey(x);
2033 ecc_pkey_size = (ecc_pkey != NULL) ?
2034 EVP_PKEY_bits(ecc_pkey) : 0;
2035 EVP_PKEY_free(ecc_pkey); 2033 EVP_PKEY_free(ecc_pkey);
2036 if ((x->sig_alg) && (x->sig_alg->algorithm)) { 2034 if ((x->sig_alg) && (x->sig_alg->algorithm)) {
2037 signature_nid = OBJ_obj2nid(x->sig_alg->algorithm); 2035 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 @@
1/* $OpenBSD: ssl_lib.c,v 1.70 2014/07/09 11:25:42 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.71 2014/07/10 08:18:55 bcook Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1957,7 +1957,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
1957 CERT_PKEY *cpk; 1957 CERT_PKEY *cpk;
1958 int rsa_enc, rsa_tmp, rsa_sign, dh_tmp, dh_rsa, dh_dsa, dsa_sign; 1958 int rsa_enc, rsa_tmp, rsa_sign, dh_tmp, dh_rsa, dh_dsa, dsa_sign;
1959 unsigned long mask_k, mask_a; 1959 unsigned long mask_k, mask_a;
1960 int have_ecc_cert, ecdh_ok, ecdsa_ok, ecc_pkey_size; 1960 int have_ecc_cert, ecdh_ok, ecdsa_ok;
1961 int have_ecdh_tmp; 1961 int have_ecdh_tmp;
1962 X509 *x = NULL; 1962 X509 *x = NULL;
1963 EVP_PKEY *ecc_pkey = NULL; 1963 EVP_PKEY *ecc_pkey = NULL;
@@ -2030,8 +2030,6 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
2030 ecdsa_ok = (x->ex_flags & EXFLAG_KUSAGE) ? 2030 ecdsa_ok = (x->ex_flags & EXFLAG_KUSAGE) ?
2031 (x->ex_kusage & X509v3_KU_DIGITAL_SIGNATURE) : 1; 2031 (x->ex_kusage & X509v3_KU_DIGITAL_SIGNATURE) : 1;
2032 ecc_pkey = X509_get_pubkey(x); 2032 ecc_pkey = X509_get_pubkey(x);
2033 ecc_pkey_size = (ecc_pkey != NULL) ?
2034 EVP_PKEY_bits(ecc_pkey) : 0;
2035 EVP_PKEY_free(ecc_pkey); 2033 EVP_PKEY_free(ecc_pkey);
2036 if ((x->sig_alg) && (x->sig_alg->algorithm)) { 2034 if ((x->sig_alg) && (x->sig_alg->algorithm)) {
2037 signature_nid = OBJ_obj2nid(x->sig_alg->algorithm); 2035 signature_nid = OBJ_obj2nid(x->sig_alg->algorithm);