test Ed448 against test vectors

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 f9d819459dbc39750f6af6f94767b393698b35fc..7aeceecd2a19364b6ee33da1d2d07fb267ff4467 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/config.h.in b/config.h.in
index 252bb8b553c29b35ac394334448c25a972ad1e31..4f40e3145890257a75d86fe0fc7deb9fda27a4ca 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -285,6 +285,9 @@
 /* define if OpenSSL supports Ed25519 */
 #undef HAVE_OPENSSL_ED25519
 
+/* define if OpenSSL supports Ed448 */
+#undef HAVE_OPENSSL_ED448
+
 /* Define to 1 if you have the `processor_bind' function. */
 #undef HAVE_PROCESSOR_BIND
 

diff --git a/configure b/configure
index 76fbe0ce42dae3e38e6f37d61e9559f6453229e4..09167c62f4e5f80a8aef2aba7b17aae68b0a4d69 100755 (executable)
--- a/configure
+++ b/configure
@@ -15996,15 +15996,29 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ed448 support" >&5
 $as_echo_n "checking for Ed448 support... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: broken" >&5
-$as_echo "broken" >&6; }
-#AC_COMPILE_IFELSE(
-#    [AC_LANG_PROGRAM([[#include <openssl/evp.h>
-#                     #include <openssl/ec.h>]],
-#                   [[EC_KEY *key = EC_KEY_new_by_curve_name(NID_ED448);]])],
-#    [AC_DEFINE([HAVE_OPENSSL_ED448], [1], [define if OpenSSL supports Ed448])
-#     AC_MSG_RESULT([yes])],
-#    [AC_MSG_RESULT([no])])
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <openssl/evp.h>
+                      #include <openssl/ec.h>
+int
+main ()
+{
+EC_KEY *key = EC_KEY_new_by_curve_name(NID_ED448);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_OPENSSL_ED448 1" >>confdefs.h
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 #
 # Check for OpenSSL SHA-1 support

diff --git a/configure.ac b/configure.ac
index 7a76ace3b1f3681aeb3463f22977fa6115b6661e..1e20f1724ef543dc14bedaa60829058c971e419c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -805,14 +805,13 @@ AC_COMPILE_IFELSE(
     [AC_MSG_RESULT([no])])
 
 AC_MSG_CHECKING([for Ed448 support])
-AC_MSG_RESULT([broken])
-#AC_COMPILE_IFELSE(
-#    [AC_LANG_PROGRAM([[#include <openssl/evp.h>
-#                     #include <openssl/ec.h>]],
-#                   [[EC_KEY *key = EC_KEY_new_by_curve_name(NID_ED448);]])],
-#    [AC_DEFINE([HAVE_OPENSSL_ED448], [1], [define if OpenSSL supports Ed448])
-#     AC_MSG_RESULT([yes])],
-#    [AC_MSG_RESULT([no])])
+AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([[#include <openssl/evp.h>
+                      #include <openssl/ec.h>]],
+                    [[EC_KEY *key = EC_KEY_new_by_curve_name(NID_ED448);]])],
+    [AC_DEFINE([HAVE_OPENSSL_ED448], [1], [define if OpenSSL supports Ed448])
+     AC_MSG_RESULT([yes])],
+    [AC_MSG_RESULT([no])])
 
 #
 # Check for OpenSSL SHA-1 support

diff --git a/util/copyrights b/util/copyrights
index 2618ec77e01db2bc094cfc0fe01f8ee83ed325a9..ff2bd91ac1cd73498f1c1b9a34d2168f7cebd996 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -614,6 +614,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/sign.sh           SH      2017,2018,2019
 ./bin/tests/system/eddsa/prereq.sh             SH      2017,2018,2019
 ./bin/tests/system/eddsa/setup.sh              SH      2017,2018,2019