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

(RFC 4034).  Still emit numeric algorithms for
                        compatability with RFC 3658. [RT #15354]
This commit is contained in:
Mark Andrews 2005-09-06 06:55:16 +00:00
parent 71ac7466b6
commit 8e199907f7
2 changed files with 9 additions and 5 deletions

View file

@ -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]

View file

@ -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.