]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
remove hashes test (duplicates lib/isc/tests/hash_test)
authorEvan Hunt <each@isc.org>
Tue, 27 Feb 2018 08:51:59 +0000 (00:51 -0800)
committerEvan Hunt <each@isc.org>
Sat, 10 Mar 2018 02:32:16 +0000 (18:32 -0800)
(cherry picked from commit 6ad1a042bcfaa4be4d51a310a69401c1b9204605)
(cherry picked from commit e686b9c2973d7820cd8588549e06a2b623098961)
(cherry picked from commit c644427b77c06ad3e63a145ce5cd80804bd5a1ca)

15 files changed:
bin/tests/.gitignore
bin/tests/Makefile.in
bin/tests/hashes/Makefile.in [deleted file]
bin/tests/hashes/t_hashes.c [deleted file]
bin/tests/hashes/win32/t_hashes.dsp.in [deleted file]
bin/tests/hashes/win32/t_hashes.dsw [deleted file]
bin/tests/hashes/win32/t_hashes.mak.in [deleted file]
bin/tests/hashes/win32/t_hashes.vcxproj.filters.in [deleted file]
bin/tests/hashes/win32/t_hashes.vcxproj.in [deleted file]
bin/tests/hashes/win32/t_hashes.vcxproj.user [deleted file]
configure
configure.in
util/copyrights
win32utils/Configure
win32utils/bind9.sln.in

index 7026d30f385c58ec29e7062565a0d4226d93bdb7..7a4582a9ba9ecebaa052b5f346fc99b7db459b08 100644 (file)
@@ -8,7 +8,6 @@ t_atomic
 t_db
 gsstest
 t_dst
-t_hashes
 t_mem
 t_names
 t_net
index e75c234f285a757f05dffd003fcbd56f39aeb04a..3678cd32f03ce4e8fa3be64f88b2cb48c343d555 100644 (file)
@@ -40,7 +40,7 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 
 LIBS =         @LIBS@
 
-SUBDIRS =      atomic db dst mem hashes names net rbt resolver \
+SUBDIRS =      atomic db dst mem names net rbt resolver \
                sockaddr tasks timers system @PKCS11_TOOLS@ optional
 
 # Test programs that are built by default:
