mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 23:25:38 +00:00
Code Issues Releases Wiki Activity

Don't assume class IN.

Browse Source
This commit is contained in:
Brian Wellington
2000-09-12 09:54:36 +00:00
parent 0586029c81
commit 020d334001
3 changed files with 62 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/dns/sec/dst/dst_api.c
View File

@@ -19,7 +19,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.61 2000/09/08 14:23:44 bwelling Exp $ * $Id: dst_api.c,v 1.62 2000/09/12 09:54:33 bwelling Exp $
*/ */
#include <config.h> #include <config.h>
@@ -40,6 +40,7 @@
#include <dns/fixedname.h> #include <dns/fixedname.h>
#include <dns/name.h> #include <dns/name.h>
#include <dns/rdata.h> #include <dns/rdata.h>
#include <dns/rdataclass.h>
#include <dns/types.h> #include <dns/types.h>
#include <dns/keyvalues.h> #include <dns/keyvalues.h>
@@ -69,6 +70,7 @@ static dst_key_t * get_key_struct(dns_name_t *name,
const unsigned int flags, const unsigned int flags,
const unsigned int protocol, const unsigned int protocol,
const unsigned int bits, const unsigned int bits,
const dns_rdataclass_t rdclass,
isc_mem_t *mctx); isc_mem_t *mctx);
static isc_result_t read_public_key(const char *filename, static isc_result_t read_public_key(const char *filename,
isc_mem_t *mctx, isc_mem_t *mctx,
@@ -366,7 +368,8 @@ dst_key_fromnamedfile(const char *filename, const int type, isc_mem_t *mctx,
} }
key = get_key_struct(pubkey->key_name, pubkey->key_alg, key = get_key_struct(pubkey->key_name, pubkey->key_alg,
pubkey->key_flags, pubkey->key_proto, 0, mctx); pubkey->key_flags, pubkey->key_proto, 0,
pubkey->key_class, mctx);
id = pubkey->key_id; id = pubkey->key_id;
dst_key_free(&pubkey); dst_key_free(&pubkey);
@@ -421,8 +424,8 @@ dst_key_todns(const dst_key_t *key, isc_buffer_t *target) {
} }
isc_result_t isc_result_t
dst_key_fromdns(dns_name_t *name, isc_buffer_t *source, isc_mem_t *mctx, dst_key_fromdns(dns_name_t *name, dns_rdataclass_t rdclass,
dst_key_t **keyp) isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp)
{ {
isc_uint8_t alg, proto; isc_uint8_t alg, proto;
isc_uint32_t flags, extflags; isc_uint32_t flags, extflags;
@@ -449,13 +452,14 @@ dst_key_fromdns(dns_name_t *name, isc_buffer_t *source, isc_mem_t *mctx,
flags |= (extflags << 16); flags |= (extflags << 16);
} }
return (dst_key_frombuffer(name, alg, flags, proto, source, mctx, return (dst_key_frombuffer(name, alg, flags, proto, rdclass,
keyp)); source, mctx, keyp));
} }
isc_result_t isc_result_t
dst_key_frombuffer(dns_name_t *name, const unsigned int alg, dst_key_frombuffer(dns_name_t *name, const unsigned int alg,
const unsigned int flags, const unsigned int protocol, const unsigned int flags, const unsigned int protocol,
dns_rdataclass_t rdclass,
isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp)
{ {
dst_key_t *key; dst_key_t *key;
@@ -470,7 +474,7 @@ dst_key_frombuffer(dns_name_t *name, const unsigned int alg,
if (dst_algorithm_supported(alg) == ISC_FALSE) if (dst_algorithm_supported(alg) == ISC_FALSE)
return (DST_R_UNSUPPORTEDALG); return (DST_R_UNSUPPORTEDALG);
key = get_key_struct(name, alg, flags, protocol, 0, mctx); key = get_key_struct(name, alg, flags, protocol, 0, rdclass, mctx);
if (key == NULL) if (key == NULL)
return (ISC_R_NOMEMORY); return (ISC_R_NOMEMORY);
@@ -514,7 +518,7 @@ dst_key_fromgssapi(dns_name_t *name, void *opaque, isc_mem_t *mctx,
REQUIRE(keyp != NULL && *keyp == NULL); REQUIRE(keyp != NULL && *keyp == NULL);
key = get_key_struct(name, DST_ALG_GSSAPI, 0, DNS_KEYPROTO_DNSSEC, key = get_key_struct(name, DST_ALG_GSSAPI, 0, DNS_KEYPROTO_DNSSEC,
0, mctx); 0, dns_rdataclass_in, mctx);
if (key == NULL) if (key == NULL)
return (ISC_R_NOMEMORY); return (ISC_R_NOMEMORY);
key->opaque = opaque; key->opaque = opaque;
@@ -526,6 +530,7 @@ isc_result_t
dst_key_generate(dns_name_t *name, const unsigned int alg, dst_key_generate(dns_name_t *name, const unsigned int alg,
const unsigned int bits, const unsigned int param, const unsigned int bits, const unsigned int param,
const unsigned int flags, const unsigned int protocol, const unsigned int flags, const unsigned int protocol,
const dns_rdataclass_t rdclass,
isc_mem_t *mctx, dst_key_t **keyp) isc_mem_t *mctx, dst_key_t **keyp)
{ {
dst_key_t *key; dst_key_t *key;
@@ -539,7 +544,7 @@ dst_key_generate(dns_name_t *name, const unsigned int alg,
if (dst_algorithm_supported(alg) == ISC_FALSE) if (dst_algorithm_supported(alg) == ISC_FALSE)
return (DST_R_UNSUPPORTEDALG); return (DST_R_UNSUPPORTEDALG);
key = get_key_struct(name, alg, flags, protocol, bits, mctx); key = get_key_struct(name, alg, flags, protocol, bits, rdclass, mctx);
if (key == NULL) if (key == NULL)
return (ISC_R_NOMEMORY); return (ISC_R_NOMEMORY);
@@ -660,6 +665,12 @@ dst_key_id(const dst_key_t *key) {
return (key->key_id); return (key->key_id);
} }
dns_rdataclass_t
dst_key_class(const dst_key_t *key) {
REQUIRE(VALID_KEY(key));
return (key->key_class);
}
isc_boolean_t isc_boolean_t
dst_key_isprivate(const dst_key_t *key) { dst_key_isprivate(const dst_key_t *key) {
REQUIRE(VALID_KEY(key)); REQUIRE(VALID_KEY(key));
@@ -789,7 +800,8 @@ dst_region_computeid(const isc_region_t *source, const unsigned int alg) {
static dst_key_t * static dst_key_t *
get_key_struct(dns_name_t *name, const unsigned int alg, get_key_struct(dns_name_t *name, const unsigned int alg,
const unsigned int flags, const unsigned int protocol, const unsigned int flags, const unsigned int protocol,
const unsigned int bits, isc_mem_t *mctx) const unsigned int bits, dns_rdataclass_t rdclass,
isc_mem_t *mctx)
{ {
dst_key_t *key; dst_key_t *key;
isc_result_t result; isc_result_t result;
@@ -821,6 +833,7 @@ get_key_struct(dns_name_t *name, const unsigned int alg,
key->mctx = mctx; key->mctx = mctx;
key->opaque = NULL; key->opaque = NULL;
key->key_size = bits; key->key_size = bits;
key->key_class = rdclass;
key->func = dst_t_func[alg]; key->func = dst_t_func[alg];
return (key); return (key);
} }
@@ -839,6 +852,8 @@ read_public_key(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) {
dns_rdata_t rdata; dns_rdata_t rdata;
unsigned int opt = ISC_LEXOPT_DNSMULTILINE; unsigned int opt = ISC_LEXOPT_DNSMULTILINE;
char *newfilename; char *newfilename;
isc_textregion_t r;
dns_rdataclass_t rdclass = dns_rdataclass_in;
if (strlen(filename) < 8) if (strlen(filename) < 8)
return (DST_R_INVALIDPUBLICKEY); return (DST_R_INVALIDPUBLICKEY);
@@ -856,7 +871,7 @@ read_public_key(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) {
/* /*
* Open the file and read its formatted contents * Open the file and read its formatted contents
* File format: * File format:
* domain.name [ttl] [IN] KEY <flags> <protocol> <algorithm> <key> * domain.name [ttl] [class] KEY <flags> <protocol> <algorithm> <key>
*/ */
/* 1500 should be large enough for any key */ /* 1500 should be large enough for any key */
@@ -892,7 +907,7 @@ read_public_key(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) {
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
/* Read the next word: either TTL, 'IN', or 'KEY' */ /* Read the next word: either TTL, class, or 'KEY' */
NEXTTOKEN(lex, opt, &token); NEXTTOKEN(lex, opt, &token);
/* If it's a TTL, read the next one */ /* If it's a TTL, read the next one */
@@ -902,7 +917,10 @@ read_public_key(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) {
if (token.type != isc_tokentype_string) if (token.type != isc_tokentype_string)
BADTOKEN(); BADTOKEN();
if (strcasecmp(token.value.as_pointer, "IN") == 0) r.base = token.value.as_pointer;
r.length = strlen(r.base);
ret = dns_rdataclass_fromtext(&rdclass, &r);
if (ret == ISC_R_SUCCESS)
NEXTTOKEN(lex, opt, &token); NEXTTOKEN(lex, opt, &token);
if (token.type != isc_tokentype_string) if (token.type != isc_tokentype_string)
@@ -912,12 +930,13 @@ read_public_key(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) {
BADTOKEN(); BADTOKEN();
isc_buffer_init(&b, rdatabuf, sizeof(rdatabuf)); isc_buffer_init(&b, rdatabuf, sizeof(rdatabuf));
ret = dns_rdata_fromtext(&rdata, dns_rdataclass_in, dns_rdatatype_key, ret = dns_rdata_fromtext(&rdata, rdclass, dns_rdatatype_key,
lex, NULL, ISC_FALSE, &b, NULL); lex, NULL, ISC_FALSE, &b, NULL);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
ret = dst_key_fromdns(dns_fixedname_name(&name), &b, mctx, keyp); ret = dst_key_fromdns(dns_fixedname_name(&name), rdclass, &b, mctx,
keyp);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
@@ -937,32 +956,35 @@ read_public_key(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) {
static isc_result_t static isc_result_t
write_public_key(const dst_key_t *key, const char *directory) { write_public_key(const dst_key_t *key, const char *directory) {
FILE *fp; FILE *fp;
isc_buffer_t keyb, textb, fileb; isc_buffer_t keyb, textb, fileb, classb;
isc_region_t r; isc_region_t r;
char filename[ISC_DIR_NAMEMAX]; char filename[ISC_DIR_NAMEMAX];
unsigned char key_array[DST_KEY_MAXSIZE]; unsigned char key_array[DST_KEY_MAXSIZE];
char text_array[DST_KEY_MAXSIZE]; char text_array[DST_KEY_MAXSIZE];
char class_array[10];
isc_result_t ret; isc_result_t ret;
isc_result_t dnsret;
dns_rdata_t rdata; dns_rdata_t rdata;
REQUIRE(VALID_KEY(key)); REQUIRE(VALID_KEY(key));
isc_buffer_init(&keyb, key_array, sizeof(key_array)); isc_buffer_init(&keyb, key_array, sizeof(key_array));
isc_buffer_init(&textb, text_array, sizeof(text_array)); isc_buffer_init(&textb, text_array, sizeof(text_array));
isc_buffer_init(&classb, class_array, sizeof(class_array));
ret = dst_key_todns(key, &keyb); ret = dst_key_todns(key, &keyb);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
return (ret); return (ret);
isc_buffer_usedregion(&keyb, &r); isc_buffer_usedregion(&keyb, &r);
dns_rdata_fromregion(&rdata, dns_rdataclass_in, dns_rdatatype_key, &r); dns_rdata_fromregion(&rdata, key->key_class, dns_rdatatype_key, &r);
dnsret = dns_rdata_totext(&rdata, (dns_name_t *) NULL, &textb); ret = dns_rdata_totext(&rdata, (dns_name_t *) NULL, &textb);
if (dnsret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
return (DST_R_INVALIDPUBLICKEY); return (DST_R_INVALIDPUBLICKEY);
isc_buffer_usedregion(&textb, &r); ret = dns_rdataclass_totext(key->key_class, &classb);
if (ret != ISC_R_SUCCESS)
return (DST_R_INVALIDPUBLICKEY);
/* /*
* Make the filename. * Make the filename.
@@ -982,8 +1004,16 @@ write_public_key(const dst_key_t *key, const char *directory) {
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
return (ret); return (ret);
fprintf(fp, " IN KEY "); fprintf(fp, " ");
isc_buffer_usedregion(&classb, &r);
fwrite(r.base, 1, r.length, fp); fwrite(r.base, 1, r.length, fp);
fprintf(fp, " KEY ");
isc_buffer_usedregion(&textb, &r);
fwrite(r.base, 1, r.length, fp);
fputc('\n', fp); fputc('\n', fp);
fclose(fp); fclose(fp);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);

3
lib/dns/sec/dst/dst_internal.h
View File

@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dst_internal.h,v 1.28 2000/08/17 02:04:21 bwelling Exp $ */ /* $Id: dst_internal.h,v 1.29 2000/09/12 09:54:34 bwelling Exp $ */
#ifndef DST_DST_INTERNAL_H #ifndef DST_DST_INTERNAL_H
#define DST_DST_INTERNAL_H 1 #define DST_DST_INTERNAL_H 1
@@ -47,6 +47,7 @@ struct dst_key {
unsigned int key_alg; /* algorithm of the key */ unsigned int key_alg; /* algorithm of the key */
isc_uint32_t key_flags; /* flags of the public key */ isc_uint32_t key_flags; /* flags of the public key */
isc_uint16_t key_id; /* identifier of the key */ isc_uint16_t key_id; /* identifier of the key */
dns_rdataclass_t key_class; /* class of the key record */
isc_mem_t *mctx; /* memory context */ isc_mem_t *mctx; /* memory context */
void * opaque; /* pointer to key in crypto pkg fmt */ void * opaque; /* pointer to key in crypto pkg fmt */
dst_func_t * func; /* crypto package specific functions */ dst_func_t * func; /* crypto package specific functions */

11
lib/dns/sec/dst/include/dst/dst.h
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dst.h,v 1.37 2000/09/08 14:23:49 bwelling Exp $ */ /* $Id: dst.h,v 1.38 2000/09/12 09:54:36 bwelling Exp $ */
#ifndef DST_DST_H #ifndef DST_DST_H
#define DST_DST_H 1 #define DST_DST_H 1
@@ -261,8 +261,8 @@ dst_key_tofile(const dst_key_t *key, const int type, const char *directory);
*/ */
isc_result_t isc_result_t
dst_key_fromdns(dns_name_t *name, isc_buffer_t *source, isc_mem_t *mctx, dst_key_fromdns(dns_name_t *name, dns_rdataclass_t rdclass,
dst_key_t **keyp); isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp);
/* /*
* Converts a DNS KEY record into a DST key. * Converts a DNS KEY record into a DST key.
* *
@@ -301,6 +301,7 @@ dst_key_todns(const dst_key_t *key, isc_buffer_t *target);
isc_result_t isc_result_t
dst_key_frombuffer(dns_name_t *name, const unsigned int alg, dst_key_frombuffer(dns_name_t *name, const unsigned int alg,
const unsigned int flags, const unsigned int protocol, const unsigned int flags, const unsigned int protocol,
dns_rdataclass_t rdclass,
isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp); isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp);
/* /*
* Converts a buffer containing DNS KEY RDATA into a DST key. * Converts a buffer containing DNS KEY RDATA into a DST key.
@@ -363,6 +364,7 @@ isc_result_t
dst_key_generate(dns_name_t *name, const unsigned int alg, dst_key_generate(dns_name_t *name, const unsigned int alg,
const unsigned int bits, const unsigned int param, const unsigned int bits, const unsigned int param,
const unsigned int flags, const unsigned int protocol, const unsigned int flags, const unsigned int protocol,
const dns_rdataclass_t rdclass,
isc_mem_t *mctx, dst_key_t **keyp); isc_mem_t *mctx, dst_key_t **keyp);
/* /*
* Generate a DST key (or keypair) with the supplied parameters. The * Generate a DST key (or keypair) with the supplied parameters. The
@@ -455,6 +457,9 @@ dst_key_flags(const dst_key_t *key);
isc_uint16_t isc_uint16_t
dst_key_id(const dst_key_t *key); dst_key_id(const dst_key_t *key);
dns_rdataclass_t
dst_key_class(const dst_key_t *key);
isc_boolean_t isc_boolean_t
dst_key_isprivate(const dst_key_t *key); dst_key_isprivate(const dst_key_t *key);