- new keys and certs for dnscrypt tests.

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

diff --git a/dnscrypt/testdata/gencert.sh b/dnscrypt/testdata/gencert.sh
new file mode 100755 (executable)
index 0000000..ae0b231
--- /dev/null
+++ b/dnscrypt/testdata/gencert.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+CERT_EXPIRE_DAYS="$(( 365 * 15 ))"
+DIR="$(dirname "$0")"
+
+
+if [[ "$PWD" != *tdir ]]
+then
+    echo "You should run this script with a .tdir directory"
+    exit 1
+fi
+
+for i in 1 2
+do
+    # Ephemeral key
+    rm -f "${i}.key"
+    dnscrypt-wrapper --gen-crypt-keypair \
+        --crypt-secretkey-file="${i}.key"  \
+        --provider-publickey-file="${DIR}/keys${i}/public.key" \
+        --provider-secretkey-file="${DIR}/keys${i}/secret.key"
+    # Cert file
+    for cipher in salsa chacha
+    do
+        rm -f "${i}_${cipher}.cert"
+        extraarg=""
+        if [ "${cipher}" == "chacha" ]
+        then
+             extraarg="-x"
+        fi
+
+        dnscrypt-wrapper ${extraarg} --gen-cert-file \
+            --provider-cert-file="${i}_${cipher}.cert" \
+            --crypt-secretkey-file="${i}.key" \
+            --provider-publickey-file="${DIR}/keys${i}/public.key" \
+            --provider-secretkey-file="${DIR}/keys${i}/secret.key" \
+            --cert-file-expire-days="${CERT_EXPIRE_DAYS}"
+    done
+done

diff --git a/dnscrypt/testdata/keys1/public.key b/dnscrypt/testdata/keys1/public.key
new file mode 100644 (file)
index 0000000..45e6aad
--- /dev/null
+++ b/dnscrypt/testdata/keys1/public.key
@@ -0,0 +1 @@
+¸_A¡O#÷ÛÈfó\97ÌoD¶_\9deŶ)|'T\ 3¦éÜòO\9d
\ No newline at end of file

diff --git a/dnscrypt/testdata/keys1/secret.key b/dnscrypt/testdata/keys1/secret.key
new file mode 100644 (file)
index 0000000..7672c97
--- /dev/null
+++ b/dnscrypt/testdata/keys1/secret.key
@@ -0,0 +1 @@
+-\11&ç\1d6\11\Uùõñh`\ 4^\ 2\1d\12\1f"\85\13ºz/C9\82\ró\88¸_A¡O#÷ÛÈfó\97ÌoD¶_\9deŶ)|'T\ 3¦éÜòO\9d
\ No newline at end of file

diff --git a/dnscrypt/testdata/keys2/public.key b/dnscrypt/testdata/keys2/public.key
new file mode 100644 (file)
index 0000000..036b04a
--- /dev/null
+++ b/dnscrypt/testdata/keys2/public.key
@@ -0,0 +1 @@
+ÃR\1f òÒýeµô{öl\1a\88ÁKË\80Î\1e:5r\±}K\12Óç\83
\ No newline at end of file

diff --git a/dnscrypt/testdata/keys2/secret.key b/dnscrypt/testdata/keys2/secret.key
new file mode 100644 (file)
index 0000000..6873029
--- /dev/null
+++ b/dnscrypt/testdata/keys2/secret.key
@@ -0,0 +1 @@
+\ 1çi\ 1%\82 5\vfÍ\99\96í\13\fÉû\8cí\fBnêͯ.º\1d\13\93\12ÃR\1f òÒýeµô{öl\1a\88ÁKË\80Î\1e:5r\±}K\12Óç\83
\ No newline at end of file

diff --git a/doc/Changelog b/doc/Changelog
index e6c8e1976b7990b5b61d97d480fb5847c2253a2e..bceebda65632f27be9fc86235757daa58f56dc6f 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - Fix #1414: fix segfault on parse failure and log_replies.
        - zero qinfo in handle_request, this zeroes local_alias and also the
          qname member.
+       - new keys and certs for dnscrypt tests.
 
 28 August 2017: Wouter
        - Fix #1415: patch to free dnscrypt environment on reload.

diff --git a/testdata/dnscrypt_cert.tdir/1.key b/testdata/dnscrypt_cert.tdir/1.key
index 7698961045e43d1143efe9607afaf273ebd11cc9..165262c86e53595308da836d0e8cb4d7b56b19a1 100644 (file)
Binary files a/testdata/dnscrypt_cert.tdir/1.key and b/testdata/dnscrypt_cert.tdir/1.key differ

diff --git a/testdata/dnscrypt_cert.tdir/1_chacha.cert b/testdata/dnscrypt_cert.tdir/1_chacha.cert
new file mode 100644 (file)
index 0000000..3da5c61
Binary files /dev/null and b/testdata/dnscrypt_cert.tdir/1_chacha.cert differ

diff --git a/testdata/dnscrypt_cert.tdir/1_salsa.cert b/testdata/dnscrypt_cert.tdir/1_salsa.cert
new file mode 100644 (file)
index 0000000..17e447f
Binary files /dev/null and b/testdata/dnscrypt_cert.tdir/1_salsa.cert differ

diff --git a/testdata/dnscrypt_cert.tdir/2.key b/testdata/dnscrypt_cert.tdir/2.key
index ae385c068cdefc109cd2baaa27437fd634e82c51..c299f550ae955af0637b0762b3393eaeb2bdee03 100644 (file)
--- a/testdata/dnscrypt_cert.tdir/2.key
+++ b/testdata/dnscrypt_cert.tdir/2.key
@@ -1,2 +1 @@
-°Ù`½\eéj0Èu¼\ 1x\82¶t[
-]Ù\13uRª³@\9d;f]Z<
\ No newline at end of file
+m7\12\9fñâÂ\ 3\83x;\91%׸õ\90é*\95ÜR¯\13äÓ¯¹mDªñ
\ No newline at end of file

