From 1685c34b0de38004e36fefe0939c770638444d2b Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 15 Jan 2022 21:48:11 -0500 Subject: [PATCH] remove (krb5_enctype) cast for ETYPE_xxx Now that ETYPE_xxx names are macros to the KRB5_ENCTYPE_xxx symbols there is no longer a need to cast to (krb5_enctype). Change-Id: Ib561f6e45346abac7a53eb1db0bfef60ee3bcb74 --- kdc/kerberos5.c | 14 +++++++------- kdc/misc.c | 2 +- kdc/string2key.c | 6 +++--- lib/krb5/crypto.c | 2 +- lib/krb5/generate_subkey.c | 2 +- lib/krb5/get_in_tkt.c | 2 +- lib/krb5/init_creds_pw.c | 2 +- lib/krb5/rd_cred.c | 2 +- lib/krb5/rd_req.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c index 5c5b3137e..e87477bc1 100644 --- a/kdc/kerberos5.c +++ b/kdc/kerberos5.c @@ -95,9 +95,9 @@ _kdc_is_weak_exception(krb5_principal principal, krb5_enctype etype) { if (principal->name.name_string.len > 0 && strcmp(principal->name.name_string.val[0], "afs") == 0 && - (etype == (krb5_enctype)ETYPE_DES_CBC_CRC - || etype == (krb5_enctype)ETYPE_DES_CBC_MD4 - || etype == (krb5_enctype)ETYPE_DES_CBC_MD5)) + (etype == ETYPE_DES_CBC_CRC + || etype == ETYPE_DES_CBC_MD4 + || etype == ETYPE_DES_CBC_MD5)) return TRUE; return FALSE; } @@ -165,7 +165,7 @@ _kdc_find_etype(astgs_request_t r, uint32_t flags, krb5_principal request_princ; krb5_error_code ret; krb5_salt def_salt; - krb5_enctype enctype = (krb5_enctype)ETYPE_NULL; + krb5_enctype enctype = ETYPE_NULL; const krb5_enctype *p; Key *key = NULL; size_t i, k, m; @@ -224,14 +224,14 @@ _kdc_find_etype(astgs_request_t r, uint32_t flags, /* drive the search with local supported enctypes list */ p = krb5_kerberos_enctypes(r->context); for (i = 0; - p[i] != (krb5_enctype)ETYPE_NULL && enctype == (krb5_enctype)ETYPE_NULL; + p[i] != ETYPE_NULL && enctype == ETYPE_NULL; i++) { if (krb5_enctype_valid(r->context, p[i]) != 0 && !_kdc_is_weak_exception(princ->principal, p[i])) continue; /* check that the client supports it too */ - for (k = 0; k < len && enctype == (krb5_enctype)ETYPE_NULL; k++) { + for (k = 0; k < len && enctype == ETYPE_NULL; k++) { if (p[i] != etypes[k]) continue; @@ -316,7 +316,7 @@ _kdc_find_etype(astgs_request_t r, uint32_t flags, } } - if (enctype == (krb5_enctype)ETYPE_NULL) { + if (enctype == ETYPE_NULL) { /* * if the service principal is one for which there is a known 1DES * exception and no other enctype matches both the client request and diff --git a/kdc/misc.c b/kdc/misc.c index 61a6ecf13..e468b47f0 100644 --- a/kdc/misc.c +++ b/kdc/misc.c @@ -271,7 +271,7 @@ _kdc_get_preferred_key(krb5_context context, if (config->use_strongest_server_key) { const krb5_enctype *p = krb5_kerberos_enctypes(context); - for (i = 0; p[i] != (krb5_enctype)ETYPE_NULL; i++) { + for (i = 0; p[i] != ETYPE_NULL; i++) { if (krb5_enctype_valid(context, p[i]) != 0 && !_kdc_is_weak_exception(h->principal, p[i])) continue; diff --git a/kdc/string2key.c b/kdc/string2key.c index 1b603dece..4b9c62e5a 100644 --- a/kdc/string2key.c +++ b/kdc/string2key.c @@ -128,9 +128,9 @@ main(int argc, char **argv) if(ret) krb5_err(context, 1, ret, "krb5_string_to_enctype"); - if((etype != (krb5_enctype)ETYPE_DES_CBC_CRC && - etype != (krb5_enctype)ETYPE_DES_CBC_MD4 && - etype != (krb5_enctype)ETYPE_DES_CBC_MD5) && + if((etype != ETYPE_DES_CBC_CRC && + etype != ETYPE_DES_CBC_MD4 && + etype != ETYPE_DES_CBC_MD5) && (afs || version4)) { if(!version5) { etype = ETYPE_DES_CBC_CRC; diff --git a/lib/krb5/crypto.c b/lib/krb5/crypto.c index a4ab3753f..2fb4f0620 100644 --- a/lib/krb5/crypto.c +++ b/lib/krb5/crypto.c @@ -2575,7 +2575,7 @@ krb5_crypto_init(krb5_context context, ALLOC(*crypto, 1); if (*crypto == NULL) return krb5_enomem(context); - if(etype == (krb5_enctype)ETYPE_NULL) + if(etype == ETYPE_NULL) etype = key->keytype; (*crypto)->et = _krb5_find_enctype(etype); if((*crypto)->et == NULL || ((*crypto)->et->flags & F_DISABLED)) { diff --git a/lib/krb5/generate_subkey.c b/lib/krb5/generate_subkey.c index 07047461e..767d94cf7 100644 --- a/lib/krb5/generate_subkey.c +++ b/lib/krb5/generate_subkey.c @@ -58,7 +58,7 @@ krb5_generate_subkey_extended(krb5_context context, if (*subkey == NULL) return krb5_enomem(context); - if (etype == (krb5_enctype)ETYPE_NULL) + if (etype == ETYPE_NULL) etype = key->keytype; /* use session key etype */ /* XXX should we use the session key as input to the RF? */ diff --git a/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c index d6a1a9345..c19fc6992 100644 --- a/lib/krb5/get_in_tkt.c +++ b/lib/krb5/get_in_tkt.c @@ -115,7 +115,7 @@ add_padata(krb5_context context, if (!enctypes) { enctypes = context->etypes; netypes = 0; - for (ep = enctypes; *ep != (krb5_enctype)ETYPE_NULL; ep++) + for (ep = enctypes; *ep != ETYPE_NULL; ep++) netypes++; } pa2 = realloc (md->val, (md->len + netypes) * sizeof(*md->val)); diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c index 8de87bd75..b4e2f3d3d 100644 --- a/lib/krb5/init_creds_pw.c +++ b/lib/krb5/init_creds_pw.c @@ -1087,7 +1087,7 @@ add_enc_ts_padata(krb5_context context, if (!enctypes) { enctypes = context->etypes; netypes = 0; - for (ep = enctypes; *ep != (krb5_enctype)ETYPE_NULL; ep++) + for (ep = enctypes; *ep != ETYPE_NULL; ep++) netypes++; } diff --git a/lib/krb5/rd_cred.c b/lib/krb5/rd_cred.c index b24973978..f8d573623 100644 --- a/lib/krb5/rd_cred.c +++ b/lib/krb5/rd_cred.c @@ -96,7 +96,7 @@ krb5_rd_cred(krb5_context context, goto out; } - if (cred.enc_part.etype == (krb5_enctype)ETYPE_NULL) { + if (cred.enc_part.etype == ETYPE_NULL) { /* DK: MIT GSS-API Compatibility */ enc_krb_cred_part_data.length = cred.enc_part.cipher.length; enc_krb_cred_part_data.data = cred.enc_part.cipher.data; diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c index 84c18e3f5..13f2df64e 100644 --- a/lib/krb5/rd_req.c +++ b/lib/krb5/rd_req.c @@ -474,7 +474,7 @@ krb5_verify_ap_req2(krb5_context context, if (ap_req_options) { *ap_req_options = 0; - if (ac->keytype != (krb5_enctype)ETYPE_NULL) + if (ac->keytype != ETYPE_NULL) *ap_req_options |= AP_OPTS_USE_SUBKEY; if (ap_req->ap_options.use_session_key) *ap_req_options |= AP_OPTS_USE_SESSION_KEY;