mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-22 10:10:06 +00:00
Replace dns_fixedname_init() calls followed by dns_fixedname_name() calls with calls to dns_fixedname_initname() where it is possible without affecting current behavior and/or performance. This patch was mostly prepared using Coccinelle and the following semantic patch: @@ expression fixedname, name; @@ - dns_fixedname_init(&fixedname); ... - name = dns_fixedname_name(&fixedname); + name = dns_fixedname_initname(&fixedname); The resulting set of changes was then manually reviewed to exclude false positives and apply minor tweaks. It is likely that more occurrences of this pattern can be refactored in an identical way. This commit only takes care of the low-hanging fruit.
294 lines
7.8 KiB
C
294 lines
7.8 KiB
C
/*
|
|
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* See the COPYRIGHT file distributed with this work for additional
|
|
* information regarding copyright ownership.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h> /* XXX */
|
|
|
|
#include <isc/buffer.h>
|
|
#include <isc/entropy.h>
|
|
#include <isc/mem.h>
|
|
#include <isc/print.h>
|
|
#include <isc/region.h>
|
|
#include <isc/string.h> /* Required for HP/UX (and others?) */
|
|
|
|
#include <dns/fixedname.h>
|
|
#include <dns/log.h>
|
|
#include <dns/name.h>
|
|
#include <dns/result.h>
|
|
|
|
#include <dst/dst.h>
|
|
#include <dst/result.h>
|
|
|
|
char *current;
|
|
const char *tmp = "/tmp";
|
|
|
|
static void
|
|
use(dst_key_t *key, isc_mem_t *mctx) {
|
|
isc_result_t ret;
|
|
const char *data = "This is some data";
|
|
unsigned char sig[512];
|
|
isc_buffer_t databuf, sigbuf;
|
|
isc_region_t datareg, sigreg;
|
|
dst_context_t *ctx = NULL;
|
|
|
|
isc_buffer_init(&sigbuf, sig, sizeof(sig));
|
|
/*
|
|
* Advance 1 byte for fun.
|
|
*/
|
|
isc_buffer_add(&sigbuf, 1);
|
|
|
|
isc_buffer_constinit(&databuf, data, strlen(data));
|
|
isc_buffer_add(&databuf, strlen(data));
|
|
isc_buffer_usedregion(&databuf, &datareg);
|
|
|
|
ret = dst_context_create(key, mctx,
|
|
DNS_LOGCATEGORY_GENERAL, ISC_TRUE, 0, &ctx);
|
|
if (ret != ISC_R_SUCCESS) {
|
|
printf("contextcreate(%u) returned: %s\n", dst_key_alg(key),
|
|
isc_result_totext(ret));
|
|
return;
|
|
}
|
|
ret = dst_context_adddata(ctx, &datareg);
|
|
if (ret != ISC_R_SUCCESS) {
|
|
printf("adddata(%u) returned: %s\n", dst_key_alg(key),
|
|
isc_result_totext(ret));
|
|
dst_context_destroy(&ctx);
|
|
return;
|
|
}
|
|
ret = dst_context_sign(ctx, &sigbuf);
|
|
printf("sign(%u) returned: %s\n", dst_key_alg(key),
|
|
isc_result_totext(ret));
|
|
dst_context_destroy(&ctx);
|
|
|
|
isc_buffer_forward(&sigbuf, 1);
|
|
isc_buffer_remainingregion(&sigbuf, &sigreg);
|
|
ret = dst_context_create(key, mctx,
|
|
DNS_LOGCATEGORY_GENERAL, ISC_FALSE, 0, &ctx);
|
|
if (ret != ISC_R_SUCCESS) {
|
|
printf("contextcreate(%u) returned: %s\n", dst_key_alg(key),
|
|
isc_result_totext(ret));
|
|
return;
|
|
}
|
|
ret = dst_context_adddata(ctx, &datareg);
|
|
if (ret != ISC_R_SUCCESS) {
|
|
printf("adddata(%u) returned: %s\n", dst_key_alg(key),
|
|
isc_result_totext(ret));
|
|
dst_context_destroy(&ctx);
|
|
return;
|
|
}
|
|
ret = dst_context_verify(ctx, &sigreg);
|
|
printf("verify(%u) returned: %s\n", dst_key_alg(key),
|
|
isc_result_totext(ret));
|
|
dst_context_destroy(&ctx);
|
|
}
|
|
|
|
static void
|
|
dns(dst_key_t *key, isc_mem_t *mctx) {
|
|
unsigned char buffer1[2048];
|
|
unsigned char buffer2[2048];
|
|
isc_buffer_t buf1, buf2;
|
|
isc_region_t r1, r2;
|
|
dst_key_t *newkey = NULL;
|
|
isc_result_t ret;
|
|
isc_boolean_t match;
|
|
|
|
isc_buffer_init(&buf1, buffer1, sizeof(buffer1));
|
|
ret = dst_key_todns(key, &buf1);
|
|
printf("todns(%u) returned: %s\n", dst_key_alg(key),
|
|
isc_result_totext(ret));
|
|
if (ret != ISC_R_SUCCESS)
|
|
return;
|
|
ret = dst_key_fromdns(dst_key_name(key), dns_rdataclass_in,
|
|
&buf1, mctx, &newkey);
|
|
printf("fromdns(%u) returned: %s\n", dst_key_alg(key),
|
|
isc_result_totext(ret));
|
|
if (ret != ISC_R_SUCCESS)
|
|
return;
|
|
isc_buffer_init(&buf2, buffer2, sizeof(buffer2));
|
|
ret = dst_key_todns(newkey, &buf2);
|
|
printf("todns2(%u) returned: %s\n", dst_key_alg(key),
|
|
isc_result_totext(ret));
|
|
if (ret != ISC_R_SUCCESS)
|
|
return;
|
|
isc_buffer_usedregion(&buf1, &r1);
|
|
isc_buffer_usedregion(&buf2, &r2);
|
|
match = ISC_TF(r1.length == r2.length &&
|
|
memcmp(r1.base, r2.base, r1.length) == 0);
|
|
printf("compare(%u): %s\n", dst_key_alg(key),
|
|
match ? "true" : "false");
|
|
dst_key_free(&newkey);
|
|
}
|
|
|
|
static void
|
|
io(dns_name_t *name, int id, int alg, int type, isc_mem_t *mctx) {
|
|
dst_key_t *key = NULL;
|
|
isc_result_t ret;
|
|
|
|
ret = dst_key_fromfile(name, id, alg, type, current, mctx, &key);
|
|
printf("read(%d) returned: %s\n", alg, isc_result_totext(ret));
|
|
if (ret != 0)
|
|
return;
|
|
ret = dst_key_tofile(key, type, tmp);
|
|
printf("write(%d) returned: %s\n", alg, isc_result_totext(ret));
|
|
if (ret != 0)
|
|
return;
|
|
use(key, mctx);
|
|
dns(key, mctx);
|
|
dst_key_free(&key);
|
|
}
|
|
|
|
static void
|
|
dh(dns_name_t *name1, int id1, dns_name_t *name2, int id2, isc_mem_t *mctx) {
|
|
dst_key_t *key1 = NULL, *key2 = NULL;
|
|
isc_result_t ret;
|
|
isc_buffer_t b1, b2;
|
|
isc_region_t r1, r2;
|
|
unsigned char array1[1024], array2[1024];
|
|
int alg = DST_ALG_DH;
|
|
int type = DST_TYPE_PUBLIC|DST_TYPE_PRIVATE|DST_TYPE_KEY;
|
|
|
|
ret = dst_key_fromfile(name1, id1, alg, type, current, mctx, &key1);
|
|
printf("read(%d) returned: %s\n", alg, isc_result_totext(ret));
|
|
if (ret != 0)
|
|
return;
|
|
ret = dst_key_fromfile(name2, id2, alg, type, current, mctx, &key2);
|
|
printf("read(%d) returned: %s\n", alg, isc_result_totext(ret));
|
|
if (ret != 0)
|
|
return;
|
|
|
|
ret = dst_key_tofile(key1, type, tmp);
|
|
printf("write(%d) returned: %s\n", alg, isc_result_totext(ret));
|
|
if (ret != 0)
|
|
return;
|
|
ret = dst_key_tofile(key2, type, tmp);
|
|
printf("write(%d) returned: %s\n", alg, isc_result_totext(ret));
|
|
if (ret != 0)
|
|
return;
|
|
|
|
isc_buffer_init(&b1, array1, sizeof(array1));
|
|
ret = dst_key_computesecret(key1, key2, &b1);
|
|
printf("computesecret() returned: %s\n", isc_result_totext(ret));
|
|
if (ret != 0)
|
|
return;
|
|
|
|
isc_buffer_init(&b2, array2, sizeof(array2));
|
|
ret = dst_key_computesecret(key2, key1, &b2);
|
|
printf("computesecret() returned: %s\n", isc_result_totext(ret));
|
|
if (ret != 0)
|
|
return;
|
|
|
|
isc_buffer_usedregion(&b1, &r1);
|
|
isc_buffer_usedregion(&b2, &r2);
|
|
|
|
if (r1.length != r2.length || memcmp(r1.base, r2.base, r1.length) != 0)
|
|
{
|
|
int i;
|
|
printf("secrets don't match\n");
|
|
printf("secret 1: %u bytes\n", r1.length);
|
|
for (i = 0; i < (int) r1.length; i++)
|
|
printf("%02x ", r1.base[i]);
|
|
printf("\n");
|
|
printf("secret 2: %u bytes\n", r2.length);
|
|
for (i = 0; i < (int) r2.length; i++)
|
|
printf("%02x ", r2.base[i]);
|
|
printf("\n");
|
|
}
|
|
dst_key_free(&key1);
|
|
dst_key_free(&key2);
|
|
}
|
|
|
|
static void
|
|
generate(int alg, isc_mem_t *mctx) {
|
|
isc_result_t ret;
|
|
dst_key_t *key = NULL;
|
|
|
|
ret = dst_key_generate(dns_rootname, alg, 512, 0, 0, 0,
|
|
dns_rdataclass_in, mctx, &key, NULL);
|
|
printf("generate(%d) returned: %s\n", alg, isc_result_totext(ret));
|
|
if (ret != ISC_R_SUCCESS)
|
|
return;
|
|
|
|
if (alg != DST_ALG_DH)
|
|
use(key, mctx);
|
|
|
|
dst_key_free(&key);
|
|
}
|
|
|
|
int
|
|
main(void) {
|
|
isc_mem_t *mctx = NULL;
|
|
isc_entropy_t *ectx = NULL;
|
|
isc_buffer_t b;
|
|
dns_fixedname_t fname;
|
|
dns_name_t *name;
|
|
isc_result_t result;
|
|
|
|
result = isc_mem_create(0, 0, &mctx);
|
|
if (result != ISC_R_SUCCESS)
|
|
return (1);
|
|
|
|
current = isc_mem_get(mctx, 256);
|
|
if (current == NULL)
|
|
return (1);
|
|
if (getcwd(current, 256) == NULL) {
|
|
perror("getcwd");
|
|
return (1);
|
|
}
|
|
|
|
dns_result_register();
|
|
|
|
result = isc_entropy_create(mctx, &ectx);
|
|
if (result != ISC_R_SUCCESS)
|
|
return (1);
|
|
result = isc_entropy_createfilesource(ectx, "randomfile");
|
|
if (result != ISC_R_SUCCESS)
|
|
return (1);
|
|
dst_lib_init(mctx, ectx, NULL,
|
|
ISC_ENTROPY_BLOCKING|ISC_ENTROPY_GOODONLY);
|
|
|
|
name = dns_fixedname_initname(&fname);
|
|
isc_buffer_constinit(&b, "test.", 5);
|
|
isc_buffer_add(&b, 5);
|
|
result = dns_name_fromtext(name, &b, NULL, 0, NULL);
|
|
if (result != ISC_R_SUCCESS)
|
|
return (1);
|
|
io(name, 23616, DST_ALG_DSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC, mctx);
|
|
io(name, 54622, DST_ALG_RSAMD5, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC,
|
|
mctx);
|
|
|
|
io(name, 49667, DST_ALG_DSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC, mctx);
|
|
io(name, 2, DST_ALG_RSAMD5, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC, mctx);
|
|
|
|
isc_buffer_constinit(&b, "dh.", 3);
|
|
isc_buffer_add(&b, 3);
|
|
result = dns_name_fromtext(name, &b, NULL, 0, NULL);
|
|
if (result != ISC_R_SUCCESS)
|
|
return (1);
|
|
dh(name, 18602, name, 48957, mctx);
|
|
|
|
generate(DST_ALG_RSAMD5, mctx);
|
|
generate(DST_ALG_DH, mctx);
|
|
generate(DST_ALG_DSA, mctx);
|
|
generate(DST_ALG_HMACMD5, mctx);
|
|
|
|
dst_lib_destroy();
|
|
isc_entropy_detach(&ectx);
|
|
|
|
isc_mem_put(mctx, current, 256);
|
|
/* isc_mem_stats(mctx, stdout);*/
|
|
isc_mem_destroy(&mctx);
|
|
|
|
return (0);
|
|
}
|