diff --git a/testdata/dnscrypt_cert.tdir/2_chacha.cert b/testdata/dnscrypt_cert.tdir/2_chacha.cert
new file mode 100644 (file)
index 0000000..ed4ec26
Binary files /dev/null and b/testdata/dnscrypt_cert.tdir/2_chacha.cert differ

diff --git a/testdata/dnscrypt_cert.tdir/2_salsa.cert b/testdata/dnscrypt_cert.tdir/2_salsa.cert
new file mode 100644 (file)
index 0000000..6e71fe9
Binary files /dev/null and b/testdata/dnscrypt_cert.tdir/2_salsa.cert differ

diff --git a/testdata/dnscrypt_cert_chacha.tdir/1.key b/testdata/dnscrypt_cert_chacha.tdir/1.key
index 7698961045e43d1143efe9607afaf273ebd11cc9..165262c86e53595308da836d0e8cb4d7b56b19a1 100644 (file)
Binary files a/testdata/dnscrypt_cert_chacha.tdir/1.key and b/testdata/dnscrypt_cert_chacha.tdir/1.key differ

diff --git a/testdata/dnscrypt_cert_chacha.tdir/1_chacha.cert b/testdata/dnscrypt_cert_chacha.tdir/1_chacha.cert
new file mode 100644 (file)
index 0000000..3da5c61
Binary files /dev/null and b/testdata/dnscrypt_cert_chacha.tdir/1_chacha.cert differ

diff --git a/testdata/dnscrypt_cert_chacha.tdir/1_salsa.cert b/testdata/dnscrypt_cert_chacha.tdir/1_salsa.cert
new file mode 100644 (file)
index 0000000..17e447f
Binary files /dev/null and b/testdata/dnscrypt_cert_chacha.tdir/1_salsa.cert differ

diff --git a/testdata/dnscrypt_cert_chacha.tdir/2.key b/testdata/dnscrypt_cert_chacha.tdir/2.key
index ae385c068cdefc109cd2baaa27437fd634e82c51..c299f550ae955af0637b0762b3393eaeb2bdee03 100644 (file)
--- a/testdata/dnscrypt_cert_chacha.tdir/2.key
+++ b/testdata/dnscrypt_cert_chacha.tdir/2.key
@@ -1,2 +1 @@
-°Ù`½\eéj0Èu¼\ 1x\82¶t[
-]Ù\13uRª³@\9d;f]Z<
\ No newline at end of file
+m7\12\9fñâÂ\ 3\83x;\91%׸õ\90é*\95ÜR¯\13äÓ¯¹mDªñ
\ No newline at end of file

diff --git a/testdata/dnscrypt_cert_chacha.tdir/2_chacha.cert b/testdata/dnscrypt_cert_chacha.tdir/2_chacha.cert
index 9466220ab5033bbc30cff28628b822f0d83c4477..ed4ec26065a60f958ac8797b0515f692e2561152 100644 (file)
Binary files a/testdata/dnscrypt_cert_chacha.tdir/2_chacha.cert and b/testdata/dnscrypt_cert_chacha.tdir/2_chacha.cert differ

diff --git a/testdata/dnscrypt_cert_chacha.tdir/2_salsa.cert b/testdata/dnscrypt_cert_chacha.tdir/2_salsa.cert
new file mode 100644 (file)
index 0000000..6e71fe9
Binary files /dev/null and b/testdata/dnscrypt_cert_chacha.tdir/2_salsa.cert differ

diff --git a/testdata/dnscrypt_queries.tdir/1.key b/testdata/dnscrypt_queries.tdir/1.key
index 7698961045e43d1143efe9607afaf273ebd11cc9..165262c86e53595308da836d0e8cb4d7b56b19a1 100644 (file)
Binary files a/testdata/dnscrypt_queries.tdir/1.key and b/testdata/dnscrypt_queries.tdir/1.key differ

diff --git a/testdata/dnscrypt_queries.tdir/1_chacha.cert b/testdata/dnscrypt_queries.tdir/1_chacha.cert
new file mode 100644 (file)
index 0000000..3da5c61
Binary files /dev/null and b/testdata/dnscrypt_queries.tdir/1_chacha.cert differ

diff --git a/testdata/dnscrypt_queries.tdir/1_salsa.cert b/testdata/dnscrypt_queries.tdir/1_salsa.cert
new file mode 100644 (file)
index 0000000..17e447f
Binary files /dev/null and b/testdata/dnscrypt_queries.tdir/1_salsa.cert differ

diff --git a/testdata/dnscrypt_queries.tdir/2.key b/testdata/dnscrypt_queries.tdir/2.key
index ae385c068cdefc109cd2baaa27437fd634e82c51..c299f550ae955af0637b0762b3393eaeb2bdee03 100644 (file)
--- a/testdata/dnscrypt_queries.tdir/2.key
+++ b/testdata/dnscrypt_queries.tdir/2.key
@@ -1,2 +1 @@
-°Ù`½\eéj0Èu¼\ 1x\82¶t[
-]Ù\13uRª³@\9d;f]Z<
\ No newline at end of file
+m7\12\9fñâÂ\ 3\83x;\91%׸õ\90é*\95ÜR¯\13äÓ¯¹mDªñ
\ No newline at end of file

