- Fix dnscrypt chacha cert support ifdefs.

- Fix dnscrypt chacha cert unit test escapes in grep.
- Remove asynclook tests that cause test and purifier problems.

git-svn-id: file:///svn/unbound/trunk@4233 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/dnscrypt/dnscrypt.c b/dnscrypt/dnscrypt.c
index c437064212bc7d8967d072ba562ca5aaa7f6b14b..9e858c3fb0613d159cb88a6fb920a6d9cb4b8b7a 100644 (file)
--- a/dnscrypt/dnscrypt.c
+++ b/dnscrypt/dnscrypt.c
@@ -64,7 +64,7 @@ dnscrypt_server_uncurve(const dnsccert *cert,
     query_header = (struct dnscrypt_query_header *)buf;
     memcpy(nmkey, query_header->publickey, crypto_box_PUBLICKEYBYTES);
     if(cert->es_version[1] == 2) {
-#ifdef HAVE_XCHACHA20
+#ifdef USE_DNSCRYPT_XCHACHA20
         if (crypto_box_curve25519xchacha20poly1305_beforenm(
                 nmkey, nmkey, cert->keypair->crypt_secretkey) != 0) {
             return -1;
@@ -82,7 +82,7 @@ dnscrypt_server_uncurve(const dnsccert *cert,
     memset(nonce + crypto_box_HALF_NONCEBYTES, 0, crypto_box_HALF_NONCEBYTES);
 
     if(cert->es_version[1] == 2) {
-#ifdef HAVE_XCHACHA20
+#ifdef USE_DNSCRYPT_XCHACHA20
         if (crypto_box_curve25519xchacha20poly1305_open_easy_afternm
                 (buf,
                 buf + DNSCRYPT_QUERY_BOX_OFFSET,
@@ -253,7 +253,7 @@ dnscrypt_server_curve(const dnsccert *cert,
     add_server_nonce(nonce);
 
     if(cert->es_version[1] == 2) {
-#ifdef HAVE_XCHACHA20
+#ifdef USE_DNSCRYPT_XCHACHA20
         if (crypto_box_curve25519xchacha20poly1305_easy_afternm
             (boxed, boxed + crypto_box_MACBYTES, len, nonce, nmkey) != 0) {
             return -1;
@@ -546,7 +546,7 @@ dnsc_parse_keys(struct dnsc_env *env, struct config_file *cfg)
                                        head->str, fingerprint);
                                verbose(VERB_OPS, "Using %s",
                                        key_get_es_version(current_cert->es_version));
-#ifndef HAVE_XCHACHA20
+#ifndef USE_DNSCRYPT_XCHACHA20
                                if (current_cert->es_version[1] == 0x02) {
                                    fatal_exit("Certificate for XChacha20 but libsodium does not support it.");
                                }

diff --git a/doc/Changelog b/doc/Changelog
index 97c4f41cf99365d1702d38cfc29dbcbfee1ee124..1cab2e0c93c740d4594ffcdaf824a4f106c72ec6 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,9 @@
        - Free callback in edns-subnetmod on exit and restart.
        - Fix memory leak in sldns_buffer_new_frm_data.
        - Fix memory leak in dnscrypt config read.
+       - Fix dnscrypt chacha cert support ifdefs.
+       - Fix dnscrypt chacha cert unit test escapes in grep.
+       - Remove asynclook tests that cause test and purifier problems.
 
 15 June 2017: Wouter
        - Fix stub zone queries leaking to the internet for

diff --git a/testdata/05-asynclook.tpkg b/testdata/05-asynclook.tpkg
index 8143b43f4425bcf9428b90db1ae772f304e190f3..e13476ab297cb25732762072a9bbb01648feed14 100644 (file)
Binary files a/testdata/05-asynclook.tpkg and b/testdata/05-asynclook.tpkg differ

diff --git a/testdata/08-host-lib.tpkg b/testdata/08-host-lib.tpkg
index 3c7be0e6c17d26227d8cec6e3319c466d690891f..818ed5bca19acfe975dee5c6015316cd8890da1a 100644 (file)
Binary files a/testdata/08-host-lib.tpkg and b/testdata/08-host-lib.tpkg differ

diff --git a/testdata/dnscrypt_cert_chacha.tpkg b/testdata/dnscrypt_cert_chacha.tpkg
index 1aefd0a1b25d2f643b064ea4489667a52df4ffbc..4df461f03eac4bad45150065d8bc957dc9c6ae47 100644 (file)
Binary files a/testdata/dnscrypt_cert_chacha.tpkg and b/testdata/dnscrypt_cert_chacha.tpkg differ