diff --git a/bin/tests/optional/Makefile.in b/bin/tests/optional/Makefile.in index 856899f81a..0aab65749c 100644 --- a/bin/tests/optional/Makefile.in +++ b/bin/tests/optional/Makefile.in @@ -47,7 +47,6 @@ XTARGETS = adb_test@EXEEXT@ \ backtrace_test_nosymtbl@EXEEXT@ \ byname_test@EXEEXT@ \ db_test@EXEEXT@ \ - dst_test@EXEEXT@ \ gsstest@EXEEXT@ \ fsaccess_test@EXEEXT@ \ inter_test@EXEEXT@ \ @@ -76,7 +75,6 @@ XSRCS = adb_test.c \ backtrace_test.c \ byname_test.c \ db_test.c \ - dst_test.c \ fsaccess_test.c \ gsstest.c \ inter_test.c \ @@ -237,10 +235,6 @@ sig0_test@EXEEXT@: sig0_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sig0_test.@O@ \ ${DNSLIBS} ${ISCLIBS} ${LIBS} -dst_test@EXEEXT@: dst_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \ - -o $@ dst_test.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS} - gsstest@EXEEXT@: gsstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \ -o $@ gsstest.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS} diff --git a/bin/tests/optional/dst_test.c b/bin/tests/optional/dst_test.c deleted file mode 100644 index ed6aa532cd..0000000000 --- a/bin/tests/optional/dst_test.c +++ /dev/null @@ -1,280 +0,0 @@ -/* - * 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 - -#include -#include -#include - -#include -#include -#include -#include -#include /* Required for HP/UX (and others?) */ - -#include -#include -#include -#include - -#include -#include - -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, 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, 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; - bool 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 = (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_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(); - - dst_lib_init(mctx, NULL); - - 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, 54622, DST_ALG_RSAMD5, 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_HMACMD5, mctx); - - dst_lib_destroy(); - - isc_mem_put(mctx, current, 256); -/* isc_mem_stats(mctx, stdout);*/ - isc_mem_destroy(&mctx); - - return (0); -} diff --git a/util/copyrights b/util/copyrights index 353184561c..8df25d6675 100644 --- a/util/copyrights +++ b/util/copyrights @@ -311,7 +311,6 @@ ./bin/tests/optional/byaddr_test.c C 2000,2001,2002,2004,2005,2007,2012,2015,2016,2018 ./bin/tests/optional/byname_test.c C 2000,2001,2004,2005,2007,2009,2012,2015,2016,2017,2018 ./bin/tests/optional/db_test.c C 1999,2000,2001,2004,2005,2007,2008,2009,2011,2012,2013,2015,2016,2017,2018 -./bin/tests/optional/dst_test.c C 2018 ./bin/tests/optional/fsaccess_test.c C 2000,2001,2004,2005,2007,2012,2015,2016,2018 ./bin/tests/optional/gsstest.c C 2018 ./bin/tests/optional/inter_test.c C 2000,2001,2003,2004,2005,2007,2008,2015,2016,2018