diff --git a/testdata/dnscrypt_queries.tdir/2_chacha.cert b/testdata/dnscrypt_queries.tdir/2_chacha.cert
new file mode 100644 (file)
index 0000000..ed4ec26
Binary files /dev/null and b/testdata/dnscrypt_queries.tdir/2_chacha.cert differ

diff --git a/testdata/dnscrypt_queries.tdir/2_salsa.cert b/testdata/dnscrypt_queries.tdir/2_salsa.cert
new file mode 100644 (file)
index 0000000..6e71fe9
Binary files /dev/null and b/testdata/dnscrypt_queries.tdir/2_salsa.cert differ

diff --git a/testdata/dnscrypt_queries_chacha.tdir/1.key b/testdata/dnscrypt_queries_chacha.tdir/1.key
new file mode 100644 (file)
index 0000000..165262c
--- /dev/null
+++ b/testdata/dnscrypt_queries_chacha.tdir/1.key
@@ -0,0 +1 @@
+®öÝìK¬\87#\91\804ùs\8e pèÖôÁæÀx!¹»\13A\8a"mM
\ No newline at end of file

diff --git a/testdata/dnscrypt_queries_chacha.tdir/1_chacha.cert b/testdata/dnscrypt_queries_chacha.tdir/1_chacha.cert
new file mode 100644 (file)
index 0000000..3da5c61
Binary files /dev/null and b/testdata/dnscrypt_queries_chacha.tdir/1_chacha.cert differ

diff --git a/testdata/dnscrypt_queries_chacha.tdir/1_salsa.cert b/testdata/dnscrypt_queries_chacha.tdir/1_salsa.cert
new file mode 100644 (file)
index 0000000..17e447f
Binary files /dev/null and b/testdata/dnscrypt_queries_chacha.tdir/1_salsa.cert differ

diff --git a/testdata/dnscrypt_queries_chacha.tdir/2.key b/testdata/dnscrypt_queries_chacha.tdir/2.key
index ae385c068cdefc109cd2baaa27437fd634e82c51..c299f550ae955af0637b0762b3393eaeb2bdee03 100644 (file)
--- a/testdata/dnscrypt_queries_chacha.tdir/2.key
+++ b/testdata/dnscrypt_queries_chacha.tdir/2.key
@@ -1,2 +1 @@
-°Ù`½\eéj0Èu¼\ 1x\82¶t[
-]Ù\13uRª³@\9d;f]Z<
\ No newline at end of file
+m7\12\9fñâÂ\ 3\83x;\91%׸õ\90é*\95ÜR¯\13äÓ¯¹mDªñ
\ No newline at end of file

diff --git a/testdata/dnscrypt_queries_chacha.tdir/2_chacha.cert b/testdata/dnscrypt_queries_chacha.tdir/2_chacha.cert
index 9466220ab5033bbc30cff28628b822f0d83c4477..ed4ec26065a60f958ac8797b0515f692e2561152 100644 (file)
Binary files a/testdata/dnscrypt_queries_chacha.tdir/2_chacha.cert and b/testdata/dnscrypt_queries_chacha.tdir/2_chacha.cert differ

diff --git a/testdata/dnscrypt_queries_chacha.tdir/2_salsa.cert b/testdata/dnscrypt_queries_chacha.tdir/2_salsa.cert
index 1e98d0cd2a08ee7be4710455fe0586b4667012db..6e71fe97864d8d63c56bcd3ccf384f98b765f13c 100644 (file)
Binary files a/testdata/dnscrypt_queries_chacha.tdir/2_salsa.cert and b/testdata/dnscrypt_queries_chacha.tdir/2_salsa.cert differ