]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
fallthrough fixes
authorWillem Toorop <willem@nlnetlabs.nl>
Tue, 22 Aug 2017 15:04:22 +0000 (17:04 +0200)
committerWillem Toorop <willem@nlnetlabs.nl>
Tue, 22 Aug 2017 15:04:22 +0000 (17:04 +0200)
dnssec_verify.c
packet.c
rr.c
util.c

index b69939fbec4b4c6aa1d8356c1a6aefd2994ad76d..a6b985041264c09e50ed3f5ae9fc05f63e8b247f 100644 (file)
@@ -2615,6 +2615,8 @@ ldns_verify_rrsig_evp_raw(const unsigned char *sig, size_t siglen,
                                ldns_buffer_position(rrset));
                }
        } else
+#else
+       res = 0;
 #endif
        if(digest_type) {
                EVP_VerifyInit(ctx, digest_type);
@@ -2628,6 +2630,7 @@ ldns_verify_rrsig_evp_raw(const unsigned char *sig, size_t siglen,
        
        if (res == 1) {
                return LDNS_STATUS_OK;
+
        } else if (res == 0) {
                return LDNS_STATUS_CRYPTO_BOGUS;
        }
index 3a8488d82824f543194cbb437286ab988b1bdb1e..774cb1769d6d7c7573f7296705e7e477ba963c16 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -389,6 +389,7 @@ ldns_pkt_rr(const ldns_pkt *pkt, ldns_pkt_section sec, const ldns_rr *rr)
                return ldns_rr_list_contains_rr(ldns_pkt_additional(pkt), rr);
        case LDNS_SECTION_ANY:
                result = ldns_rr_list_contains_rr(ldns_pkt_question(pkt), rr);
+               /* fallthrough */
        case LDNS_SECTION_ANY_NOQUESTION:
                result = result
                    || ldns_rr_list_contains_rr(ldns_pkt_answer(pkt), rr)
diff --git a/rr.c b/rr.c
index c971610e96bf3e8899e28221d48400eade267647..dc27dd31ec8606ba9673578ddb92c42d761fb3d7 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -351,6 +351,7 @@ ldns_rr_new_frm_str_internal(ldns_rr **newrr, const char *str,
                                                        delimiters = "\n";
                                                        break;
                                                }
+                                               /* fallthrough */
                default                       : delimiters = "\n\t "; 
                }
 
diff --git a/util.c b/util.c
index 3dcd8495ebb96fe50d40059eadfbabb8e70eca16..1216134f962cb3a40b4ffad1f089ea26e9d20c7f 100644 (file)
--- a/util.c
+++ b/util.c
@@ -548,10 +548,12 @@ ldns_b32_ntop_base(const uint8_t* src, size_t src_sz,
 
                /* ........ ........ ....4444 4....... ........ */
                         c =  src[3]         >> 7 ;
+               /* fallthrough */
        case 3: dst[4] = b32[(src[2] & 0x0f) << 1 | c];
 
                /* ........ .......3 3333.... ........ ........ */
                         c =  src[2]         >> 4 ;
+               /* fallthrough */
        case 2: dst[3] = b32[(src[1] & 0x01) << 4 | c];
 
                /* ........ ..22222. ........ ........ ........ */
@@ -559,6 +561,7 @@ ldns_b32_ntop_base(const uint8_t* src, size_t src_sz,
 
                /* .....111 11...... ........ ........ ........ */
                         c =  src[1]         >> 6 ;
+               /* fallthrough */
        case 1: dst[1] = b32[(src[0] & 0x07) << 2 | c];
 
                /* 00000... ........ ........ ........ ........ */
@@ -569,9 +572,12 @@ ldns_b32_ntop_base(const uint8_t* src, size_t src_sz,
                switch (src_sz) {
                        case 1: dst[2] = '=';
                                dst[3] = '=';
+                               /* fallthrough */
                        case 2: dst[4] = '=';
+                               /* fallthrough */
                        case 3: dst[5] = '=';
                                dst[6] = '=';
+                               /* fallthrough */
                        case 4: dst[7] = '=';
                }
        }
@@ -696,15 +702,18 @@ ldns_b32_pton_base(const char* src, size_t src_sz,
                        /* ........ ........ ........ .55555.. ........ */
                        /* ........ ........ ....4444 4....... ........ */
                        dst[3] = buf[4] << 7 | buf[5] << 2 | buf[6] >> 3;
+                       /* fallthrough */
 
                case 5: /* ........ ........ ....4444 4....... ........ */
                        /* ........ .......3 3333.... ........ ........ */
                        dst[2] = buf[3] << 4 | buf[4] >> 1;
+                       /* fallthrough */
 
                case 4: /* ........ .......3 3333.... ........ ........ */
                        /* ........ ..22222. ........ ........ ........ */
                        /* .....111 11...... ........ ........ ........ */
                        dst[1] = buf[1] << 6 | buf[2] << 1 | buf[3] >> 4;
+                       /* fallthrough */
 
                case 2: /* .....111 11...... ........ ........ ........ */
                        /* 00000... ........ ........ ........ ........ */