diff --git a/bin/tests/hashes/Makefile.in b/bin/tests/hashes/Makefile.in
deleted file mode 100644 (file)
index a52745c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) 2010, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# $Id: Makefile.in,v 1.3 2010/09/29 23:47:05 tbox Exp $
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =    ${TEST_INCLUDES} ${ISC_INCLUDES} @DST_OPENSSL_INC@
-
-CDEFINES =     @CRYPTO@
-CWARNINGS =
-
-ISCLIBS =      ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
-
-ISCDEPLIBS =   ../../../lib/isc/libisc.@A@
-
-DEPLIBS =      ${ISCDEPLIBS}
-
-LIBS =         ${ISCLIBS} ${ISCLIBS} @LIBS@
-
-TLIB =         ../../../lib/tests/libt_api.@A@
-
-TARGETS =      t_hashes@EXEEXT@
-
-SRCS =         t_hashes.c
-
-@BIND9_MAKE_RULES@
-
-t_hashes@EXEEXT@: t_hashes.@O@ ${DEPLIBS} ${TLIB}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ t_hashes.@O@ ${TLIB} ${LIBS}
-
-test: t_hashes@EXEEXT@
-       -@./t_hashes@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -q 60 -a
-
-testhelp:
-       @./t_hashes@EXEEXT@ -h
-
-clean distclean::
-       rm -f ${TARGETS}
diff --git a/bin/tests/hashes/t_hashes.c b/bin/tests/hashes/t_hashes.c
deleted file mode 100644 (file)
index 5c4405a..0000000
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Copyright (C) 2010, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: t_hashes.c,v 1.5 2010/10/04 22:27:41 marka Exp $ */
-
-/*
- * -d1 or larger shows hash or HMAC result even if correct
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-
-#include <isc/hmacmd5.h>
-#include <isc/hmacsha.h>
-#include <isc/md5.h>
-#include <isc/print.h>
-#include <isc/sha1.h>
-#include <isc/string.h>
-#include <isc/util.h>
-
-#include <pk11/site.h>
-
-#include <tests/t_api.h>
-
-
-static int         nprobs;
-
-typedef void(*HASH_INIT)(void *);
-typedef void(*HMAC_INIT)(void *, const unsigned char *, unsigned int);
-typedef void(*UPDATE)(void *, const unsigned char *, unsigned int);
-typedef void(*FINAL)(void *, const unsigned char *);
-typedef void(*SIGN)(void *, const unsigned char *, unsigned int);
-
-typedef struct {
-    const char *name;
-    const unsigned char        *key;
-    const unsigned int key_len;
-    const unsigned char        *str;
-    const unsigned int str_len;
-} IN_;
-#define STR_INIT(s)    (const unsigned char *)(s), sizeof(s)-1
-
-
-union {
-    unsigned char b[1024];
-#ifndef PK11_MD5_DISABLE
-    unsigned char md5[16];
-#endif
-    unsigned char sha1[ISC_SHA1_DIGESTLENGTH];
-    unsigned char sha224[ISC_SHA224_DIGESTLENGTH];
-    unsigned char sha256[ISC_SHA256_DIGESTLENGTH];
-    unsigned char sha384[ISC_SHA384_DIGESTLENGTH];
-    unsigned char sha512[ISC_SHA512_DIGESTLENGTH];
-} dbuf;
-#define DIGEST_FILL 0xdf
-
-typedef struct {
-    const char         *str;
-    const unsigned int digest_len;
-} OUT_;
-
-
-/*
- * two ad hoc hash examples
- */
-static IN_ abc = { "\"abc\"", NULL, 0, STR_INIT("abc")};
-static OUT_ abc_sha1 = {
-       "a9993e364706816aba3e25717850c26c9cd0d89d",
-       ISC_SHA1_DIGESTLENGTH};
-static OUT_ abc_sha224 = {
-       "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7",
-       ISC_SHA224_DIGESTLENGTH};
-#ifndef PK11_MD5_DISABLE
-static OUT_ abc_md5 = {
-       "900150983cd24fb0d6963f7d28e17f72",
-       16};
-#endif
-
-static IN_ abc_blah = { "\"abcdbc...\"", NULL, 0,
-       STR_INIT("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq")};
-static OUT_ abc_blah_sha1 =  {
-       "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
-       ISC_SHA1_DIGESTLENGTH};
-static OUT_ abc_blah_sha224 = {
-       "75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525",
-       ISC_SHA224_DIGESTLENGTH};
-#ifndef PK11_MD5_DISABLE
-static OUT_ abc_blah_md5 = {
-       "8215ef0796a20bcaaae116d3876c664a",
-       16};
-
-/*
- * three HMAC-md5 examples from RFC 2104
- */
-static const unsigned char rfc2104_1_key[16] = {
-       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b};
-static IN_ rfc2104_1 = {"RFC 2104 #1", rfc2104_1_key, sizeof(rfc2104_1_key),
-       STR_INIT("Hi There")};
-static OUT_ rfc2104_1_hmac = {
-       "9294727a3638bb1c13f48ef8158bfc9d",
-       16};
-
-static IN_ rfc2104_2 = {"RFC 2104 #2", STR_INIT("Jefe"),
-       STR_INIT("what do ya want for nothing?")};
-static OUT_ rfc2104_2_hmac = {
-       "750c783e6ab0b503eaa86e310a5db738",
-       16};
-
-static const unsigned char rfc2104_3_key[16] = {
-       0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
-       0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA};
-static const unsigned char rfc2104_3_s[50] = {
-       0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
-       0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
-       0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
-       0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
-       0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
-       0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
-       0xDD, 0xDD};
-static IN_ rfc2104_3 = {"RFC 2104 #3", rfc2104_3_key, sizeof(rfc2104_3_key),
-       rfc2104_3_s, sizeof(rfc2104_3_s)};
-static OUT_ rfc2104_3_hmac = {
-       "56be34521d144c88dbb8c733f0e8b3f6",
-       16};
-#endif
-
-/*
- * four three HMAC-SHA tests cut-and-pasted from RFC 4634 starting on page 86
- */
-static const unsigned char rfc4634_1_key[20] = {
-      0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-      0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b
-};
-static IN_ rfc4634_1 = {"RFC 4634 #1", rfc4634_1_key, sizeof(rfc4634_1_key),
-       STR_INIT("Hi There")};
-static OUT_ rfc4634_1_sha1 = {
-       "B617318655057264E28BC0B6FB378C8EF146BE00",
-       ISC_SHA1_DIGESTLENGTH};
-static OUT_ rfc4634_1_sha224 = {
-       "896FB1128ABBDF196832107CD49DF33F47B4B1169912BA4F53684B22",
-       ISC_SHA224_DIGESTLENGTH};
-static OUT_ rfc4634_1_sha256 = {
-       "B0344C61D8DB38535CA8AFCEAF0BF12B881DC200C9833DA726E9376C2E32"
-       "CFF7",
-       ISC_SHA256_DIGESTLENGTH};
-static OUT_ rfc4634_1_sha384 = {
-       "AFD03944D84895626B0825F4AB46907F15F9DADBE4101EC682AA034C7CEB"
-       "C59CFAEA9EA9076EDE7F4AF152E8B2FA9CB6",
-       ISC_SHA384_DIGESTLENGTH};
-static OUT_ rfc4634_1_sha512 = {
-       "87AA7CDEA5EF619D4FF0B4241A1D6CB02379F4E2CE4EC2787AD0B30545E1"
-       "7CDEDAA833B7D6B8A702038B274EAEA3F4E4BE9D914EEB61F1702E696C20"
-       "3A126854",
-       ISC_SHA512_DIGESTLENGTH};
-
-static IN_ rfc4634_2 = {"RFC 4634 #2", STR_INIT("Jefe"),
-       STR_INIT("what do ya want for nothing?")};
-static OUT_ rfc4634_2_sha1 = {
-       "EFFCDF6AE5EB2FA2D27416D5F184DF9C259A7C79",
-       ISC_SHA1_DIGESTLENGTH};
-static OUT_ rfc4634_2_sha224 = {
-       "A30E01098BC6DBBF45690F3A7E9E6D0F8BBEA2A39E6148008FD05E44",
-       ISC_SHA224_DIGESTLENGTH};
-static OUT_ rfc4634_2_sha256 = {
-       "5BDCC146BF60754E6A042426089575C75A003F089D2739839DEC58B964EC"
-       "3843",
-       ISC_SHA256_DIGESTLENGTH};
-static OUT_ rfc4634_2_sha384 = {
-       "AF45D2E376484031617F78D2B58A6B1B9C7EF464F5A01B47E42EC3736322"
-       "445E8E2240CA5E69E2C78B3239ECFAB21649",
-       ISC_SHA384_DIGESTLENGTH};
-static OUT_ rfc4634_2_sha512 = {
-       "164B7A7BFCF819E2E395FBE73B56E0A387BD64222E831FD610270CD7EA25"
-       "05549758BF75C05A994A6D034F65F8F0E6FDCAEAB1A34D4A6B4B636E070A"
-       "38BCE737",
-       ISC_SHA512_DIGESTLENGTH};
-
-static const unsigned char rfc4634_3_key[20] = {
-       0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-       0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
-};
-static const unsigned char rfc4634_3_s[50] = {
-       0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-       0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-       0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-       0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-       0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd
-};
-static IN_ rfc4634_3 = {"RFC 4634 #3", rfc4634_3_key, sizeof(rfc4634_3_key),
-       rfc4634_3_s, sizeof(rfc4634_3_s)};
-static OUT_ rfc4634_3_sha1 = {
-       "125D7342B9AC11CD91A39AF48AA17B4F63F175D3",
-       ISC_SHA1_DIGESTLENGTH};
-static OUT_ rfc4634_3_sha224 = {
-       "7FB3CB3588C6C1F6FFA9694D7D6AD2649365B0C1F65D69D1EC8333EA",
-       ISC_SHA224_DIGESTLENGTH};
-static OUT_ rfc4634_3_sha256 = {
-       "773EA91E36800E46854DB8EBD09181A72959098B3EF8C122D9635514CED5"
-       "65FE",
-       ISC_SHA256_DIGESTLENGTH};
-static OUT_ rfc4634_3_sha384 = {
-       "88062608D3E6AD8A0AA2ACE014C8A86F0AA635D947AC9FEBE83EF4E55966"
-       "144B2A5AB39DC13814B94E3AB6E101A34F27",
-       ISC_SHA384_DIGESTLENGTH};
-static OUT_ rfc4634_3_sha512 = {
-       "FA73B0089D56A284EFB0F0756C890BE9B1B5DBDD8EE81A3655F83E33B227"
-       "9D39BF3E848279A722C806B485A47E67C807B946A337BEE8942674278859"
-       "E13292FB",
-       ISC_SHA512_DIGESTLENGTH};
-
-static const unsigned char rfc4634_4_key[25] = {
-       0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
-       0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14,
-       0x15, 0x16, 0x17, 0x18, 0x19
-};
-static const unsigned char rfc4634_4_s[50] = {
-       0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-       0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-       0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-       0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-       0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd
-};
-static IN_ rfc4634_4 = {"RFC 4634 #3", rfc4634_4_key, sizeof(rfc4634_4_key),
-       rfc4634_4_s, sizeof(rfc4634_4_s)};
-static OUT_ rfc4634_4_sha1 = {
-       "4C9007F4026250C6BC8414F9BF50C86C2D7235DA",
-       ISC_SHA1_DIGESTLENGTH};
-static OUT_ rfc4634_4_sha224 = {
-       "6C11506874013CAC6A2ABC1BB382627CEC6A90D86EFC012DE7AFEC5A",
-       ISC_SHA224_DIGESTLENGTH};
-static OUT_ rfc4634_4_sha256 = {
-       "82558A389A443C0EA4CC819899F2083A85F0FAA3E578F8077A2E3FF46729"
-       "665B",
-       ISC_SHA256_DIGESTLENGTH};
-static OUT_ rfc4634_4_sha384 = {
-       "3E8A69B7783C25851933AB6290AF6CA77A9981480850009CC5577C6E1F57"
-       "3B4E6801DD23C4A7D679CCF8A386C674CFFB",
-       ISC_SHA384_DIGESTLENGTH};
-static OUT_ rfc4634_4_sha512 = {
-       "B0BA465637458C6990E5A8C5F61D4AF7E576D97FF94B872DE76F8050361E"
-       "E3DBA91CA5C11AA25EB4D679275CC5788063A5F19741120C4F2DE2ADEBEB"
-       "10A298DD",
-       ISC_SHA512_DIGESTLENGTH};
-
-
-
-static const char *
-d2str(char *buf, unsigned int buf_len,
-      const unsigned char *d, unsigned int d_len)
-{
-       unsigned int i, l;
-
-       l = 0;
-       for (i = 0; i < d_len && l < buf_len-4; ++i) {
-               l += snprintf(&buf[l], buf_len-l, "%02x", d[i]);
-       }
-       if (l >= buf_len-3) {
-               REQUIRE(buf_len > sizeof("..."));
-               strcpy(&buf[l-sizeof(" ...")], " ...");
-       }
-       return buf;
-}
-
-
-
-/*
- * Compare binary digest or HMAC to string of hex digits from an RFC
- */
-static void
-ck(const char *name, const IN_ *in, const OUT_ *out)
-{
-       char buf[sizeof(dbuf)*2+1];
-       const char *str_name;
-       unsigned int l;
-
-       d2str(buf, sizeof(buf), dbuf.b, out->digest_len);
-       str_name = in->name != NULL ? in->name : (const char *)in->str;
-
-       if (T_debug != 0)
-               t_info("%s(%s) = %s\n", name, str_name, buf);
-
-       if (strcasecmp(buf, out->str)) {
-               t_info("%s(%s)\n%9s %s\n%9s %s\n",
-                      name, str_name,
-                      "is", buf,
-                      "should be", out->str);
-               ++nprobs;
-               return;
-       }
-
-       /*
-        * check that the hash or HMAC is no longer than we think it is
-        */
-       for (l = out->digest_len; l < sizeof(dbuf); ++l) {
-               if (dbuf.b[l] != DIGEST_FILL) {
-                       t_info("byte #%d after end of %s(%s) changed to %02x\n",
-                              l-out->digest_len, name, str_name, dbuf.b[l]);
-                       ++nprobs;
-                       break;
-               }
-       }
-}
-
-
-
-static void
-t_hash(const char *hname, HASH_INIT init, UPDATE update, FINAL final,
-      IN_ *in, OUT_ *out)
-{
-       union {
-           unsigned char b[1024];
-           isc_sha1_t sha1;
-#ifndef PK11_MD5_DISABLE
-           isc_md5_t md5;
-#endif
-       } ctx;
-
-       init(&ctx);
-       update(&ctx, in->str, in->str_len);
-       memset(dbuf.b, DIGEST_FILL, sizeof(dbuf));
-       final(&ctx, dbuf.b);
-       ck(hname, in, out);
-}
-
-
-
-/*
- * isc_sha224_final has a different calling sequence
- */
-static void
-t_sha224(IN_ *in, OUT_ *out)
-{
-       isc_sha224_t ctx;
-
-       memset(dbuf.b, DIGEST_FILL, sizeof(dbuf));
-       isc_sha224_init(&ctx);
-       isc_sha224_update(&ctx, in->str, in->str_len);
-       memset(dbuf.b, DIGEST_FILL, sizeof(dbuf));
-       isc_sha224_final(dbuf.b, &ctx);
-       ck("SHA224", in, out);
-}
-
-
-
-static void
-#ifndef PK11_MD5_DISABLE
-t_hashes(IN_ *in, OUT_ *out_sha1, OUT_ *out_sha224, OUT_ *out_md5)
-#else
-t_hashes(IN_ *in, OUT_ *out_sha1, OUT_ *out_sha224)
-#endif
-{
-       t_hash("SHA1", (HASH_INIT)isc_sha1_init, (UPDATE)isc_sha1_update,
-              (FINAL)isc_sha1_final, in, out_sha1);
-       t_sha224(in, out_sha224);
-#ifndef PK11_MD5_DISABLE
-       t_hash("md5", (HASH_INIT)isc_md5_init, (UPDATE)isc_md5_update,
-              (FINAL)isc_md5_final, in, out_md5);
-#endif
-}
-
-
-#ifndef PK11_MD5_DISABLE
-/*
- * isc_hmacmd5_sign has a different calling sequence
- */
-static void
-t_md5hmac(IN_ *in, OUT_ *out)
-{
-       isc_hmacmd5_t ctx;
-
-       isc_hmacmd5_init(&ctx, in->key, in->key_len);
-       isc_hmacmd5_update(&ctx, in->str, in->str_len);
-       memset(dbuf.b, DIGEST_FILL, sizeof(dbuf));
-       isc_hmacmd5_sign(&ctx, dbuf.b);
-       ck("HMAC-md5", in, out);
-}
-#endif
-
-
-static void
-t_hmac(const char *hname, HMAC_INIT init, UPDATE update, SIGN sign,
-      IN_ *in, OUT_ *out)
-{
-       union {
-           unsigned char b[1024];
-#ifndef PK11_MD5_DISABLE
-           isc_hmacmd5_t hmacmd5;
-#endif
-           isc_hmacsha1_t hmacsha1;
-           isc_hmacsha224_t hmacsha224;
-           isc_hmacsha256_t hmacsha256;
-           isc_hmacsha384_t hmacsha384;
-           isc_hmacsha512_t hmacsha512;
-       } ctx;
-
-       init(&ctx, in->key, in->key_len);
-       update(&ctx, in->str, in->str_len);
-       memset(dbuf.b, DIGEST_FILL, sizeof(dbuf));
-       sign(&ctx, dbuf.b, out->digest_len);
-       ck(hname, in, out);
-}
-
-
-
-static void
-t_hmacs(IN_ *in, OUT_ *out_sha1, OUT_ *out_sha224, OUT_ *out_sha256,
-       OUT_ *out_sha384, OUT_ *out_sha512)
-{
-       t_hmac("HMAC-SHA1", (HMAC_INIT)isc_hmacsha1_init,
-              (UPDATE)isc_hmacsha1_update, (SIGN)isc_hmacsha1_sign,
-              in, out_sha1);
-       t_hmac("HMAC-SHA224", (HMAC_INIT)isc_hmacsha224_init,
-              (UPDATE)isc_hmacsha224_update, (SIGN)isc_hmacsha224_sign,
-              in, out_sha224);
-       t_hmac("HMAC-SHA256", (HMAC_INIT)isc_hmacsha256_init,
-              (UPDATE)isc_hmacsha256_update, (SIGN)isc_hmacsha256_sign,
-              in, out_sha256);
-       t_hmac("HMAC-SHA384", (HMAC_INIT)isc_hmacsha384_init,
-              (UPDATE)isc_hmacsha384_update, (SIGN)isc_hmacsha384_sign,
-              in, out_sha384);
-       t_hmac("HMAC-SHA512", (HMAC_INIT)isc_hmacsha512_init,
-              (UPDATE)isc_hmacsha512_update, (SIGN)isc_hmacsha512_sign,
-              in, out_sha512);
-}
-
-
-
-/*
- * This will almost never fail, and so there is no need for the extra noise
- * that would come from breaking it into several tests.
- */
-static void
-t1(void)
-{
-       /*
-        * two ad hoc hash examples
-        */
-#ifndef PK11_MD5_DISABLE
-       t_hashes(&abc, &abc_sha1, &abc_sha224, &abc_md5);
-       t_hashes(&abc_blah, &abc_blah_sha1, &abc_blah_sha224, &abc_blah_md5);
-#else
-       t_hashes(&abc, &abc_sha1, &abc_sha224);
-       t_hashes(&abc_blah, &abc_blah_sha1, &abc_blah_sha224);
-#endif
-
-#ifndef PK11_MD5_DISABLE
-       /*
-        * three HMAC-md5 examples from RFC 2104
-        */
-       t_md5hmac(&rfc2104_1, &rfc2104_1_hmac);
-       t_md5hmac(&rfc2104_2, &rfc2104_2_hmac);
-       t_md5hmac(&rfc2104_3, &rfc2104_3_hmac);
-#endif
-
-       /*
-        * four HMAC-SHA tests from RFC 4634 starting on page 86
-        */
-       t_hmacs(&rfc4634_1, &rfc4634_1_sha1, &rfc4634_1_sha224,
-               &rfc4634_1_sha256, &rfc4634_1_sha384, &rfc4634_1_sha512);
-       t_hmacs(&rfc4634_2, &rfc4634_2_sha1, &rfc4634_2_sha224,
-               &rfc4634_2_sha256, &rfc4634_2_sha384, &rfc4634_2_sha512);
-       t_hmacs(&rfc4634_3, &rfc4634_3_sha1, &rfc4634_3_sha224,
-               &rfc4634_3_sha256, &rfc4634_3_sha384, &rfc4634_3_sha512);
-       t_hmacs(&rfc4634_4, &rfc4634_4_sha1, &rfc4634_4_sha224,
-               &rfc4634_4_sha256, &rfc4634_4_sha384, &rfc4634_4_sha512);
-
-       if (nprobs != 0)
-               t_result(T_FAIL);
-       else
-               t_result(T_PASS);
-}
-
-
-testspec_t     T_testlist[] = {
-       {       (PFV) t1,               "hashes"                },
-       {       (PFV) 0,                NULL                    }
-};
-
-#ifdef WIN32
-int
-main(int argc, char **argv) {
-       t_settests(T_testlist);
-       return (t_main(argc, argv));
-}
-#endif
diff --git a/bin/tests/hashes/win32/t_hashes.dsp.in b/bin/tests/hashes/win32/t_hashes.dsp.in
deleted file mode 100644 (file)
index f2b063f..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="t_hashes" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
-
-CFG=t_hashes - @PLATFORM@ Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "t_hashes.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "t_hashes.mak" CFG="t_hashes - @PLATFORM@ Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "t_hashes - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
-!MESSAGE "t_hashes - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
-# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_hashes.exe"
-
-!ELSEIF  "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
-# SUBTRACT CPP /X @COPTY@
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
-# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_hashes.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "t_hashes - @PLATFORM@ Release"
-# Name "t_hashes - @PLATFORM@ Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\t_hashes.c
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/bin/tests/hashes/win32/t_hashes.dsw b/bin/tests/hashes/win32/t_hashes.dsw
deleted file mode 100644 (file)
index 95347f1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "t_hashes"=".\t_hashes.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/bin/tests/hashes/win32/t_hashes.mak.in b/bin/tests/hashes/win32/t_hashes.mak.in
deleted file mode 100644 (file)
index 48007e9..0000000
+++ /dev/null
@@ -1,347 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on t_hashes.dsp
-!IF "$(CFG)" == ""
-CFG=t_hashes - @PLATFORM@ Debug
-!MESSAGE No configuration specified. Defaulting to t_hashes - @PLATFORM@ Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "t_hashes - @PLATFORM@ Release" && "$(CFG)" != "t_hashes - @PLATFORM@ Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "t_hashes.mak" CFG="t_hashes - @PLATFORM@ Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "t_hashes - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
-!MESSAGE "t_hashes - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-RSC=rc.exe
-LIBXML=@LIBXML2_LIB@
-
-!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
-_VC_MANIFEST_INC=0
-_VC_MANIFEST_BASENAME=__VC80
-!ELSE
-_VC_MANIFEST_INC=1
-_VC_MANIFEST_BASENAME=__VC80.Debug
-!ENDIF
-
-####################################################
-# Specifying name of temporary resource file used only in incremental builds:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
-!else
-_VC_MANIFEST_AUTO_RES=
-!endif
-
-####################################################
-# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-#MT_SPECIAL_RETURN=1090650113
-#MT_SPECIAL_SWITCH=-notify_resource_update
-MT_SPECIAL_RETURN=0
-MT_SPECIAL_SWITCH=
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
-if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
-rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
-link $** /out:$@ $(LFLAGS)
-
-!else
-
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
-
-!endif
-
-####################################################
-# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-#MT_SPECIAL_RETURN=1090650113
-#MT_SPECIAL_SWITCH=-notify_resource_update
-MT_SPECIAL_RETURN=0
-MT_SPECIAL_SWITCH=
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
-if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
-rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
-link $** /out:$@ $(LFLAGS)
-
-!else
-
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
-
-!endif
-####################################################
-# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
-    $(_VC_MANIFEST_BASENAME).auto.rc \
-    $(_VC_MANIFEST_BASENAME).auto.manifest
-
-!else
-
-_VC_MANIFEST_CLEAN=
-
-!endif
-
-!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "..\..\..\..\Build\Release\t_hashes.exe"
-
-!ELSE 
-
-ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_hashes.exe"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN"
-!ELSE 
-CLEAN :
-!ENDIF 
-       -@erase "$(INTDIR)\t_hashes.obj"
-       -@erase "$(INTDIR)\vc60.idb"
-       -@erase "..\..\..\..\Build\Release\t_hashes.exe"
-       -@$(_VC_MANIFEST_CLEAN)
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_hashes.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_hashes.bsc" 
-BSC32_SBRS= \
-       
-LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_hashes.pdb" @MACHINE@ /out:"../../../../Build/Release/t_hashes.exe" 
-LINK32_OBJS= \
-       "$(INTDIR)\t_hashes.obj" \
-       "..\..\..\..\lib\isc\win32\Release\libisc.lib" \
-       "..\..\..\..\lib\tests\win32\Release\libtests.lib"
-
-"..\..\..\..\Build\Release\t_hashes.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-    $(_VC_MANIFEST_EMBED_EXE)
-
-!ELSEIF  "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "..\..\..\..\Build\Debug\t_hashes.exe" "$(OUTDIR)\t_hashes.bsc"
-
-!ELSE 
-
-ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_hashes.exe" "$(OUTDIR)\t_hashes.bsc"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN"
-!ELSE 
-CLEAN :
-!ENDIF 
-       -@erase "$(INTDIR)\t_hashes.obj"
-       -@erase "$(INTDIR)\t_hashes.sbr"
-       -@erase "$(INTDIR)\vc60.idb"
-       -@erase "$(INTDIR)\vc60.pdb"
-       -@erase "$(OUTDIR)\t_hashes.bsc"
-       -@erase "$(OUTDIR)\t_hashes.map"
-       -@erase "$(OUTDIR)\t_hashes.pdb"
-       -@erase "..\..\..\..\Build\Debug\t_hashes.exe"
-       -@erase "..\..\..\..\Build\Debug\t_hashes.ilk"
-       -@$(_VC_MANIFEST_CLEAN)
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_hashes.bsc" 
-BSC32_SBRS= \
-       "$(INTDIR)\t_hashes.sbr"
-
-"$(OUTDIR)\t_hashes.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_hashes.pdb" /map:"$(INTDIR)\t_hashes.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_hashes.exe" /pdbtype:sept 
-LINK32_OBJS= \
-       "$(INTDIR)\t_hashes.obj" \
-       "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \
-       "..\..\..\..\lib\tests\win32\Debug\libtests.lib"
-
-"..\..\..\..\Build\Debug\t_hashes.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-    $(_VC_MANIFEST_EMBED_EXE)
-
-!ENDIF 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("t_hashes.dep")
-!INCLUDE "t_hashes.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "t_hashes.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "t_hashes - @PLATFORM@ Release" || "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
-SOURCE=..\t_hashes.c
-
-!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
-
-
-"$(INTDIR)\t_hashes.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
-
-
-"$(INTDIR)\t_hashes.obj"       "$(INTDIR)\t_hashes.sbr" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
-
-"libisc - @PLATFORM@ Release" : 
-   cd "..\..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
-   cd "..\..\..\bin\tests\hashes\win32"
-
-"libisc - @PLATFORM@ ReleaseCLEAN" : 
-   cd "..\..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
-   cd "..\..\..\bin\tests\hashes\win32"
-
-!ELSEIF  "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
-
-"libisc - @PLATFORM@ Debug" : 
-   cd "..\..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
-   cd "..\..\..\bin\tests\hashes\win32"
-
-"libisc - @PLATFORM@ DebugCLEAN" : 
-   cd "..\..\..\..\lib\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
-   cd "..\..\..\bin\tests\hashes\win32"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "t_hashes - @PLATFORM@ Release"
-
-"libtests - @PLATFORM@ Release" : 
-   cd "..\..\..\..\lib\tests\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" 
-   cd "..\..\..\bin\tests\hashes\win32"
-
-"libtests - @PLATFORM@ ReleaseCLEAN" : 
-   cd "..\..\..\..\lib\tests\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN 
-   cd "..\..\..\bin\tests\hashes\win32"
-
-!ELSEIF  "$(CFG)" == "t_hashes - @PLATFORM@ Debug"
-
-"libtests - @PLATFORM@ Debug" : 
-   cd "..\..\..\..\lib\tests\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" 
-   cd "..\..\..\bin\tests\hashes\win32"
-
-"libtests - @PLATFORM@ DebugCLEAN" : 
-   cd "..\..\..\..\lib\tests\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN 
-   cd "..\..\..\bin\tests\hashes\win32"
-
-!ENDIF 
-
-
-!ENDIF 
-
-####################################################
-# Commands to generate initial empty manifest file and the RC file
-# that references it, and for generating the .res file:
-
-$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
-
-$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
-    type <<$@
-#include <winuser.h>
-1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
-<< KEEP
-
-$(_VC_MANIFEST_BASENAME).auto.manifest :
-    type <<$@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-</assembly>
-<< KEEP
diff --git a/bin/tests/hashes/win32/t_hashes.vcxproj.filters.in b/bin/tests/hashes/win32/t_hashes.vcxproj.filters.in
deleted file mode 100644 (file)
index 0f4bd9c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_hashes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/bin/tests/hashes/win32/t_hashes.vcxproj.in b/bin/tests/hashes/win32/t_hashes.vcxproj.in
deleted file mode 100644 (file)
index 6af5cb5..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|@PLATFORM@">
-      <Configuration>Debug</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|@PLATFORM@">
-      <Configuration>Release</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{14071120-84F6-4A6F-BF23-90EC5D0372CE}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>t_hashes</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <StringPooling>true</StringPooling>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_hashes.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/bin/tests/hashes/win32/t_hashes.vcxproj.user b/bin/tests/hashes/win32/t_hashes.vcxproj.user
deleted file mode 100644 (file)
index 695b5c7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-</Project>
\ No newline at end of file
index 14af5c7c531ff8579b9c6e6743a819a72f920592..0e65f076ce11af8edccb341d9549684e6de5827d 100755 (executable)
--- a/configure
+++ b/configure
@@ -23000,7 +23000,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keyzone.py bin/python/isc/tests/dnskey_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzredir/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/cookie/prereq.sh bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keyzone.py bin/python/isc/tests/dnskey_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/headerdep_test.sh bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzredir/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/cookie/prereq.sh bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
 
 
 #
