From nobody Wed Apr 06 23:46:25 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8398A1A845A3; Wed, 6 Apr 2022 23:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KYh421rT7z4R94; Wed, 6 Apr 2022 23:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VNtSvRtiuqV+r0tVu2cZsPRoz2QVbTb0SzlUUyNSwIU=; b=u0QMp1FjZ93TC7nZzPaP42Oan2vdmgcqZsMFghd7qgv+xOHuW/0WFdSTirhMLtCfSGra2L nAr+QopBfiECaaBDg3GwWhArUom2ygAGDCNi2QozEDLO7PNy+zJSdDEHAnvfTt919qaHEW WBq1W3PlqHZ5Lphi8s+9TG/8O3nBnd+9DiHdtfjvnzWUWpLPQGXz/J4MlMWKnw0iMREAb7 f2X5IOc3AifHQm6HZXBWNw9fvHJISB6+6vItxBut08t5+LxDAc4TBpx7h83puscEq3t1XF xV7wX9Sj4ArtYQZpAq7qHSDsGuTh3c8gfH0UT2kEBMp0Y63/mxRjyzW+OXF+ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB5782497C; Wed, 6 Apr 2022 23:46:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 236NkPnR009221; Wed, 6 Apr 2022 23:46:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236NkPjR009220; Wed, 6 Apr 2022 23:46:25 GMT (envelope-from git) Date: Wed, 6 Apr 2022 23:46:25 GMT Message-Id: <202204062346.236NkPjR009220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 89293939de19 - main - kgssapi krb5: Remove unused variables. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89293939de19896759a0ea73ec15180f99ba40e3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VNtSvRtiuqV+r0tVu2cZsPRoz2QVbTb0SzlUUyNSwIU=; b=LJuIcME6O9YD/PvBFBF5VyRRbgDuS8zeRexOe4LF1qrRALizNx+QHdveCpGH0Hl6rMAGIr Y2xg77o5yk1KaYzApD9oUOLVsdvpDcuVCI/Z6vb9w+jaAbOpEZ/vXIvXnihxzFnuQcFFVv D2qMTHUx1Bb8l/vQhrmhXPOs5VgmhT4K3R8ClZnNdgbs+MnxTAqtSCa/+7T/evqyl5Xe2s juCIgZL/TviHH57x1/0+QWyoWdO4+zXQvmgQAzu9ZEd+2ftsnnrluHqnBIfaFI1hVsPxLO r9Xrje6pYggavdOoGlHqOATuaQSL3Bi/Fqk5ikhLhoxyh/H9rarRnhqTpfQkog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649288786; a=rsa-sha256; cv=none; b=GE43ZHtNa/hwVKlpOhuaBATqQr8qiqey6iCEKgukntgmArhu/AzWMxSs6n8B5uA/ZK4DQF GHNFqtc9dh5URuDJPPigPeOhaxpX7CTyehkG5s3CLFsZPXusrdsmcFohk+VpMeOs928/bm BPDPKY9CWYWy1dKWyBx4iRkBkxTUQGoVY8Mq1WXNiElC0Hj8mFmgefdPQ5jxqtvJfPtssl /2MnPLR82Z8Q9UmX9AL+pCBR8eW7yhAky5CikO2kPIenHOxpY8ChdsIDpAfQO95s/v82bv fZjj5w0GgxPv8smGIy4jGv06qdFGrNtuAnsYshibpmMDw9OitS41iTIGu6X/mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=89293939de19896759a0ea73ec15180f99ba40e3 commit 89293939de19896759a0ea73ec15180f99ba40e3 Author: John Baldwin AuthorDate: 2022-04-06 23:45:29 +0000 Commit: John Baldwin 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.