test Ed448 against test vectors

(cherry picked from commit 20f2d9b41bfee9394e2fcaa983b9cadf3813f839)

diff --git a/bin/tests/system/eddsa/ns2/Xexample.com.+016+09713.key b/bin/tests/system/eddsa/ns2/Xexample.com.+016+09713.key
new file mode 100644 (file)
index 0000000..5c4628f
--- /dev/null
+++ b/bin/tests/system/eddsa/ns2/Xexample.com.+016+09713.key
@@ -0,0 +1 @@
+example.com. IN DNSKEY 257 3 16 3kgROaDjrh0H2iuixWBrc8g2EpBBLCdGzHmn+G2MpTPhpj/OiBVHHSfPodx1FYYUcJKm1MDpJtIA

diff --git a/bin/tests/system/eddsa/ns2/Xexample.com.+016+09713.private b/bin/tests/system/eddsa/ns2/Xexample.com.+016+09713.private
new file mode 100644 (file)
index 0000000..eb065f9
--- /dev/null
+++ b/bin/tests/system/eddsa/ns2/Xexample.com.+016+09713.private
@@ -0,0 +1,3 @@
+Private-key-format: v1.2
+Algorithm: 16 (ED448)
+PrivateKey: xZ+5Cgm463xugtkY5B0Jx6erFTXp13rYegst0qRtNsOYnaVpMx0Z/c5EiA9x8wWbDDct/U3FhYWA

diff --git a/bin/tests/system/eddsa/ns2/Xexample.com.+016+38353.key b/bin/tests/system/eddsa/ns2/Xexample.com.+016+38353.key
new file mode 100644 (file)
index 0000000..705856d
--- /dev/null
+++ b/bin/tests/system/eddsa/ns2/Xexample.com.+016+38353.key
@@ -0,0 +1 @@
+example.com. IN DNSKEY 257 3 16 kkreGWoccSDmUBGAe7+zsbG6ZAFQp+syPmYUurBRQc3tDjeMCJcVMRDmgcNLp5HlHAMy12VoISsA

diff --git a/bin/tests/system/eddsa/ns2/Xexample.com.+016+38353.private b/bin/tests/system/eddsa/ns2/Xexample.com.+016+38353.private
new file mode 100644 (file)
index 0000000..b512d80
--- /dev/null
+++ b/bin/tests/system/eddsa/ns2/Xexample.com.+016+38353.private
@@ -0,0 +1,3 @@
+Private-key-format: v1.2
+Algorithm: 16 (ED448)
+PrivateKey: WEykD3ht3MHkU8iH4uVOLz8JLwtRBSqiBoM6fF72+Mrp/u5gjxuB1DV6NnPO2BlZdz4hdSTkOdOA

diff --git a/bin/tests/system/eddsa/ns2/example.com.db b/bin/tests/system/eddsa/ns2/example.com.db
index 8a2b6cdf5b5d8464256414f53984aebcbadb347a..306a1569790cd6b5f9842fa394b5acc1c400fa7b 100644 (file)
--- a/bin/tests/system/eddsa/ns2/example.com.db
+++ b/bin/tests/system/eddsa/ns2/example.com.db
@@ -21,3 +21,5 @@ ns.example.com.               A       10.53.0.3
 ;
 $INCLUDE Kexample.com.+015+03613.key
 $INCLUDE Kexample.com.+015+35217.key
+$INCLUDE Kexample.com.+016+09713.key
+$INCLUDE Kexample.com.+016+38353.key

diff --git a/bin/tests/system/eddsa/ns2/sign.sh b/bin/tests/system/eddsa/ns2/sign.sh
index 76f5e5dba6dc4c36155c424c580de612d767b392..947e7473f28d3e0982ab13e2045c41457d4d5f91 100644 (file)
--- a/bin/tests/system/eddsa/ns2/sign.sh
+++ b/bin/tests/system/eddsa/ns2/sign.sh
@@ -18,7 +18,9 @@ starttime=20150729220000
 endtime=20150819220000
 
 for i in Xexample.com.+015+03613.key Xexample.com.+015+03613.private \
-        Xexample.com.+015+35217.key Xexample.com.+015+35217.private
+        Xexample.com.+015+35217.key Xexample.com.+015+35217.private \
+        Xexample.com.+016+09713.key Xexample.com.+016+09713.private \
+        Xexample.com.+016+38353.key Xexample.com.+016+38353.private
 do
        cp $i `echo $i | sed s/X/K/`
 done

diff --git a/bin/tests/system/eddsa/tests.sh b/bin/tests/system/eddsa/tests.sh
index 361380cccde00c2e646f387dc97f646aac396e05..4f6269e34be0b75be9b93b714841435f4c281a69 100644 (file)
--- a/bin/tests/system/eddsa/tests.sh
+++ b/bin/tests/system/eddsa/tests.sh
@@ -13,7 +13,7 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 status=0
-n=0
+n=1
 
 rm -f dig.out.*
 
