Replace literal 255 with a more descriptive macro name

More details on thread:
https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/291#note_12186

diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h
index cc5dea7f02d6a2c6fb5262f847e267cd718caab4..db63d401504037e63b0d7e9df34461f0f7927b14 100644 (file)
--- a/lib/dns/include/dns/keyvalues.h
+++ b/lib/dns/include/dns/keyvalues.h
@@ -70,6 +70,7 @@
 #define DNS_KEYALG_INDIRECT    252
 #define DNS_KEYALG_PRIVATEDNS  253
 #define DNS_KEYALG_PRIVATEOID  254 /*%< Key begins with OID giving alg */
+#define DNS_KEYALG_MAX         255
 
 /* Protocol values  */
 #define DNS_KEYPROTO_RESERVED 0

diff --git a/lib/dns/zoneverify.c b/lib/dns/zoneverify.c
index 86f46b7092160e1e48a3cfbbf415f51ca5c6920f..b51c0b137174d1491128781424f056e54ca2d93e 100644 (file)
--- a/lib/dns/zoneverify.c
+++ b/lib/dns/zoneverify.c
@@ -1486,18 +1486,18 @@ check_dnskey_sigs(vctx_t *vctx, const dns_rdata_dnskey_t *dnskey,
                    dns_dnssec_signs(keyrdata, vctx->origin, &vctx->soaset,
                                     &vctx->soasigs, false, vctx->mctx))
                {
-                       if (active_keys[dnskey->algorithm] != 255) {
+                       if (active_keys[dnskey->algorithm] != DNS_KEYALG_MAX) {
                                active_keys[dnskey->algorithm]++;
                        }
                } else {
-                       if (standby_keys[dnskey->algorithm] != 255) {
+                       if (standby_keys[dnskey->algorithm] != DNS_KEYALG_MAX) {
                                standby_keys[dnskey->algorithm]++;
                        }
                }
                return;
        }
 
-       if (active_keys[dnskey->algorithm] != 255) {
+       if (active_keys[dnskey->algorithm] != DNS_KEYALG_MAX) {
                active_keys[dnskey->algorithm]++;
        }
 
@@ -1637,11 +1637,13 @@ check_dnskey(vctx_t *vctx) {
                                return (ISC_R_FAILURE);
                        }
                        if ((dnskey.flags & DNS_KEYFLAG_KSK) != 0 &&
-                           vctx->revoked_ksk[dnskey.algorithm] != 255)
+                           vctx->revoked_ksk[dnskey.algorithm] !=
+                                   DNS_KEYALG_MAX)
                        {
                                vctx->revoked_ksk[dnskey.algorithm]++;
                        } else if ((dnskey.flags & DNS_KEYFLAG_KSK) == 0 &&
-                                  vctx->revoked_zsk[dnskey.algorithm] != 255)
+                                  vctx->revoked_zsk[dnskey.algorithm] !=
+                                          DNS_KEYALG_MAX)
                        {
                                vctx->revoked_zsk[dnskey.algorithm]++;
                        }