mirror of
https://github.com/systemd/systemd.git
synced 2024-11-08 11:27:32 +03:00
resolved: rr - SSHFP contains the fingerprint, not the key
Rename the field to make this clearer.
This commit is contained in:
parent
f1d178cce1
commit
549c1a2564
@ -761,7 +761,7 @@ int dns_packet_append_rr(DnsPacket *p, const DnsResourceRecord *rr, size_t *star
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
|
||||
r = dns_packet_append_blob(p, rr->sshfp.key, rr->sshfp.key_size, NULL);
|
||||
r = dns_packet_append_blob(p, rr->sshfp.fingerprint, rr->sshfp.fingerprint_size, NULL);
|
||||
break;
|
||||
|
||||
case DNS_TYPE_DNSKEY:
|
||||
@ -1531,10 +1531,10 @@ int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
|
||||
goto fail;
|
||||
|
||||
r = dns_packet_read_memdup(p, rdlength - 2,
|
||||
&rr->sshfp.key, &rr->sshfp.key_size,
|
||||
&rr->sshfp.fingerprint, &rr->sshfp.fingerprint_size,
|
||||
NULL);
|
||||
|
||||
if (rr->sshfp.key_size <= 0) {
|
||||
if (rr->sshfp.fingerprint_size <= 0) {
|
||||
/* the accepted size depends on the algorithm, but for now
|
||||
just ensure that the value is greater than zero */
|
||||
r = -EBADMSG;
|
||||
|
@ -276,7 +276,7 @@ DnsResourceRecord* dns_resource_record_unref(DnsResourceRecord *rr) {
|
||||
break;
|
||||
|
||||
case DNS_TYPE_SSHFP:
|
||||
free(rr->sshfp.key);
|
||||
free(rr->sshfp.fingerprint);
|
||||
break;
|
||||
|
||||
case DNS_TYPE_DNSKEY:
|
||||
@ -434,8 +434,8 @@ int dns_resource_record_equal(const DnsResourceRecord *a, const DnsResourceRecor
|
||||
case DNS_TYPE_SSHFP:
|
||||
return a->sshfp.algorithm == b->sshfp.algorithm &&
|
||||
a->sshfp.fptype == b->sshfp.fptype &&
|
||||
a->sshfp.key_size == b->sshfp.key_size &&
|
||||
memcmp(a->sshfp.key, b->sshfp.key, a->sshfp.key_size) == 0;
|
||||
a->sshfp.fingerprint_size == b->sshfp.fingerprint_size &&
|
||||
memcmp(a->sshfp.fingerprint, b->sshfp.fingerprint, a->sshfp.fingerprint_size) == 0;
|
||||
|
||||
case DNS_TYPE_DNSKEY:
|
||||
return a->dnskey.zone_key_flag == b->dnskey.zone_key_flag &&
|
||||
@ -687,7 +687,7 @@ int dns_resource_record_to_string(const DnsResourceRecord *rr, char **ret) {
|
||||
break;
|
||||
|
||||
case DNS_TYPE_SSHFP:
|
||||
t = hexmem(rr->sshfp.key, rr->sshfp.key_size);
|
||||
t = hexmem(rr->sshfp.fingerprint, rr->sshfp.fingerprint_size);
|
||||
if (!t)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -117,11 +117,12 @@ struct DnsResourceRecord {
|
||||
size_t digest_size;
|
||||
} ds;
|
||||
|
||||
/* https://tools.ietf.org/html/rfc4255#section-3.1 */
|
||||
struct {
|
||||
uint8_t algorithm;
|
||||
uint8_t fptype;
|
||||
void *key;
|
||||
size_t key_size;
|
||||
void *fingerprint;
|
||||
size_t fingerprint_size;
|
||||
} sshfp;
|
||||
|
||||
/* http://tools.ietf.org/html/rfc4034#section-2.1 */
|
||||
|
Loading…
Reference in New Issue
Block a user