resolved: rr - add DS support
Needed for DNSSEC.
This commit is contained in:
@@ -652,6 +652,22 @@ int dns_packet_append_rr(DnsPacket *p, const DnsResourceRecord *rr, size_t *star
|
||||
r = dns_packet_append_uint32(p, rr->loc.altitude, NULL);
|
||||
break;
|
||||
|
||||
case DNS_TYPE_DS:
|
||||
r = dns_packet_append_uint16(p, rr->ds.key_tag, NULL);
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
|
||||
r = dns_packet_append_uint8(p, rr->ds.algorithm, NULL);
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
|
||||
r = dns_packet_append_uint8(p, rr->ds.digest_type, NULL);
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
|
||||
r = dns_packet_append_blob(p, rr->ds.digest, rr->ds.digest_size, NULL);
|
||||
break;
|
||||
|
||||
case DNS_TYPE_SSHFP:
|
||||
r = dns_packet_append_uint8(p, rr->sshfp.algorithm, NULL);
|
||||
if (r < 0)
|
||||
@@ -1262,6 +1278,26 @@ int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
|
||||
}
|
||||
}
|
||||
|
||||
case DNS_TYPE_DS:
|
||||
r = dns_packet_read_uint16(p, &rr->ds.key_tag, NULL);
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
|
||||
r = dns_packet_read_uint8(p, &rr->ds.algorithm, NULL);
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
|
||||
r = dns_packet_read_uint8(p, &rr->ds.digest_type, NULL);
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
|
||||
r = dns_packet_read_public_key(p, rdlength - 4,
|
||||
&rr->ds.digest, &rr->ds.digest_size,
|
||||
NULL);
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
|
||||
break;
|
||||
case DNS_TYPE_SSHFP:
|
||||
r = dns_packet_read_uint8(p, &rr->sshfp.algorithm, NULL);
|
||||
if (r < 0)
|
||||
|
||||
@@ -271,6 +271,10 @@ DnsResourceRecord* dns_resource_record_unref(DnsResourceRecord *rr) {
|
||||
free(rr->mx.exchange);
|
||||
break;
|
||||
|
||||
case DNS_TYPE_DS:
|
||||
free(rr->ds.digest);
|
||||
break;
|
||||
|
||||
case DNS_TYPE_SSHFP:
|
||||
free(rr->sshfp.key);
|
||||
break;
|
||||
@@ -409,6 +413,13 @@ int dns_resource_record_equal(const DnsResourceRecord *a, const DnsResourceRecor
|
||||
a->loc.longitude == b->loc.longitude &&
|
||||
a->loc.altitude == b->loc.altitude;
|
||||
|
||||
case DNS_TYPE_DS:
|
||||
return a->ds.key_tag == b->ds.key_tag &&
|
||||
a->ds.algorithm == b->ds.algorithm &&
|
||||
a->ds.digest_type == b->ds.digest_type &&
|
||||
a->ds.digest_size == b->ds.digest_size &&
|
||||
memcmp(a->ds.digest, b->ds.digest, a->ds.digest_size) == 0;
|
||||
|
||||
case DNS_TYPE_SSHFP:
|
||||
return a->sshfp.algorithm == b->sshfp.algorithm &&
|
||||
a->sshfp.fptype == b->sshfp.fptype &&
|
||||
@@ -604,6 +615,21 @@ int dns_resource_record_to_string(const DnsResourceRecord *rr, char **ret) {
|
||||
return -ENOMEM;
|
||||
break;
|
||||
|
||||
case DNS_TYPE_DS:
|
||||
t = hexmem(rr->ds.digest, rr->ds.digest_size);
|
||||
if (!t)
|
||||
return -ENOMEM;
|
||||
|
||||
r = asprintf(&s, "%s %u %u %u %s",
|
||||
k,
|
||||
rr->ds.key_tag,
|
||||
rr->ds.algorithm,
|
||||
rr->ds.digest_type,
|
||||
t);
|
||||
if (r < 0)
|
||||
return -ENOMEM;
|
||||
break;
|
||||
|
||||
case DNS_TYPE_SSHFP:
|
||||
t = hexmem(rr->sshfp.key, rr->sshfp.key_size);
|
||||
if (!t)
|
||||
|
||||
@@ -108,6 +108,14 @@ struct DnsResourceRecord {
|
||||
uint32_t altitude;
|
||||
} loc;
|
||||
|
||||
struct {
|
||||
uint16_t key_tag;
|
||||
uint8_t algorithm;
|
||||
uint8_t digest_type;
|
||||
void *digest;
|
||||
size_t digest_size;
|
||||
} ds;
|
||||
|
||||
struct {
|
||||
uint8_t algorithm;
|
||||
uint8_t fptype;
|
||||
|
||||
Reference in New Issue
Block a user