From f8bf279b3d342f547dd9036f0362df0eb3830a3b Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Mon, 26 Sep 2011 00:37:20 +0000 Subject: [PATCH] Remove variables set but not used git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25233 dc483132-0cff-0310-8789-dd5450dbe970 --- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 2 -- src/plugins/preauth/pkinit/pkinit_matching.c | 4 ++-- src/plugins/preauth/pkinit/pkinit_srv.c | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c index 6f39f36bc..a1c4ca102 100644 --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c @@ -5771,7 +5771,6 @@ pkcs7_dataDecode(krb5_context context, EVP_CIPHER_CTX *evp_ctx=NULL; X509_ALGOR *enc_alg=NULL; STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL; - X509_ALGOR *xalg=NULL; PKCS7_RECIP_INFO *ri=NULL; X509 *cert = sk_X509_value(id_cryptoctx->my_certs, id_cryptoctx->cert_index); @@ -5786,7 +5785,6 @@ pkcs7_dataDecode(krb5_context context, PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE); goto cleanup; } - xalg=p7->d.enveloped->enc_data->algorithm; if ((etmp=BIO_new(BIO_f_cipher())) == NULL) { PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB); diff --git a/src/plugins/preauth/pkinit/pkinit_matching.c b/src/plugins/preauth/pkinit/pkinit_matching.c index c7e2a4fda..a3bf3f4e2 100644 --- a/src/plugins/preauth/pkinit/pkinit_matching.c +++ b/src/plugins/preauth/pkinit/pkinit_matching.c @@ -378,7 +378,7 @@ parse_rule_set(krb5_context context, rule_set **out_rs) { const char *rule; - int remaining, totlen; + int remaining; krb5_error_code ret, retval; rule_component *rc = NULL, *trc; rule_set *rs; @@ -387,7 +387,7 @@ parse_rule_set(krb5_context context, if (rule_in == NULL) return EINVAL; rule = rule_in; - totlen = remaining = strlen(rule); + remaining = strlen(rule); rs = calloc(1, sizeof(*rs)); if (rs == NULL) { diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c index a74268ce8..c76359e7b 100644 --- a/src/plugins/preauth/pkinit/pkinit_srv.c +++ b/src/plugins/preauth/pkinit/pkinit_srv.c @@ -308,7 +308,6 @@ pkinit_server_verify_padata(krb5_context context, krb5_auth_pack_draft9 *auth_pack9 = NULL; pkinit_kdc_context plgctx = NULL; pkinit_kdc_req_context reqctx = NULL; - krb5_preauthtype pa_type; krb5_checksum cksum = {0, 0, 0, NULL}; krb5_data *der_req = NULL; int valid_eku = 0, valid_san = 0; @@ -351,7 +350,6 @@ pkinit_server_verify_padata(krb5_context context, switch ((int)data->pa_type) { case KRB5_PADATA_PK_AS_REQ: pkiDebug("processing KRB5_PADATA_PK_AS_REQ\n"); - pa_type = (int)data->pa_type; retval = k5int_decode_krb5_pa_pk_as_req(&k5data, &reqp); if (retval) { pkiDebug("decode_krb5_pa_pk_as_req failed\n"); @@ -372,7 +370,6 @@ pkinit_server_verify_padata(krb5_context context, case KRB5_PADATA_PK_AS_REP_OLD: case KRB5_PADATA_PK_AS_REQ_OLD: pkiDebug("processing KRB5_PADATA_PK_AS_REQ_OLD\n"); - pa_type = KRB5_PADATA_PK_AS_REQ_OLD; retval = k5int_decode_krb5_pa_pk_as_req_draft9(&k5data, &reqp9); if (retval) { pkiDebug("decode_krb5_pa_pk_as_req_draft9 failed\n"); -- 2.26.2