- sldns has ED25519 and ED448 algorithm number and name for display.

git-svn-id: file:///svn/unbound/trunk@4013 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 31c9e46275213c2e6e80432398b0626ec56787d6..b7a90e55726725c945c1ab9d6ea79e9a73553358 100644 (file)
--- 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 00c01e63a4035fa9e27b0b5529a511964670a30f..44e9b84ce86a1f634f9248dce593020626c06e6d 100644 (file)
--- 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 0efa65f7566452d9066ce802b125de48630676d1..acb3532512c18d664c7c7a4ed517bbf7bb028b0a 100644 (file)
--- 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" },