@@ -33,7 +33,7 @@ status=`expr $status + $ret`
 
 # Check test vectors (RFC 8080 + errata)
 
-echo "I:checking that test vectors match ($n)"
+echo "I:checking that Ed25519 test vectors match ($n)"
 ret=0
 grep 'oL9krJun7xfBOIWcGHi7mag5/hdZrKWw15jP' ns2/example.com.db.signed > /dev/null || ret=1
 grep 'VrbpMngwcrqNAg==' ns2/example.com.db.signed > /dev/null || ret=1
@@ -43,5 +43,23 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
+echo "I:checking that Ed448 test vectors match ($n)"
+ret=0
+grep '3cPAHkmlnxcDHMyg7vFC34l0blBhuG1qpwLm' ns2/example.com.db.signed > /dev/null || ret=1
+grep 'jInI8w1CMB29FkEAIJUA0amxWndkmnBZ6SKi' ns2/example.com.db.signed > /dev/null || ret=1
+grep 'wZSAxGILn/NBtOXft0+Gj7FSvOKxE/07+4RQ' ns2/example.com.db.signed > /dev/null || ret=1
+grep 'vE581N3Aj/JtIyaiYVdnYtyMWbSNyGEY2213' ns2/example.com.db.signed > /dev/null || ret=1
+grep 'WKsJlwEA' ns2/example.com.db.signed > /dev/null || ret=1
+
+grep 'E1/oLjSGIbmLny/4fcgM1z4oL6aqo+izT3ur' ns2/example.com.db.signed > /dev/null || ret=1
+grep 'CyHyvEp4Sp8Syg1eI+lJ57CSnZqjJP41O/9l' ns2/example.com.db.signed > /dev/null || ret=1
+grep '4m0AsQ4f7qI1gVnML8vWWiyW2KXhT9kuAICU' ns2/example.com.db.signed > /dev/null || ret=1
+grep 'Sxv5OWbf81Rq7Yu60npabODB0QFPb/rkW3kU' ns2/example.com.db.signed > /dev/null || ret=1
+grep 'ZmQ0YQUA' ns2/example.com.db.signed > /dev/null || ret=1
+
+n=`expr $n + 1`
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
 echo "I:exit status: $status"
 [ $status -eq 0 ] || exit 1

diff --git a/configure b/configure
index 58b177f3bc079f2e80400aba5a7ca3d7de570166..682c71f6520e64ac47692a6b53bb29f0879512a6 100755 (executable)
--- a/configure
+++ b/configure
@@ -17214,9 +17214,9 @@ int main() {
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: broken" >&5
-$as_echo "broken" >&6; }
-               have_ed448="no"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+               have_ed448="yes"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }

diff --git a/configure.ac b/configure.ac
index f19f6871c9fc7378cbe378ebae2cf3bf389c8dff..96c5657938596b18511f191bfbb44ea3a1c3823c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1888,8 +1888,8 @@ int main() {
        return (0);
 }
 ],
-               [AC_MSG_RESULT([broken])
-               have_ed448="no"],
+               [AC_MSG_RESULT([yes])
+               have_ed448="yes"],
                [AC_MSG_RESULT([no])
                have_ed448="no"],
                [AC_MSG_RESULT(using --with-eddsa)])

diff --git a/util/copyrights b/util/copyrights
index ab9eb8342e289bf9a46de429b0520b55bc87b753..f7e0702f6681b3f5a80531e40be3228be3f09598 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1309,6 +1309,10 @@
 ./bin/tests/system/eddsa/ns2/Xexample.com.+015+03613.private   X       2017,2018,2019
 ./bin/tests/system/eddsa/ns2/Xexample.com.+015+35217.key       X       2017,2018,2019
 ./bin/tests/system/eddsa/ns2/Xexample.com.+015+35217.private   X       2017,2018,2019
+./bin/tests/system/eddsa/ns2/Xexample.com.+016+09713.key       X       2019
+./bin/tests/system/eddsa/ns2/Xexample.com.+016+09713.private   X       2019
+./bin/tests/system/eddsa/ns2/Xexample.com.+016+38353.key       X       2019
+./bin/tests/system/eddsa/ns2/Xexample.com.+016+38353.private   X       2019
 ./bin/tests/system/eddsa/ns2/example.com.db    ZONE    2017,2018,2019
 ./bin/tests/system/eddsa/ns2/named.conf                CONF-C  2017,2018,2019
 ./bin/tests/system/eddsa/ns2/sign.sh           SH      2017,2018,2019