@@ -24043,7 +24043,6 @@ do
     "bin/tests/dst/t2_data_2") CONFIG_FILES="$CONFIG_FILES bin/tests/dst/t2_data_2" ;;
     "bin/tests/dst/t2_dsasig") CONFIG_FILES="$CONFIG_FILES bin/tests/dst/t2_dsasig" ;;
     "bin/tests/dst/t2_rsasig") CONFIG_FILES="$CONFIG_FILES bin/tests/dst/t2_rsasig" ;;
-    "bin/tests/hashes/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/hashes/Makefile" ;;
     "bin/tests/headerdep_test.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/headerdep_test.sh" ;;
     "bin/tests/mem/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/mem/Makefile" ;;
     "bin/tests/names/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/names/Makefile" ;;
index 2a262386627964a6e91c19e4091b8cce121d566e..fdb89cf425c1e258c5d9b48e67fa4924e36365de 100644 (file)
@@ -5169,7 +5169,6 @@ AC_CONFIG_FILES([
        bin/tests/dst/t2_data_2
        bin/tests/dst/t2_dsasig
        bin/tests/dst/t2_rsasig
-       bin/tests/hashes/Makefile
        bin/tests/headerdep_test.sh
        bin/tests/mem/Makefile
        bin/tests/names/Makefile
index 171ee72315b849a581fb4825a5abd7bf752e0e58..6e74478b6ee7ac3dbb194ac92d3c002e09ac27a0 100644 (file)
 ./bin/tests/gxba_test.c                                C       2000,2001,2004,2005,2007,2015
 ./bin/tests/gxbn_test.c                                C       2000,2001,2004,2005,2007,2015
 ./bin/tests/hash_test.c                                C       2000,2001,2004,2005,2006,2007,2014,2015,2016,2017
-./bin/tests/hashes/Makefile.in                 MAKE    2010,2012,2014,2016
-./bin/tests/hashes/t_hashes.c                  C       2010,2013,2016
-./bin/tests/hashes/win32/t_hashes.dsp.in       X       2013,2016
-./bin/tests/hashes/win32/t_hashes.dsw          X       2013
-./bin/tests/hashes/win32/t_hashes.mak.in       X       2013,2016
-./bin/tests/hashes/win32/t_hashes.vcxproj.filters.in   X       2013,2015
-./bin/tests/hashes/win32/t_hashes.vcxproj.in   X       2013,2015,2016,2017
-./bin/tests/hashes/win32/t_hashes.vcxproj.user X       2013
 ./bin/tests/headerdep_test.sh.in               SH      2000,2001,2004,2007,2012
 ./bin/tests/inter_test.c                       C       2000,2001,2003,2004,2005,2007,2008,2015,2018
 ./bin/tests/keyboard_test.c                    C       2000,2001,2004,2005,2007,2015
index 172e44e0f2fd5cb5571c0c3a67d1084c037a1f03..fa72f07893c584763537be11f294c2444be82223 100644 (file)
@@ -286,8 +286,6 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj",
                    "..\\bin\\tests\\dst\\win32\\t_dst.vcxproj.filters",
                    "..\\bin\\tests\\mem\\win32\\t_mem.vcxproj",
                    "..\\bin\\tests\\mem\\win32\\t_mem.vcxproj.filters",
-                   "..\\bin\\tests\\hashes\\win32\\t_hashes.vcxproj",
-                   "..\\bin\\tests\\hashes\\win32\\t_hashes.vcxproj.filters",
                    "..\\bin\\tests\\names\\win32\\t_names.vcxproj",
                    "..\\bin\\tests\\names\\win32\\t_names.vcxproj.filters",
                    "..\\bin\\tests\\rbt\\win32\\t_rbt.vcxproj",
index 0f31c792fcb34d55d72299168f19c6d712d120d3..944fbe7e77cfa59140c20bc53d5ccf0e5eec6da2 100644 (file)
@@ -528,12 +528,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_mem", "..\bin\tests\mem\w
                {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_hashes", "..\bin\tests\hashes\win32\t_hashes.vcxproj", "{14071120-84F6-4A6F-BF23-90EC5D0372CE}"
-       ProjectSection(ProjectDependencies) = postProject
-               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}
-               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}
-       EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_names", "..\bin\tests\names\win32\t_names.vcxproj", "{124DC0D3-3096-41D2-B490-CE85E890FF33}"
        ProjectSection(ProjectDependencies) = postProject
                {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1}