From f6200ca9fb711d2d6c9331dfd71e513b3e8bf824 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 6 Sep 2005 06:48:39 +0000
Subject: [PATCH] 1914.   [protocol]      DS is required to accept mnemonic
 algorithms                         (RFC 4034).  Still emit numeric algorithms
 for                         compatability with RFC 3658. [RT #15354]

---
 CHANGES                       |  4 ++++
 lib/dns/rdata/generic/ds_43.c | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index b81ed1b7d9..6dfc67e9a0 100644
--- 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 c03077df9f..fde15a92a2 100644
--- 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.7.18.1 2005/09/06 06:48:39 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.