Commit 9d4bcf0e authored by Daniel Salzman's avatar Daniel Salzman

Merge branch 'bitmap-fixup' into 'master'

Fix errors in dnssec_nsec_bitmap_contains()

See merge request !925
parents 4331fb99 ca2f2ea0
......@@ -96,7 +96,7 @@ bool dnssec_nsec_bitmap_contains(const uint8_t *bitmap, uint16_t size, uint16_t
uint8_t block_size = bitmap[bitmap_pos++]; // Skip window block size.
// Size checks.
if (block_size == 0 || bitmap_pos + block_size < size) {
if (block_size == 0 || bitmap_pos + block_size > size) {
return false;
}
......@@ -106,6 +106,7 @@ bool dnssec_nsec_bitmap_contains(const uint8_t *bitmap, uint16_t size, uint16_t
// Check if the bit for type is set.
return bitmap[bitmap_pos + bitmap_idx] & bit_mask;
}
return false;
} else {
bitmap_pos += block_size;
}
......
......@@ -23,51 +23,80 @@
#include "nsec.h"
#include "libknot/descriptor.h"
#define TEST_BITMAP_SIZE 18
int main(void)
{
plan_lazy();
// Which rrtypes will be contained in the bitmap.
int test_contains_count = 8;
enum knot_rr_type test_contains[] = {
KNOT_RRTYPE_A,
KNOT_RRTYPE_NS,
KNOT_RRTYPE_SOA,
KNOT_RRTYPE_RRSIG,
KNOT_RRTYPE_NSEC,
KNOT_RRTYPE_DNSKEY,
KNOT_RRTYPE_SPF,
KNOT_RRTYPE_CAA
};
// Which rrtypes will not be contained in the bitmap.
int test_not_contains_count = 4;
enum knot_rr_type test_not_contains[] = {
KNOT_RRTYPE_AAAA,
KNOT_RRTYPE_MX,
KNOT_RRTYPE_AXFR,
KNOT_RRTYPE_CNAME
};
// Allocate new bitmap.
dnssec_nsec_bitmap_t *bitmap = dnssec_nsec_bitmap_new();
ok(bitmap != NULL, "allocate bitmap");
if (!bitmap) {
return 1;
}
dnssec_nsec_bitmap_add(bitmap, 1); // A
dnssec_nsec_bitmap_add(bitmap, 2); // NS
dnssec_nsec_bitmap_add(bitmap, 6); // SOA
dnssec_nsec_bitmap_add(bitmap, 15); // MX
dnssec_nsec_bitmap_add(bitmap, 16); // TXT
dnssec_nsec_bitmap_add(bitmap, 28); // AAAA
dnssec_nsec_bitmap_add(bitmap, 44); // SSHFP
dnssec_nsec_bitmap_add(bitmap, 46); // RRSIG
dnssec_nsec_bitmap_add(bitmap, 47); // NSEC
dnssec_nsec_bitmap_add(bitmap, 48); // DNSKEY
// Add the desired RR types to bitmap.
for (int i = 0; i < test_contains_count; i++) {
dnssec_nsec_bitmap_add(bitmap, test_contains[i]);
}
size_t size = dnssec_nsec_bitmap_size(bitmap);
ok(size == 9, "valid bitmap size");
if (size != 9) {
ok(size == TEST_BITMAP_SIZE, "valid bitmap size");
if (size != TEST_BITMAP_SIZE) {
dnssec_nsec_bitmap_free(bitmap);
return 1;
}
const uint8_t expected[9] = {
0x00, 0x07, 0x62, 0x01, 0x80, 0x08, 0x00, 0x0b, 0x80
const uint8_t expected[TEST_BITMAP_SIZE] = {
0x00, 0x0D, 0x62, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
0x01, 0x01, 0x40
};
uint8_t encoded[9] = { 0 };
uint8_t encoded[TEST_BITMAP_SIZE] = { 0 };
dnssec_nsec_bitmap_write(bitmap, encoded);
ok(memcmp(encoded, expected, 9) == 0, "valid bitmap");
ok(memcmp(encoded, expected, TEST_BITMAP_SIZE) == 0, "valid bitmap");
bool contains = dnssec_nsec_bitmap_contains(expected, 9, KNOT_RRTYPE_AAAA);
ok(contains, "bitmap contains AAAA");
contains = dnssec_nsec_bitmap_contains(expected, 9, KNOT_RRTYPE_CNAME);
ok(!contains, "bitmap does not contain CNAME");
// Test contained types.
char rrtype_str[50];
for (int i = 0; i < test_contains_count; i++) {
bool contains = dnssec_nsec_bitmap_contains(encoded, size, test_contains[i]);
(void)knot_rrtype_to_string(test_contains[i], rrtype_str, 50);
ok(contains, "bitmap contains %s", rrtype_str);
}
// Test not contained types.
for (int i = 0; i < test_not_contains_count; i++) {
bool contains = dnssec_nsec_bitmap_contains(encoded, size, test_not_contains[i]);
(void)knot_rrtype_to_string(test_not_contains[i], rrtype_str, 50);
ok(!contains, "bitmap does not contain %s", rrtype_str);
}
dnssec_nsec_bitmap_clear(bitmap);
ok(dnssec_nsec_bitmap_size(bitmap) == 0, "bitmap clear");
dnssec_nsec_bitmap_free(bitmap);
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment