Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Aug 2024 10:23:20 GMT
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: e656c69b8d50 - stable/14 - Fix enum warning in heimdal
Message-ID:  <202408041023.474ANKDP045604@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=e656c69b8d50ab13a08d315d49f289287b97f83a

commit e656c69b8d50ab13a08d315d49f289287b97f83a
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-07-30 18:31:47 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-08-04 10:21:02 +0000

    Fix enum warning in heimdal
    
    This fixes a clang 19 warning:
    
    crypto/heimdal/lib/krb5/deprecated.c:75:17: error: comparison of different enumeration types ('krb5_keytype' (aka 'enum ENCTYPE') and 'enum krb5_keytype_old') [-Werror,-Wenum-compare]
       75 |     if (keytype != KEYTYPE_DES || context->etypes_des == NULL)
          |         ~~~~~~~ ^  ~~~~~~~~~~~
    
    In https://github.com/heimdal/heimdal/commit/3bebbe5323 this was solved
    by adding a cast. That commit is rather large, so I'm only applying the
    one-liner here.
    
    MFC after:      3 days
    
    (cherry picked from commit 6f25b46721a18cf4f036d041e7e5d275800a00b3)
---
 crypto/heimdal/lib/krb5/deprecated.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/heimdal/lib/krb5/deprecated.c b/crypto/heimdal/lib/krb5/deprecated.c
index e7c0105ebf7f..02cf7614f932 100644
--- a/crypto/heimdal/lib/krb5/deprecated.c
+++ b/crypto/heimdal/lib/krb5/deprecated.c
@@ -72,7 +72,7 @@ krb5_keytype_to_enctypes_default (krb5_context context,
     unsigned int i, n;
     krb5_enctype *ret;
 
-    if (keytype != KEYTYPE_DES || context->etypes_des == NULL)
+    if (keytype != (krb5_keytype)KEYTYPE_DES || context->etypes_des == NULL)
 	return krb5_keytype_to_enctypes (context, keytype, len, val);
 
     for (n = 0; context->etypes_des[n]; ++n)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408041023.474ANKDP045604>