From 22fab3199fad15cd2dda526c63f4d95c38b67671 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 1 May 2018 10:08:23 +1000 Subject: [PATCH] simplify mask construction --- lib/dns/dst_parse.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c index e6f8e8e8a0..36d464bf87 100644 --- a/lib/dns/dst_parse.c +++ b/lib/dns/dst_parse.c @@ -25,7 +25,6 @@ /*% * Principal Author: Brian Wellington - * $Id: dst_parse.c,v 1.29 2011/08/18 23:46:35 tbox Exp $ */ #include @@ -210,9 +209,7 @@ check_rsa(const dst_private_t *priv, isc_boolean_t external) { have[i] = ISC_TRUE; } - mask = ~0; - mask <<= sizeof(mask) * 8 - TAG_SHIFT; - mask >>= sizeof(mask) * 8 - TAG_SHIFT; + mask = (1ULL << TAG_SHIFT) - 1; if (have[TAG_RSA_ENGINE & mask]) ok = have[TAG_RSA_MODULUS & mask] && @@ -304,9 +301,7 @@ check_ecdsa(const dst_private_t *priv, isc_boolean_t external) { have[i] = ISC_TRUE; } - mask = ~0; - mask <<= sizeof(mask) * 8 - TAG_SHIFT; - mask >>= sizeof(mask) * 8 - TAG_SHIFT; + mask = (1ULL << TAG_SHIFT) - 1; if (have[TAG_ECDSA_ENGINE & mask]) ok = have[TAG_ECDSA_LABEL & mask]; @@ -336,9 +331,7 @@ check_eddsa(const dst_private_t *priv, isc_boolean_t external) { have[i] = ISC_TRUE; } - mask = ~0; - mask <<= sizeof(mask) * 8 - TAG_SHIFT; - mask >>= sizeof(mask) * 8 - TAG_SHIFT; + mask = (1ULL << TAG_SHIFT) - 1; if (have[TAG_EDDSA_ENGINE & mask]) ok = have[TAG_EDDSA_LABEL & mask];