mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Minor tsig cleanup.

Browse Source
This commit is contained in:
Brian Wellington 2000-08-14 18:13:11 +00:00
parent 4fc4813eb3
commit f2338a0d6a
4 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/dns/include/dns/tsig.h
View File

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: tsig.h,v 1.31 2000/08/01 01:24:50 tale Exp $ */ /* $Id: tsig.h,v 1.32 2000/08/14 18:13:11 bwelling Exp $ */
#ifndef DNS_TSIG_H #ifndef DNS_TSIG_H
#define DNS_TSIG_H 1 #define DNS_TSIG_H 1
@ -30,9 +30,8 @@
#include <dst/dst.h> #include <dst/dst.h>
/* /*
* Standard algorithm. * Algorithms.
*/ */
#define DNS_TSIG_HMACMD5 "HMAC-MD5.SIG-ALG.REG.INT."
extern dns_name_t *dns_tsig_hmacmd5_name; extern dns_name_t *dns_tsig_hmacmd5_name;
#define DNS_TSIG_HMACMD5_NAME dns_tsig_hmacmd5_name #define DNS_TSIG_HMACMD5_NAME dns_tsig_hmacmd5_name
@ -53,7 +52,7 @@ struct dns_tsigkey {
isc_mem_t *mctx; isc_mem_t *mctx;
dst_key_t *key; /* Key */ dst_key_t *key; /* Key */
dns_name_t name; /* Key name */ dns_name_t name; /* Key name */
dns_name_t algorithm; /* Algorithm name */ dns_name_t *algorithm; /* Algorithm name */
dns_name_t *creator; /* name that created secret */ dns_name_t *creator; /* name that created secret */
isc_boolean_t generated; /* was this generated? */ isc_boolean_t generated; /* was this generated? */
isc_stdtime_t inception; /* start of validity period */ isc_stdtime_t inception; /* start of validity period */

4
lib/dns/message.c
View File

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: message.c,v 1.139 2000/08/07 20:37:34 gson Exp $ */ /* $Id: message.c,v 1.140 2000/08/14 18:13:10 bwelling Exp $ */
/*** /***
*** Imports *** Imports
@ -600,7 +600,7 @@ spacefortsig(dns_tsigkey_t *key, int otherlen) {
*/ */
dns_name_toregion(&key->name, &r1); dns_name_toregion(&key->name, &r1);
dns_name_toregion(&key->algorithm, &r2); dns_name_toregion(key->algorithm, &r2);
if (key->key == NULL) if (key->key == NULL)
x = 0; x = 0;
else { else {

4
lib/dns/tkey.c
View File

@ -16,7 +16,7 @@
*/ */
/* /*
* $Id: tkey.c,v 1.49 2000/08/01 01:22:58 tale Exp $ * $Id: tkey.c,v 1.50 2000/08/14 18:13:08 bwelling Exp $
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
*/ */
@ -839,7 +839,7 @@ dns_tkey_builddeletequery(dns_message_t *msg, dns_tsigkey_t *key) {
ISC_LINK_INIT(&tkey.common, link); ISC_LINK_INIT(&tkey.common, link);
tkey.mctx = msg->mctx; tkey.mctx = msg->mctx;
dns_name_init(&tkey.algorithm, NULL); dns_name_init(&tkey.algorithm, NULL);
dns_name_clone(&key->algorithm, &tkey.algorithm); dns_name_clone(key->algorithm, &tkey.algorithm);
tkey.inception = tkey.expire = 0; tkey.inception = tkey.expire = 0;
tkey.mode = DNS_TKEYMODE_DELETE; tkey.mode = DNS_TKEYMODE_DELETE;
tkey.error = 0; tkey.error = 0;

67
lib/dns/tsig.c
View File

@ -16,7 +16,7 @@
*/ */
/* /*
* $Id: tsig.c,v 1.82 2000/08/01 01:23:00 tale Exp $ * $Id: tsig.c,v 1.83 2000/08/14 18:13:07 bwelling Exp $
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
*/ */
@ -47,6 +47,8 @@
#define is_response(msg) (msg->flags & DNS_MESSAGEFLAG_QR) #define is_response(msg) (msg->flags & DNS_MESSAGEFLAG_QR)
#define algname_is_allocated(algname) ((algname) != dns_tsig_hmacmd5_name)
static isc_once_t once = ISC_ONCE_INIT; static isc_once_t once = ISC_ONCE_INIT;
static dns_name_t hmacmd5_name; static dns_name_t hmacmd5_name;
dns_name_t *dns_tsig_hmacmd5_name = &hmacmd5_name; dns_name_t *dns_tsig_hmacmd5_name = &hmacmd5_name;
@ -74,7 +76,6 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
dns_tsig_keyring_t *ring, dns_tsigkey_t **key) dns_tsig_keyring_t *ring, dns_tsigkey_t **key)
{ {
isc_buffer_t b; isc_buffer_t b;
isc_uint16_t alg;
dns_tsigkey_t *tkey; dns_tsigkey_t *tkey;
isc_result_t ret; isc_result_t ret;
@ -87,14 +88,6 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
REQUIRE(mctx != NULL); REQUIRE(mctx != NULL);
RUNTIME_CHECK(isc_once_do(&once, dns_tsig_inithmac) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_once_do(&once, dns_tsig_inithmac) == ISC_R_SUCCESS);
if (!dns_name_equal(algorithm, DNS_TSIG_HMACMD5_NAME)) {
if (length != 0)
return (ISC_R_NOTIMPLEMENTED);
else
alg = 0;
}
else
alg = DST_ALG_HMACMD5;
tkey = (dns_tsigkey_t *) isc_mem_get(mctx, sizeof(dns_tsigkey_t)); tkey = (dns_tsigkey_t *) isc_mem_get(mctx, sizeof(dns_tsigkey_t));
if (tkey == NULL) if (tkey == NULL)
@ -106,11 +99,24 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
goto cleanup_key; goto cleanup_key;
dns_name_downcase(&tkey->name, &tkey->name, NULL); dns_name_downcase(&tkey->name, &tkey->name, NULL);
dns_name_init(&tkey->algorithm, NULL); if (dns_name_equal(algorithm, DNS_TSIG_HMACMD5_NAME))
ret = dns_name_dup(algorithm, mctx, &tkey->algorithm); tkey->algorithm = DNS_TSIG_HMACMD5_NAME;
if (ret != ISC_R_SUCCESS) else {
goto cleanup_name; if (length != 0) {
dns_name_downcase(&tkey->algorithm, &tkey->algorithm, NULL); ret = ISC_R_NOTIMPLEMENTED;
goto cleanup_name;
}
tkey->algorithm = isc_mem_get(mctx, sizeof(dns_name_t));
if (tkey->algorithm == NULL) {
ret = ISC_R_NOMEMORY;
goto cleanup_name;
}
dns_name_init(tkey->algorithm, NULL);
ret = dns_name_dup(algorithm, mctx, tkey->algorithm);
if (ret != ISC_R_SUCCESS)
goto cleanup_algorithm;
dns_name_downcase(tkey->algorithm, tkey->algorithm, NULL);
}
if (creator != NULL) { if (creator != NULL) {
tkey->creator = isc_mem_get(mctx, sizeof(dns_name_t)); tkey->creator = isc_mem_get(mctx, sizeof(dns_name_t));
@ -133,9 +139,15 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
tkey->refs = 0; tkey->refs = 0;
if (length > 0) { if (length > 0) {
int dstalg;
if (tkey->algorithm == dns_tsig_hmacmd5_name)
dstalg = DST_ALG_HMACMD5;
else
INSIST(0);
isc_buffer_init(&b, secret, length); isc_buffer_init(&b, secret, length);
isc_buffer_add(&b, length); isc_buffer_add(&b, length);
ret = dst_key_frombuffer(name, alg, ret = dst_key_frombuffer(name, dstalg,
DNS_KEYOWNER_ENTITY, DNS_KEYOWNER_ENTITY,
DNS_KEYPROTO_DNSSEC, DNS_KEYPROTO_DNSSEC,
&b, mctx, &tkey->key); &b, mctx, &tkey->key);
@ -175,11 +187,15 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
cleanup_algorithm: cleanup_algorithm:
dns_name_free(&tkey->algorithm, mctx); if (algname_is_allocated(tkey->algorithm)) {
cleanup_name: if (dns_name_dynamic(tkey->algorithm))
dns_name_free(tkey->algorithm, mctx);
isc_mem_put(mctx, tkey->algorithm, sizeof(dns_name_t));
}
cleanup_name:
dns_name_free(&tkey->name, mctx); dns_name_free(&tkey->name, mctx);
cleanup_key: cleanup_key:
isc_mem_put(mctx, tkey, sizeof(dns_tsigkey_t)); isc_mem_put(mctx, tkey, sizeof(dns_tsigkey_t));
return (ret); return (ret);
@ -202,7 +218,10 @@ tsigkey_free(dns_tsigkey_t *key) {
key->magic = 0; key->magic = 0;
dns_name_free(&key->name, key->mctx); dns_name_free(&key->name, key->mctx);
dns_name_free(&key->algorithm, key->mctx); if (algname_is_allocated(key->algorithm)) {
dns_name_free(key->algorithm, key->mctx);
isc_mem_put(key->mctx, key->algorithm, sizeof(dns_name_t));
}
if (key->key != NULL) if (key->key != NULL)
dst_key_free(&key->key); dst_key_free(&key->key);
if (key->creator != NULL) { if (key->creator != NULL) {
@ -277,7 +296,7 @@ dns_tsig_sign(dns_message_t *msg) {
tsig.common.rdtype = dns_rdatatype_tsig; tsig.common.rdtype = dns_rdatatype_tsig;
ISC_LINK_INIT(&tsig.common, link); ISC_LINK_INIT(&tsig.common, link);
dns_name_init(&tsig.algorithm, NULL); dns_name_init(&tsig.algorithm, NULL);
dns_name_clone(&key->algorithm, &tsig.algorithm); dns_name_clone(key->algorithm, &tsig.algorithm);
isc_stdtime_get(&now); isc_stdtime_get(&now);
tsig.timesigned = now; tsig.timesigned = now;
@ -739,7 +758,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
/* /*
* Digest the key algorithm. * Digest the key algorithm.
*/ */
dns_name_toregion(&tsigkey->algorithm, &r); dns_name_toregion(tsigkey->algorithm, &r);
ret = dst_context_adddata(ctx, &r); ret = dst_context_adddata(ctx, &r);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
goto cleanup_context; goto cleanup_context;
@ -1025,7 +1044,7 @@ dns_tsigkey_find(dns_tsigkey_t **tsigkey, dns_name_t *name,
RWUNLOCK(&ring->lock, isc_rwlocktype_read); RWUNLOCK(&ring->lock, isc_rwlocktype_read);
return (ISC_R_NOTFOUND); return (ISC_R_NOTFOUND);
} }
if (algorithm != NULL && !dns_name_equal(&key->algorithm, algorithm)) { if (algorithm != NULL && !dns_name_equal(key->algorithm, algorithm)) {
RWUNLOCK(&ring->lock, isc_rwlocktype_read); RWUNLOCK(&ring->lock, isc_rwlocktype_read);
return (ISC_R_NOTFOUND); return (ISC_R_NOTFOUND);
} }