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 89f5c6a6d5ff46fe698cec6b3c431e7c6bbe6942..1ed6f2b4c5925a95246ef2fab48a0718bfaa6565 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1914.  [protocol]      DS is required to accept mnemonic algorithms
+                       (RFC 4034).  Still emit numeric algorithms for
+                       compatability with RFC 3658. [RT #15354]
+
 1913.  [func]          Integrate contibuted DLZ code into named. [RT #11382]
 
 1912.  [port]          aix: atomic locking for powerpc. [RT #15020]

diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c
index c03077df9ff38ac23580cfb06ef506e44586d837..55dc4d3c1921c57b5b5ff56e1b87b5fa6e0f7e8a 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.7 2004/03/18 02:58:04 marka Exp $ */
+/* $Id: ds_43.c,v 1.8 2005/09/06 06:50:52 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.