diff --git a/doc/Changelog b/doc/Changelog index 31c9e4627..b7a90e557 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +15 February 2017: Wouter + - sldns has ED25519 and ED448 algorithm number and name for display. + 14 February 2017: Wouter - tag 1.6.1rc3. diff --git a/sldns/rrdef.h b/sldns/rrdef.h index 00c01e63a..44e9b84ce 100644 --- a/sldns/rrdef.h +++ b/sldns/rrdef.h @@ -372,6 +372,8 @@ enum sldns_enum_algorithm LDNS_ECC_GOST = 12, /* RFC 5933 */ LDNS_ECDSAP256SHA256 = 13, /* RFC 6605 */ LDNS_ECDSAP384SHA384 = 14, /* RFC 6605 */ + LDNS_ED25519 = 15, /* RFC 8080 */ + LDNS_ED448 = 16, /* RFC 8080 */ LDNS_INDIRECT = 252, LDNS_PRIVATEDNS = 253, LDNS_PRIVATEOID = 254 diff --git a/sldns/wire2str.c b/sldns/wire2str.c index 0efa65f75..acb353251 100644 --- a/sldns/wire2str.c +++ b/sldns/wire2str.c @@ -47,6 +47,8 @@ static sldns_lookup_table sldns_algorithms_data[] = { { LDNS_ECC_GOST, "ECC-GOST"}, { LDNS_ECDSAP256SHA256, "ECDSAP256SHA256"}, { LDNS_ECDSAP384SHA384, "ECDSAP384SHA384"}, + { LDNS_ED25519, "ED25519"}, + { LDNS_ED448, "ED448"}, { LDNS_INDIRECT, "INDIRECT" }, { LDNS_PRIVATEDNS, "PRIVATEDNS" }, { LDNS_PRIVATEOID, "PRIVATEOID" },