1914. [protocol] DS is required to accept mnemonic algorithms

                        (RFC 4034).  Still emit numeric algorithms for
                        compatability with RFC 3658. [RT #15354]

diff --git a/CHANGES b/CHANGES
index c6fb788a359db7a38e83209ee948e5f144601da7..51402c726102e6ad195841832da23a5d1a5bb49c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 
        --- 9.3.2b1 released ---
 
+1914.  [protocol]      DS is required to accept mnemonic algorithms
+                       (RFC 4034).  Still emit numeric algorithms for
+                       compatability with RFC 3658. [RT #15354]
+
 1911.  [bug]           Update windows socket code. [RT #14965]
 
 1910.  [bug]           dig's +sigchase code overhauled. [RT #14933]

diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c
index 538f86571d80c6410cff500e0e32f2ee7ff868c2..a8b9b9ca1c76dc79e1a94785a99028165dfd3231 100644 (file)
--- a/lib/dns/rdata/generic/ds_43.c
+++ b/lib/dns/rdata/generic/ds_43.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ds_43.c,v 1.6.2.2 2004/03/16 12:38:14 marka Exp $ */
+/* $Id: ds_43.c,v 1.6.2.3 2005/09/06 06:55:16 marka Exp $ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
 
@@ -28,6 +28,7 @@
 static inline isc_result_t
 fromtext_ds(ARGS_FROMTEXT) {
        isc_token_t token;
+       unsigned char c;
 
        REQUIRE(type == 43);
 
@@ -49,11 +50,10 @@ fromtext_ds(ARGS_FROMTEXT) {
        /*
         * Algorithm.
         */
-       RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_number,
+       RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
                                      ISC_FALSE));
-       if (token.value.as_ulong > 0xffU)
-               RETTOK(ISC_R_RANGE);
-       RETERR(uint8_tobuffer(token.value.as_ulong, target));
+       RETTOK(dns_secalg_fromtext(&c, &token.value.as_textregion));
+       RETERR(mem_tobuffer(target, &c, 1));
 
        /*
         * Digest type.