The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=89293939de19896759a0ea73ec15180f99ba40e3
commit 89293939de19896759a0ea73ec15180f99ba40e3 Author: John Baldwin <[email protected]> AuthorDate: 2022-04-06 23:45:29 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-04-06 23:45:29 +0000 kgssapi krb5: Remove unused variables. --- sys/kgssapi/krb5/krb5_mech.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/kgssapi/krb5/krb5_mech.c b/sys/kgssapi/krb5/krb5_mech.c index bc8d9128bc32..aeb4c9260de5 100644 --- a/sys/kgssapi/krb5/krb5_mech.c +++ b/sys/kgssapi/krb5/krb5_mech.c @@ -1045,7 +1045,7 @@ krb5_verify_mic_old(struct krb5_context *kc, struct mbuf *m, struct mbuf *mic, { struct mbuf *mlast, *tm; uint8_t *p, *tp, dir; - size_t mlen, tlen, elen, miclen; + size_t mlen, tlen, elen; size_t cklen; uint32_t seq; @@ -1082,7 +1082,6 @@ krb5_verify_mic_old(struct krb5_context *kc, struct mbuf *m, struct mbuf *mic, * message. */ cklen = kc->kc_checksumkey->ks_class->ec_checksumlen; - miclen = mic->m_len; mic->m_len = p - (uint8_t *) mic->m_data; mic->m_next = m; MGET(tm, M_WAITOK, MT_DATA); @@ -1606,14 +1605,14 @@ krb5_unwrap_old(struct krb5_context *kc, struct mbuf **mp, int *conf_state, OM_uint32 res; struct mbuf *m, *mlast, *hm, *cm, *n; uint8_t *p, dir; - size_t mlen, tlen, elen, datalen, padlen; + size_t tlen, elen, datalen, padlen; size_t cklen; uint8_t buf[32]; uint32_t seq; int i, conf; m = *mp; - mlen = m_length(m, &mlast); + m_length(m, &mlast); tlen = token_length(kc->kc_tokenkey); cklen = kc->kc_tokenkey->ks_class->ec_checksumlen; @@ -1783,7 +1782,7 @@ krb5_unwrap_new(struct krb5_context *kc, struct mbuf **mp, int *conf_state) struct krb5_key_state *Kc = kc->kc_recv_seal_Kc; const struct krb5_encryption_class *ec = Ke->ks_class; struct mbuf *m, *mlast, *hm, *cm; - uint8_t *p, *pp; + uint8_t *p; int sealed, flags, EC, RRC; size_t blen, cklen, ctlen, mlen, plen, tlen; char buf[32], buf2[32]; @@ -1902,7 +1901,6 @@ krb5_unwrap_new(struct krb5_context *kc, struct mbuf **mp, int *conf_state) * plaintext starts after the confounder. */ plen = ctlen - blen - 16 - EC; - pp = p + 16 + blen; /* * Checksum the padded plaintext.
