From nobody Sun Aug 04 10:23:23 2024 X-Original-To: dev-commits-src-all@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 4WcFyh48KYz5SY4D; Sun, 04 Aug 2024 10:23:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WcFyg6SBgz4CMP; Sun, 4 Aug 2024 10:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722767003; 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=DuLtkTJgQvVYr7Kle/Th88Ah+aDSC1jQ/OuvTxCgRv8=; b=N+LMKJ09RBi03uDJMzB/oSxD3BnkBHIkbtdFEN9JED4zPe7wRhpOD6TbMLGvv+vX9124SV /eyPSO7hQn4cO3QOQnF0aa2te4cy6h+ZU9ddFnxwFPawWnlQGm/slUABWsYI9cvMb965VX wSiLI3o/vS9OgNhCRSWyEF9TAIET9LRZo4pddMJ8s/iYapqIqKayL1G/Eg/3ljocFClByI R7Kndpzq9C3q64x2UP67ak3H5AgzvuVMeBFIPOxMgmk3qzIRNZD+eOjT+Dz6WJiwgyfLct YIfMYAWnY23pXrENkuwJtT7KnN+6E7fEdXfdhOJQ9Q15Xs+lgSXNOUndAGwj3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722767003; a=rsa-sha256; cv=none; b=DCPyBIu7Vldv+CO6anrKIkRF5uhRohkQUe5bYqLtWnUnfR3wOsztur0Og9NgzL1W5KqwQK Kaa/wSttdMEW+N83zbuJ2x4rqF6rGHMuQGsnkUjNv+nhdR3O+IT42PN8g9ndeO2s+r6bCa SQ0YSJsGkagutc5umHIbIggq8U4+j9ADMDB5OGd3MYmAxW8E4F/thgS8tUkGF6qn/+FK/F 0V7MWTOzWXJGOGOgeyY+lzPV71iFzT+CuFX1B/e+u3p0kghdob6cq0u3mNeSSrg1RMszgT Al5qShzcuSf0k6RnC/q65qt8/cb5StShvI3vtvTYmQ+OzLXu4oSi+YPdQXmxLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722767003; 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=DuLtkTJgQvVYr7Kle/Th88Ah+aDSC1jQ/OuvTxCgRv8=; b=m66axotdsLY33L7B7oir+bWTgRdb2HQuXnma2gcBEXGWiTBA7ERCOSZlE/DUzsqnWLl7Yv ema/nNZyagD0PpFhdcIOqFTHFGPJ0Wg3tyw1aVdxWpRz8Ov5yXIRWeTJqEdK9jkAXa+sFw EfuTVKCMSHqPNfoPjQrH31NKn+6aq+F3gRB0wBIC+4u4iRTwoagHLjRra4dvS+da3h00yQ lLfaDAERkxDkbvThf+Nb9UEV49bPmtwfX4T4W3yBMUHYDyQT7wK2UJBvi/4POc7oFrFrqY HS7pddA+esqXsTvvhVXuq/COvLKQufNmorRp7iTSAyPGx9/WscN1XTXfvX2rMw== 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 4WcFyg5x7rzs8h; Sun, 4 Aug 2024 10:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 474ANNEo045736; Sun, 4 Aug 2024 10:23:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 474ANNpK045733; Sun, 4 Aug 2024 10:23:23 GMT (envelope-from git) Date: Sun, 4 Aug 2024 10:23:23 GMT Message-Id: <202408041023.474ANNpK045733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: fa59de726fa2 - stable/14 - Fix enum warning in keyserv List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa59de726fa2ed25c79ca8400b38f9feab905f85 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=fa59de726fa2ed25c79ca8400b38f9feab905f85 commit fa59de726fa2ed25c79ca8400b38f9feab905f85 Author: Dimitry Andric AuthorDate: 2024-07-30 22:35:03 +0000 Commit: Dimitry Andric CommitDate: 2024-08-04 10:21:22 +0000 Fix enum warning in keyserv This fixes a clang 19 warning: usr.sbin/keyserv/crypt_server.c:237:53: error: comparison of different enumeration types ('des_mode' (aka 'enum des_mode') and 'enum desmode') [-Werror,-Wenum-compare] 237 | if (_my_crypt != &_arcfour_crypt && argp->des_mode == CBC) { | ~~~~~~~~~~~~~~ ^ ~~~ The type of `argp->des_mode` (aka `desargs::des_mode`) is `enum des_mode` from `/usr/include/rpcsvc/crypt.h`, not `enum desmode` from `/usr/include/rpc/des.h` (which is used in `struct desparams`). Luckily the integer values of `enum desmode`'s `CBC` and `ECB` are identical to those of `enum des_mode`'s `CBC_DES` and `ECB_DES`, so replace both values. MFC after: 3 days (cherry picked from commit 1d5a5500ad4b1f5187f40baaf58ab6868b18fc08) --- usr.sbin/keyserv/crypt_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c index 04290326cf3b..ccd593fe4e97 100644 --- a/usr.sbin/keyserv/crypt_server.c +++ b/usr.sbin/keyserv/crypt_server.c @@ -236,9 +236,9 @@ des_crypt_1_svc(desargs *argp, struct svc_req *rqstp) * getting ECB mode. */ #ifdef BROKEN_DES - if (_my_crypt != &_arcfour_crypt && argp->des_mode == CBC) { + if (_my_crypt != &_arcfour_crypt && argp->des_mode == CBC_DES) { #else - if (_my_crypt != &_arcfour_crypt && argp->des_mode == ECB) { + if (_my_crypt != &_arcfour_crypt && argp->des_mode == ECB_DES) { #endif int i; char *dptr;