Moved Ed25519 tests to libstrongswan
authorAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 13 Dec 2016 21:47:36 +0000 (22:47 +0100)
committerTobias Brunner <tobias@strongswan.org>
Wed, 14 Dec 2016 10:57:36 +0000 (11:57 +0100)
configure.ac
src/libstrongswan/Makefile.am
src/libstrongswan/plugins/curve25519/Makefile.am
src/libstrongswan/plugins/curve25519/tests/.gitignore [deleted file]
src/libstrongswan/plugins/curve25519/tests/Makefile.am [deleted file]
src/libstrongswan/plugins/curve25519/tests/curve25519_tests.c [deleted file]
src/libstrongswan/plugins/curve25519/tests/curve25519_tests.h [deleted file]
src/libstrongswan/plugins/curve25519/tests/suites/test_curve25519_ed25519.c [deleted file]
src/libstrongswan/tests/Makefile.am
src/libstrongswan/tests/suites/test_ed25519.c [new file with mode: 0644]
src/libstrongswan/tests/tests.h

index d5f8790..983e924 100644 (file)
@@ -1757,7 +1757,6 @@ AC_CONFIG_FILES([
        src/libstrongswan/plugins/fips_prf/Makefile
        src/libstrongswan/plugins/gmp/Makefile
        src/libstrongswan/plugins/curve25519/Makefile
-       src/libstrongswan/plugins/curve25519/tests/Makefile
        src/libstrongswan/plugins/rdrand/Makefile
        src/libstrongswan/plugins/aesni/Makefile
        src/libstrongswan/plugins/random/Makefile
index c3b31fe..f6d6f54 100644 (file)
@@ -648,7 +648,3 @@ endif
 if USE_NEWHOPE
   SUBDIRS += plugins/newhope/tests
 endif
-
-if USE_CURVE25519
-  SUBDIRS += plugins/curve25519/tests
-endif
index 7bbf221..f3e1e92 100644 (file)
@@ -2,19 +2,10 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan
 
 AM_CFLAGS = \
-       $(PLUGIN_CFLAGS) \
-       @COVERAGE_CFLAGS@
-
-# these files are also used by the tests, we can't directly refer to them
-# because of the subdirectory, which would cause distclean to fail
-noinst_LTLIBRARIES = libcurve25519.la
-libcurve25519_la_SOURCES = \
-       curve25519_private_key.h curve25519_private_key.c \
-       curve25519_public_key.h curve25519_public_key.c \
-       ref10/ref10.h ref10/ref10.c ref10/base.h ref10/base2.h
+       $(PLUGIN_CFLAGS)
 
 if MONOLITHIC
-noinst_LTLIBRARIES += libstrongswan-curve25519.la
+noinst_LTLIBRARIES = libstrongswan-curve25519.la
 else
 plugin_LTLIBRARIES = libstrongswan-curve25519.la
 endif
@@ -24,9 +15,9 @@ libstrongswan_curve25519_la_SOURCES = \
        curve25519_drv.h curve25519_drv.c \
        curve25519_drv_portable.h curve25519_drv_portable.c \
        curve25519_identity_hasher.h curve25519_identity_hasher.c \
-       curve25519_plugin.h curve25519_plugin.c
+       curve25519_plugin.h curve25519_plugin.c \
+       curve25519_private_key.h curve25519_private_key.c \
+       curve25519_public_key.h curve25519_public_key.c \
+       ref10/ref10.h ref10/ref10.c ref10/base.h ref10/base2.h
 
 libstrongswan_curve25519_la_LDFLAGS = -module -avoid-version
-
-libstrongswan_curve25519_la_LIBADD = libcurve25519.la
-
diff --git a/src/libstrongswan/plugins/curve25519/tests/.gitignore b/src/libstrongswan/plugins/curve25519/tests/.gitignore
deleted file mode 100644 (file)
index 9c83c3f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-curve25519_tests
diff --git a/src/libstrongswan/plugins/curve25519/tests/Makefile.am b/src/libstrongswan/plugins/curve25519/tests/Makefile.am
deleted file mode 100644 (file)
index 30e1851..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-TESTS = curve25519_tests
-
-check_PROGRAMS = $(TESTS)
-
-curve25519_tests_SOURCES = \
-       suites/test_curve25519_ed25519.c \
-       curve25519_tests.h curve25519_tests.c
-
-curve25519_tests_CFLAGS = \
-       -I$(top_srcdir)/src/libstrongswan \
-       -I$(top_srcdir)/src/libstrongswan/tests \
-       -I$(top_srcdir)/src/libstrongswan/plugins/curve25519 \
-       -DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \
-       -DPLUGINS=\""${s_plugins}\"" \
-       @COVERAGE_CFLAGS@
-
-curve25519_tests_LDFLAGS = @COVERAGE_LDFLAGS@
-curve25519_tests_LDADD = \
-       $(top_builddir)/src/libstrongswan/libstrongswan.la \
-       $(top_builddir)/src/libstrongswan/tests/libtest.la \
-       ../libcurve25519.la
diff --git a/src/libstrongswan/plugins/curve25519/tests/curve25519_tests.c b/src/libstrongswan/plugins/curve25519/tests/curve25519_tests.c
deleted file mode 100644 (file)
index 5ecae23..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2014 Andreas Steffen
- * HSR Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include <test_runner.h>
-
-#include <library.h>
-
-/* declare test suite constructors */
-#define TEST_SUITE(x) test_suite_t* x();
-#include "curve25519_tests.h"
-#undef TEST_SUITE
-
-static test_configuration_t tests[] = {
-#define TEST_SUITE(x) \
-       { .suite = x, },
-#include "curve25519_tests.h"
-       { .suite = NULL, }
-};
-
-static bool test_runner_init(bool init)
-{
-       if (init)
-       {
-               char *plugins, *plugindir;
-
-               plugins = lib->settings->get_str(lib->settings,
-                                                                               "tests.load", PLUGINS);
-               plugindir = lib->settings->get_str(lib->settings,
-                                                                               "tests.plugindir", PLUGINDIR);
-               plugin_loader_add_plugindirs(plugindir, plugins);
-               if (!lib->plugins->load(lib->plugins, plugins))
-               {
-                       return FALSE;
-               }
-       }
-       else
-       {
-               lib->processor->set_threads(lib->processor, 0);
-               lib->processor->cancel(lib->processor);
-               lib->plugins->unload(lib->plugins);
-       }
-       return TRUE;
-}
-
-int main(int argc, char *argv[])
-{
-       return test_runner_run("curve25519", tests, test_runner_init);
-}
diff --git a/src/libstrongswan/plugins/curve25519/tests/curve25519_tests.h b/src/libstrongswan/plugins/curve25519/tests/curve25519_tests.h
deleted file mode 100644 (file)
index f176574..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2016 Andreas Steffen
- * HSR Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-TEST_SUITE(curve25519_ed25519_suite_create)
diff --git a/src/libstrongswan/plugins/curve25519/tests/suites/test_curve25519_ed25519.c b/src/libstrongswan/plugins/curve25519/tests/suites/test_curve25519_ed25519.c
deleted file mode 100644 (file)
index cdff163..0000000
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- * Copyright (C) 2016 Andreas Steffen
- * HSR Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "test_suite.h"
-
-#include <curve25519_private_key.h>
-#include <curve25519_public_key.h>
-
-#include <time.h>
-
-typedef struct sig_test_t sig_test_t;
-
-struct sig_test_t {
-       chunk_t key;
-       chunk_t pubkey;
-       chunk_t msg;
-       chunk_t sig;
-};
-
-/**
- * Ed25519 Test Vectors from draft-irtf-cfrg-eddsa
- */
-static sig_test_t sig_tests[] = {
-       /* Test 1 */
-       { chunk_from_chars(
-               0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b,
-               0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0x9d, 0x61, 0xb1, 0x9d,
-               0xef, 0xfd, 0x5a, 0x60, 0xba, 0x84, 0x4a, 0xf4, 0x92, 0xec,
-               0x2c, 0xc4, 0x44, 0x49, 0xc5, 0x69, 0x7b, 0x32, 0x69, 0x19,
-               0x70, 0x3b, 0xac, 0x03, 0x1c, 0xae, 0x7f, 0x60),
-         chunk_from_chars(
-               0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
-               0x21, 0x00, 0xd7, 0x5a, 0x98, 0x01, 0x82, 0xb1, 0x0a, 0xb7,
-               0xd5, 0x4b, 0xfe, 0xd3, 0xc9, 0x64, 0x07, 0x3a, 0x0e, 0xe1,
-               0x72, 0xf3, 0xda, 0xa6, 0x23, 0x25, 0xaf, 0x02, 0x1a, 0x68,
-               0xf7, 0x07, 0x51, 0x1a),
-         { NULL, 0 },
-         chunk_from_chars(
-               0xe5, 0x56, 0x43, 0x00, 0xc3, 0x60, 0xac, 0x72, 0x90, 0x86,
-               0xe2, 0xcc, 0x80, 0x6e, 0x82, 0x8a, 0x84, 0x87, 0x7f, 0x1e,
-               0xb8, 0xe5, 0xd9, 0x74, 0xd8, 0x73, 0xe0, 0x65, 0x22, 0x49,
-               0x01, 0x55, 0x5f, 0xb8, 0x82, 0x15, 0x90, 0xa3, 0x3b, 0xac,
-               0xc6, 0x1e, 0x39, 0x70, 0x1c, 0xf9, 0xb4, 0x6b, 0xd2, 0x5b,
-               0xf5, 0xf0, 0x59, 0x5b, 0xbe, 0x24, 0x65, 0x51, 0x41, 0x43,
-               0x8e, 0x7a, 0x10, 0x0b)
-       },
-       /* Test 2 */
-       { chunk_from_chars(
-               0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b,
-               0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0x4c, 0xcd, 0x08, 0x9b,
-               0x28, 0xff, 0x96, 0xda, 0x9d, 0xb6, 0xc3, 0x46, 0xec, 0x11,
-               0x4e, 0x0f, 0x5b, 0x8a, 0x31, 0x9f, 0x35, 0xab, 0xa6, 0x24,
-               0xda, 0x8c, 0xf6, 0xed, 0x4f, 0xb8, 0xa6, 0xfb),
-         chunk_from_chars(
-               0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
-               0x21, 0x00, 0x3d, 0x40, 0x17, 0xc3, 0xe8, 0x43, 0x89, 0x5a,
-               0x92, 0xb7, 0x0a, 0xa7, 0x4d, 0x1b, 0x7e, 0xbc, 0x9c, 0x98,
-               0x2c, 0xcf, 0x2e, 0xc4, 0x96, 0x8c, 0xc0, 0xcd, 0x55, 0xf1,
-               0x2a, 0xf4, 0x66, 0x0c),
-         chunk_from_chars(
-               0x72),
-         chunk_from_chars(
-               0x92, 0xa0, 0x09, 0xa9, 0xf0, 0xd4, 0xca, 0xb8, 0x72, 0x0e,
-               0x82, 0x0b, 0x5f, 0x64, 0x25, 0x40, 0xa2, 0xb2, 0x7b, 0x54,
-               0x16, 0x50, 0x3f, 0x8f, 0xb3, 0x76, 0x22, 0x23, 0xeb, 0xdb,
-               0x69, 0xda, 0x08, 0x5a, 0xc1, 0xe4, 0x3e, 0x15, 0x99, 0x6e,
-               0x45, 0x8f, 0x36, 0x13, 0xd0, 0xf1, 0x1d, 0x8c, 0x38, 0x7b,
-               0x2e, 0xae, 0xb4, 0x30, 0x2a, 0xee, 0xb0, 0x0d, 0x29, 0x16,
-               0x12, 0xbb, 0x0c, 0x00)
-       },
-       /* Test 3 */
-       { chunk_from_chars(
-               0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b,
-               0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0xc5, 0xaa, 0x8d, 0xf4,
-               0x3f, 0x9f, 0x83, 0x7b, 0xed, 0xb7, 0x44, 0x2f, 0x31, 0xdc,
-               0xb7, 0xb1, 0x66, 0xd3, 0x85, 0x35,0x07, 0x6f, 0x09, 0x4b,
-               0x85, 0xce, 0x3a, 0x2e, 0x0b, 0x44, 0x58, 0xf7),
-         chunk_from_chars(
-               0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
-               0x21, 0x00, 0xfc, 0x51, 0xcd, 0x8e, 0x62, 0x18, 0xa1, 0xa3,
-               0x8d, 0xa4, 0x7e, 0xd0, 0x02, 0x30, 0xf0, 0x58, 0x08, 0x16,
-               0xed, 0x13, 0xba, 0x33, 0x03, 0xac, 0x5d, 0xeb, 0x91, 0x15,
-               0x48, 0x90, 0x80, 0x25),
-         chunk_from_chars(
-               0xaf, 0x82),
-         chunk_from_chars(
-               0x62, 0x91, 0xd6, 0x57, 0xde, 0xec, 0x24, 0x02, 0x48, 0x27,
-               0xe6, 0x9c, 0x3a, 0xbe, 0x01, 0xa3, 0x0c, 0xe5, 0x48, 0xa2,
-               0x84, 0x74, 0x3a, 0x44, 0x5e, 0x36, 0x80, 0xd7, 0xdb, 0x5a,
-               0xc3, 0xac, 0x18, 0xff, 0x9b, 0x53, 0x8d, 0x16, 0xf2, 0x90,
-               0xae, 0x67, 0xf7, 0x60, 0x98, 0x4d, 0xc6, 0x59, 0x4a, 0x7c,
-               0x15, 0xe9, 0x71, 0x6e, 0xd2, 0x8d, 0xc0, 0x27, 0xbe, 0xce,
-               0xea, 0x1e, 0xc4, 0x0a)
-       },
-       /* Test 1024 */
-       { chunk_from_chars(
-               0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b,
-               0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0xf5, 0xe5, 0x76, 0x7c,
-               0xf1, 0x53, 0x31, 0x95, 0x17, 0x63, 0x0f, 0x22, 0x68, 0x76,
-               0xb8, 0x6c, 0x81, 0x60, 0xcc, 0x58, 0x3b, 0xc0, 0x13, 0x74,
-               0x4c, 0x6b, 0xf2, 0x55, 0xf5, 0xcc, 0x0e, 0xe5),
-         chunk_from_chars(
-               0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
-               0x21, 0x00, 0x27, 0x81, 0x17, 0xfc, 0x14, 0x4c, 0x72, 0x34,
-               0x0f, 0x67, 0xd0, 0xf2, 0x31, 0x6e, 0x83, 0x86, 0xce, 0xff,
-               0xbf, 0x2b, 0x24, 0x28, 0xc9, 0xc5, 0x1f, 0xef, 0x7c, 0x59,
-               0x7f, 0x1d, 0x42, 0x6e),
-         chunk_from_chars(
-               0x08, 0xb8, 0xb2, 0xb7, 0x33, 0x42, 0x42, 0x43, 0x76, 0x0f,
-               0xe4, 0x26, 0xa4, 0xb5, 0x49, 0x08, 0x63, 0x21, 0x10, 0xa6,
-               0x6c, 0x2f, 0x65, 0x91, 0xea, 0xbd, 0x33, 0x45, 0xe3, 0xe4,
-               0xeb, 0x98, 0xfa, 0x6e, 0x26, 0x4b, 0xf0, 0x9e, 0xfe, 0x12,
-               0xee, 0x50, 0xf8, 0xf5, 0x4e, 0x9f, 0x77, 0xb1, 0xe3, 0x55,
-               0xf6, 0xc5, 0x05, 0x44, 0xe2, 0x3f, 0xb1, 0x43, 0x3d, 0xdf,
-               0x73, 0xbe, 0x84, 0xd8, 0x79, 0xde, 0x7c, 0x00, 0x46, 0xdc,
-               0x49, 0x96, 0xd9, 0xe7, 0x73, 0xf4, 0xbc, 0x9e, 0xfe, 0x57,
-               0x38, 0x82, 0x9a, 0xdb, 0x26, 0xc8, 0x1b, 0x37, 0xc9, 0x3a,
-               0x1b, 0x27, 0x0b, 0x20, 0x32, 0x9d, 0x65, 0x86, 0x75, 0xfc,
-
-               0x6e, 0xa5, 0x34, 0xe0, 0x81, 0x0a, 0x44, 0x32, 0x82, 0x6b,
-               0xf5, 0x8c, 0x94, 0x1e, 0xfb, 0x65, 0xd5, 0x7a, 0x33, 0x8b,
-               0xbd, 0x2e, 0x26, 0x64, 0x0f, 0x89, 0xff, 0xbc, 0x1a, 0x85,
-               0x8e, 0xfc, 0xb8, 0x55, 0x0e, 0xe3, 0xa5, 0xe1, 0x99, 0x8b,
-               0xd1, 0x77, 0xe9, 0x3a, 0x73, 0x63, 0xc3, 0x44, 0xfe, 0x6b,
-               0x19, 0x9e, 0xe5, 0xd0, 0x2e, 0x82, 0xd5, 0x22, 0xc4, 0xfe,
-               0xba, 0x15, 0x45, 0x2f, 0x80, 0x28, 0x8a, 0x82, 0x1a, 0x57,
-               0x91, 0x16, 0xec, 0x6d, 0xad, 0x2b, 0x3b, 0x31, 0x0d, 0xa9,
-               0x03, 0x40, 0x1a, 0xa6, 0x21, 0x00, 0xab, 0x5d, 0x1a, 0x36,
-               0x55, 0x3e, 0x06, 0x20, 0x3b, 0x33, 0x89, 0x0c, 0xc9, 0xb8,
-
-               0x32, 0xf7, 0x9e, 0xf8, 0x05, 0x60, 0xcc, 0xb9, 0xa3, 0x9c,
-               0xe7, 0x67, 0x96, 0x7e, 0xd6, 0x28, 0xc6, 0xad, 0x57, 0x3c,
-               0xb1, 0x16, 0xdb, 0xef, 0xef, 0xd7, 0x54, 0x99, 0xda, 0x96,
-               0xbd, 0x68, 0xa8, 0xa9, 0x7b, 0x92, 0x8a, 0x8b, 0xbc, 0x10,
-               0x3b, 0x66, 0x21, 0xfc, 0xde, 0x2b, 0xec, 0xa1, 0x23, 0x1d,
-               0x20, 0x6b, 0xe6, 0xcd, 0x9e, 0xc7, 0xaf, 0xf6, 0xf6, 0xc9,
-               0x4f, 0xcd, 0x72, 0x04, 0xed, 0x34, 0x55, 0xc6, 0x8c, 0x83,
-               0xf4, 0xa4, 0x1d, 0xa4, 0xaf, 0x2b, 0x74, 0xef, 0x5c, 0x53,
-               0xf1, 0xd8, 0xac, 0x70, 0xbd, 0xcb, 0x7e, 0xd1, 0x85, 0xce,
-               0x81, 0xbd, 0x84, 0x35, 0x9d, 0x44, 0x25, 0x4d, 0x95, 0x62,
-
-               0x9e, 0x98, 0x55, 0xa9, 0x4a, 0x7c, 0x19, 0x58, 0xd1, 0xf8,
-               0xad, 0xa5, 0xd0, 0x53, 0x2e, 0xd8, 0xa5, 0xaa, 0x3f, 0xb2,
-               0xd1, 0x7b, 0xa7, 0x0e, 0xb6, 0x24, 0x8e, 0x59, 0x4e, 0x1a,
-               0x22, 0x97, 0xac, 0xbb, 0xb3, 0x9d, 0x50, 0x2f, 0x1a, 0x8c,
-               0x6e, 0xb6, 0xf1, 0xce, 0x22, 0xb3, 0xde, 0x1a, 0x1f, 0x40,
-               0xcc, 0x24, 0x55, 0x41, 0x19, 0xa8, 0x31, 0xa9, 0xaa, 0xd6,
-               0x07, 0x9c, 0xad, 0x88, 0x42, 0x5d, 0xe6, 0xbd, 0xe1, 0xa9,
-               0x18, 0x7e, 0xbb, 0x60, 0x92, 0xcf, 0x67, 0xbf, 0x2b, 0x13,
-               0xfd, 0x65, 0xf2, 0x70, 0x88, 0xd7, 0x8b, 0x7e, 0x88, 0x3c,
-               0x87, 0x59, 0xd2, 0xc4, 0xf5, 0xc6, 0x5a, 0xdb, 0x75, 0x53,
-
-               0x87, 0x8a, 0xd5, 0x75, 0xf9, 0xfa, 0xd8, 0x78, 0xe8, 0x0a,
-               0x0c, 0x9b, 0xa6, 0x3b, 0xcb, 0xcc, 0x27, 0x32, 0xe6, 0x94,
-               0x85, 0xbb, 0xc9, 0xc9, 0x0b, 0xfb, 0xd6, 0x24, 0x81, 0xd9,
-               0x08, 0x9b, 0xec, 0xcf, 0x80, 0xcf, 0xe2, 0xdf, 0x16, 0xa2,
-               0xcf, 0x65, 0xbd, 0x92, 0xdd, 0x59, 0x7b, 0x07, 0x07, 0xe0,
-               0x91, 0x7a, 0xf4, 0x8b, 0xbb, 0x75, 0xfe, 0xd4, 0x13, 0xd2,
-               0x38, 0xf5, 0x55, 0x5a, 0x7a, 0x56, 0x9d, 0x80, 0xc3, 0x41,
-               0x4a, 0x8d, 0x08, 0x59, 0xdc, 0x65, 0xa4, 0x61, 0x28, 0xba,
-               0xb2, 0x7a, 0xf8, 0x7a, 0x71, 0x31, 0x4f, 0x31, 0x8c, 0x78,
-               0x2b, 0x23, 0xeb, 0xfe, 0x80, 0x8b, 0x82, 0xb0, 0xce, 0x26,
-
-               0x40, 0x1d, 0x2e, 0x22, 0xf0, 0x4d, 0x83, 0xd1, 0x25, 0x5d,
-               0xc5, 0x1a, 0xdd, 0xd3, 0xb7, 0x5a, 0x2b, 0x1a, 0xe0, 0x78,
-               0x45, 0x04, 0xdf, 0x54, 0x3a, 0xf8, 0x96, 0x9b, 0xe3, 0xea,
-               0x70, 0x82, 0xff, 0x7f, 0xc9, 0x88, 0x8c, 0x14, 0x4d, 0xa2,
-               0xaf, 0x58, 0x42, 0x9e, 0xc9, 0x60, 0x31, 0xdb, 0xca, 0xd3,
-               0xda, 0xd9, 0xaf, 0x0d, 0xcb, 0xaa, 0xaf, 0x26, 0x8c, 0xb8,
-               0xfc, 0xff, 0xea, 0xd9, 0x4f, 0x3c, 0x7c, 0xa4, 0x95, 0xe0,
-               0x56, 0xa9, 0xb4, 0x7a, 0xcd, 0xb7, 0x51, 0xfb, 0x73, 0xe6,
-               0x66, 0xc6, 0xc6, 0x55, 0xad, 0xe8, 0x29, 0x72, 0x97, 0xd0,
-               0x7a, 0xd1, 0xba, 0x5e, 0x43, 0xf1, 0xbc, 0xa3, 0x23, 0x01,
-
-               0x65, 0x13, 0x39, 0xe2, 0x29, 0x04, 0xcc, 0x8c, 0x42, 0xf5,
-               0x8c, 0x30, 0xc0, 0x4a, 0xaf, 0xdb, 0x03, 0x8d, 0xda, 0x08,
-               0x47, 0xdd, 0x98, 0x8d, 0xcd, 0xa6, 0xf3, 0xbf, 0xd1, 0x5c,
-               0x4b, 0x4c, 0x45, 0x25, 0x00, 0x4a, 0xa0, 0x6e, 0xef, 0xf8,
-               0xca, 0x61, 0x78, 0x3a, 0xac, 0xec, 0x57, 0xfb, 0x3d, 0x1f,
-               0x92, 0xb0, 0xfe, 0x2f, 0xd1, 0xa8, 0x5f, 0x67, 0x24, 0x51,
-               0x7b, 0x65, 0xe6, 0x14, 0xad, 0x68, 0x08, 0xd6, 0xf6, 0xee,
-               0x34, 0xdf, 0xf7, 0x31, 0x0f, 0xdc, 0x82, 0xae, 0xbf, 0xd9,
-               0x04, 0xb0, 0x1e, 0x1d, 0xc5, 0x4b, 0x29, 0x27, 0x09, 0x4b,
-               0x2d, 0xb6, 0x8d, 0x6f, 0x90, 0x3b, 0x68, 0x40, 0x1a, 0xde,
-
-               0xbf, 0x5a, 0x7e, 0x08, 0xd7, 0x8f, 0xf4, 0xef, 0x5d, 0x63,
-               0x65, 0x3a, 0x65, 0x04, 0x0c, 0xf9, 0xbf, 0xd4, 0xac, 0xa7,
-               0x98, 0x4a, 0x74, 0xd3, 0x71, 0x45, 0x98, 0x67, 0x80, 0xfc,
-               0x0b, 0x16, 0xac, 0x45, 0x16, 0x49, 0xde, 0x61, 0x88, 0xa7,
-               0xdb, 0xdf, 0x19, 0x1f, 0x64, 0xb5, 0xfc, 0x5e, 0x2a, 0xb4,
-               0x7b, 0x57, 0xf7, 0xf7, 0x27, 0x6c, 0xd4, 0x19, 0xc1, 0x7a,
-               0x3c, 0xa8, 0xe1, 0xb9, 0x39, 0xae, 0x49, 0xe4, 0x88, 0xac,
-               0xba, 0x6b, 0x96, 0x56, 0x10, 0xb5, 0x48, 0x01, 0x09, 0xc8,
-               0xb1, 0x7b, 0x80, 0xe1, 0xb7, 0xb7, 0x50, 0xdf, 0xc7, 0x59,
-               0x8d, 0x5d, 0x50, 0x11, 0xfd, 0x2d, 0xcc, 0x56, 0x00, 0xa3,
-
-               0x2e, 0xf5, 0xb5, 0x2a, 0x1e, 0xcc, 0x82, 0x0e, 0x30, 0x8a,
-               0xa3, 0x42, 0x72, 0x1a, 0xac, 0x09, 0x43, 0xbf, 0x66, 0x86,
-               0xb6, 0x4b, 0x25, 0x79, 0x37, 0x65, 0x04, 0xcc, 0xc4, 0x93,
-               0xd9, 0x7e, 0x6a, 0xed, 0x3f, 0xb0, 0xf9, 0xcd, 0x71, 0xa4,
-               0x3d, 0xd4, 0x97, 0xf0, 0x1f, 0x17, 0xc0, 0xe2, 0xcb, 0x37,
-               0x97, 0xaa, 0x2a, 0x2f, 0x25, 0x66, 0x56, 0x16, 0x8e, 0x6c,
-               0x49, 0x6a, 0xfc, 0x5f, 0xb9, 0x32, 0x46, 0xf6, 0xb1, 0x11,
-               0x63, 0x98, 0xa3, 0x46, 0xf1, 0xa6, 0x41, 0xf3, 0xb0, 0x41,
-               0xe9, 0x89, 0xf7, 0x91, 0x4f, 0x90, 0xcc, 0x2c, 0x7f, 0xff,
-               0x35, 0x78, 0x76, 0xe5, 0x06, 0xb5, 0x0d, 0x33, 0x4b, 0xa7,
-
-               0x7c, 0x22, 0x5b, 0xc3, 0x07, 0xba, 0x53, 0x71, 0x52, 0xf3,
-               0xf1, 0x61, 0x0e, 0x4e, 0xaf, 0xe5, 0x95, 0xf6, 0xd9, 0xd9,
-               0x0d, 0x11, 0xfa, 0xa9, 0x33, 0xa1, 0x5e, 0xf1, 0x36, 0x95,
-               0x46, 0x86, 0x8a, 0x7f, 0x3a, 0x45, 0xa9, 0x67, 0x68, 0xd4,
-               0x0f, 0xd9, 0xd0, 0x34, 0x12, 0xc0, 0x91, 0xc6, 0x31, 0x5c,
-               0xf4, 0xfd, 0xe7, 0xcb, 0x68, 0x60, 0x69, 0x37, 0x38, 0x0d,
-               0xb2, 0xea, 0xaa, 0x70, 0x7b, 0x4c, 0x41, 0x85, 0xc3, 0x2e,
-               0xdd, 0xcd, 0xd3, 0x06, 0x70, 0x5e, 0x4d, 0xc1, 0xff, 0xc8,
-               0x72, 0xee, 0xee, 0x47, 0x5a, 0x64, 0xdf, 0xac, 0x86, 0xab,
-               0xa4, 0x1c, 0x06, 0x18, 0x98, 0x3f, 0x87, 0x41, 0xc5, 0xef,
-
-               0x68, 0xd3, 0xa1, 0x01, 0xe8, 0xa3, 0xb8, 0xca, 0xc6, 0x0c,
-               0x90, 0x5c, 0x15, 0xfc, 0x91, 0x08, 0x40, 0xb9, 0x4c, 0x00,
-               0xa0, 0xb9, 0xd0),
-         chunk_from_chars(
-               0x0a, 0xab, 0x4c, 0x90, 0x05, 0x01, 0xb3, 0xe2, 0x4d, 0x7c,
-               0xdf, 0x46, 0x63, 0x32, 0x6a, 0x3a, 0x87, 0xdf, 0x5e, 0x48,
-               0x43, 0xb2, 0xcb, 0xdb, 0x67, 0xcb, 0xf6, 0xe4, 0x60, 0xfe,
-               0xc3, 0x50, 0xaa, 0x53, 0x71, 0xb1, 0x50, 0x8f, 0x9f, 0x45,
-               0x28, 0xec, 0xea, 0x23, 0xc4, 0x36, 0xd9, 0x4b, 0x5e, 0x8f,
-               0xcd, 0x4f, 0x68, 0x1e, 0x30, 0xa6, 0xac, 0x00, 0xa9, 0x70,
-               0x4a, 0x18, 0x8a, 0x03)
-       },
-       /* Test SHA(abc) */
-       { chunk_from_chars(
-               0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b,
-               0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0x83, 0x3f, 0xe6, 0x24,
-               0x09, 0x23, 0x7b, 0x9d, 0x62, 0xec, 0x77, 0x58, 0x75, 0x20,
-               0x91, 0x1e, 0x9a, 0x75, 0x9c, 0xec, 0x1d, 0x19, 0x75, 0x5b,
-               0x7d, 0xa9, 0x01, 0xb9, 0x6d, 0xca, 0x3d, 0x42),
-         chunk_from_chars(
-               0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
-               0x21, 0x00, 0xec, 0x17, 0x2b, 0x93, 0xad, 0x5e, 0x56, 0x3b,
-               0xf4, 0x93, 0x2c, 0x70, 0xe1, 0x24, 0x50, 0x34, 0xc3, 0x54,
-               0x67, 0xef, 0x2e, 0xfd, 0x4d, 0x64, 0xeb, 0xf8, 0x19, 0x68,
-               0x34, 0x67, 0xe2, 0xbf),
-         chunk_from_chars(
-               0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba, 0xcc, 0x41,
-               0x73, 0x49, 0xae, 0x20, 0x41, 0x31, 0x12, 0xe6, 0xfa, 0x4e,
-               0x89, 0xa9, 0x7e, 0xa2, 0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55,
-               0xd3, 0x9a, 0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8,
-               0x36, 0xba, 0x3c, 0x23, 0xa3, 0xfe, 0xeb, 0xbd, 0x45, 0x4d,
-               0x44, 0x23, 0x64, 0x3c, 0xe8, 0x0e, 0x2a, 0x9a, 0xc9, 0x4f,
-               0xa5, 0x4c, 0xa4, 0x9f),
-         chunk_from_chars(
-               0xdc, 0x2a, 0x44, 0x59, 0xe7, 0x36, 0x96, 0x33, 0xa5, 0x2b,
-               0x1b, 0xf2, 0x77, 0x83, 0x9a, 0x00, 0x20, 0x10, 0x09, 0xa3,
-               0xef, 0xbf, 0x3e, 0xcb, 0x69, 0xbe, 0xa2, 0x18, 0x6c, 0x26,
-               0xb5, 0x89, 0x09, 0x35, 0x1f, 0xc9, 0xac, 0x90, 0xb3, 0xec,
-               0xfd, 0xfb, 0xc7, 0xc6, 0x64, 0x31, 0xe0, 0x30, 0x3d, 0xca,
-               0x17, 0x9c, 0x13, 0x8a, 0xc1, 0x7a, 0xd9, 0xbe, 0xf1, 0x17,
-               0x73, 0x31, 0xa7, 0x04)
-       }
-};
-
-START_TEST(test_curve25519_ed25519_sign)
-{
-       private_key_t *key;
-       public_key_t *pubkey, *public;
-       chunk_t sig, encoding;
-
-       /* load private key */
-       key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
-                                       BUILD_BLOB_ASN1_DER, sig_tests[_i].key, BUILD_END);
-       ck_assert(key != NULL);
-       ck_assert(key->get_encoding(key, PRIVKEY_ASN1_DER, &encoding));
-       ck_assert(chunk_equals(encoding, sig_tests[_i].key));
-       chunk_free(&encoding);
-
-       /* load public key */
-       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
-                                       BUILD_BLOB_ASN1_DER, sig_tests[_i].pubkey, BUILD_END);
-       ck_assert(pubkey != NULL);
-       ck_assert(pubkey->get_encoding(pubkey, PUBKEY_SPKI_ASN1_DER, &encoding));
-       ck_assert(chunk_equals(encoding, sig_tests[_i].pubkey));
-       chunk_free(&encoding);
-
-       /* compare public keys */
-       public = key->get_public_key(key);
-       ck_assert(public != NULL);
-       ck_assert(public->equals(public, pubkey));
-
-       /* sign */
-       ck_assert(key->sign(key, SIGN_ED25519, sig_tests[_i].msg, &sig));
-       ck_assert(sig.len == 64);
-       ck_assert(chunk_equals(sig, sig_tests[_i].sig));
-
-       /* verify */
-       ck_assert(pubkey->verify(pubkey, SIGN_ED25519, sig_tests[_i].msg,
-                                                                                                  sig_tests[_i].sig));
-
-       /* cleanup */
-       key->destroy(key);
-       pubkey->destroy(pubkey);
-       public->destroy(public);
-       chunk_free(&sig);
-}
-END_TEST
-
-START_TEST(test_curve25519_ed25519_gen)
-{
-       private_key_t *key, *key2;
-       public_key_t *pubkey, *pubkey2;
-       chunk_t msg = chunk_from_str("Ed25519"), sig, encoding, fp_priv, fp_pub;
-
-       /* generate private key */
-       key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
-                                                        BUILD_KEY_SIZE, 256, BUILD_END);
-       ck_assert(key != NULL);
-       ck_assert(key->get_type(key) == KEY_ED25519);
-       ck_assert(key->get_keysize(key) == 256);
-       ck_assert(!key->get_encoding(key, PRIVKEY_PGP, &encoding));
-       ck_assert(key->get_encoding(key, PRIVKEY_PEM, &encoding));
-       ck_assert(encoding.ptr != NULL);
-       ck_assert(strstr(encoding.ptr, "PRIVATE KEY"));
-       chunk_free(&encoding);
-
-       /* clone private key */
-       key2 = key->get_ref(key);
-       ck_assert(key2);
-       key2->destroy(key2);
-
-       /* decryption not supported */
-       ck_assert(!key->decrypt(key, ENCRYPT_UNKNOWN, msg, NULL));
-
-       /* wrong signature scheme */
-       ck_assert(!key->sign(key, SIGN_ED448, msg, &sig));
-
-       /* correct signature scheme*/
-       ck_assert(key->sign(key, SIGN_ED25519, msg, &sig));
-
-       /* export public key */
-       pubkey = key->get_public_key(key);
-       ck_assert(pubkey != NULL);
-       ck_assert(pubkey->get_type(pubkey) == KEY_ED25519);
-       ck_assert(pubkey->get_keysize(pubkey) == 256);
-       ck_assert(pubkey->get_encoding(pubkey, PUBKEY_PEM, &encoding));
-       ck_assert(encoding.ptr != NULL);
-       ck_assert(strstr(encoding.ptr, "PUBLIC KEY"));
-       chunk_free(&encoding);
-
-       /* generate and compare public and private key fingerprints */
-       ck_assert(!key->get_fingerprint(key, KEYID_PGPV4, &fp_priv));
-       ck_assert(key->get_fingerprint(key, KEYID_PUBKEY_SHA1, &fp_priv));
-       ck_assert(key->get_fingerprint(key, KEYID_PUBKEY_SHA1, &fp_priv));
-       ck_assert(fp_priv.ptr != NULL);
-       ck_assert(!pubkey->get_fingerprint(pubkey, KEYID_PGPV4, &fp_pub));
-       ck_assert(pubkey->get_fingerprint(pubkey, KEYID_PUBKEY_SHA1, &fp_pub));
-       ck_assert(pubkey->get_fingerprint(pubkey, KEYID_PUBKEY_SHA1, &fp_pub));
-       ck_assert(fp_pub.ptr != NULL);
-       ck_assert(chunk_equals(fp_pub, fp_priv));
-
-       /* clone public key */
-       pubkey2 = pubkey->get_ref(pubkey);
-       ck_assert(pubkey2 != NULL);
-       pubkey2->destroy(pubkey2);
-
-       /* encryption not supported */
-       ck_assert(!pubkey->encrypt(pubkey, ENCRYPT_UNKNOWN, msg, NULL));
-
-       /* verify with wrong signature scheme */
-       ck_assert(!pubkey->verify(pubkey, SIGN_ED448, msg, sig));
-
-       /* verify with correct signature scheme */
-       ck_assert(pubkey->verify(pubkey, SIGN_ED25519, msg, sig));
-
-       /* cleanup */
-       key->destroy(key);
-       pubkey->destroy(pubkey);
-       chunk_free(&sig);
-}
-END_TEST
-
-START_TEST(test_curve25519_ed25519_speed)
-{
-       private_key_t *key;
-       public_key_t *pubkey;
-       chunk_t msg = chunk_from_str("Hello Ed25519"), sig;
-       struct timespec start, stop;
-       int i, count = 1000;
-
-       /* use /dev/urandom for true random source */
-       lib->settings->set_str(lib->settings,
-                               "libstrongswan.plugins.random.random", "/dev/urandom");
-
-       clock_gettime(CLOCK_THREAD_CPUTIME_ID, &start);
-       for (i = 0; i < count; i++)
-       {
-               key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
-                                                                BUILD_KEY_SIZE, 256, BUILD_END);
-               ck_assert(key != NULL);
-               ck_assert(key->sign(key, SIGN_ED25519, msg, &sig));
-               pubkey = key->get_public_key(key);
-               ck_assert(pubkey != NULL);
-               ck_assert(pubkey->verify(pubkey, SIGN_ED25519, msg, sig));
-               key->destroy(key);
-               pubkey->destroy(pubkey);
-               chunk_free(&sig);
-       }
-       clock_gettime(CLOCK_THREAD_CPUTIME_ID, &stop);
-
-       DBG0(DBG_LIB, "%d Ed25519 keys and signatures in %d ms\n", count,
-                                 (stop.tv_nsec - start.tv_nsec) / 1000000 +
-                                 (stop.tv_sec - start.tv_sec) * 1000);
-
-       /* revert to /dev/random for true random source */
-       lib->settings->set_str(lib->settings,
-                               "libstrongswan.plugins.random.random", "/dev/random");
-}
-END_TEST
-
-static chunk_t zero_pk = chunk_from_chars(
-       0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
-       0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x00, 0x00, 0x00, 0x00);
-
-START_TEST(test_curve25519_ed25519_fail)
-{
-       private_key_t *key;
-       public_key_t *pubkey;
-       chunk_t blob, sig;
-       uint8_t sig1[64];
-
-       /* Invalid private key format */
-       key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
-                                       BUILD_BLOB_ASN1_DER, chunk_empty, BUILD_END);
-       ck_assert(key == NULL);
-
-       key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
-                                       BUILD_EDDSA_PRIV_ASN1_DER, chunk_empty, BUILD_END);
-       ck_assert(key == NULL);
-
-       blob = chunk_from_chars(0x04, 0x01, 0x9d);
-       key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
-                                       BUILD_EDDSA_PRIV_ASN1_DER, blob, BUILD_END);
-       ck_assert(key == NULL);
-
-       /* Invalid public key format */
-       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
-                                       BUILD_BLOB_ASN1_DER, chunk_empty, BUILD_END);
-       ck_assert(pubkey == NULL);
-
-       blob = chunk_from_chars(0x30, 0x0b, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65,
-                                                       0x70, 0x03, 0x02, 0x00, 0xd7);
-       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
-                                       BUILD_BLOB_ASN1_DER, blob, BUILD_END);
-       ck_assert(pubkey == NULL);
-
-       blob = chunk_from_chars(0x30, 0x0b, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x00,
-                                                       0x70, 0x03, 0x02, 0x00, 0xd7);
-       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
-                                       BUILD_BLOB_ASN1_DER, blob, BUILD_END);
-       ck_assert(pubkey == NULL);
-
-       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
-                                       BUILD_KEY_SIZE, 256, BUILD_BLOB_ASN1_DER, blob, BUILD_END);
-       ck_assert(pubkey == NULL);
-
-       /* Invalid signature format */
-       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
-                                       BUILD_BLOB_ASN1_DER, sig_tests[0].pubkey, BUILD_END);
-       ck_assert(pubkey != NULL);
-
-       ck_assert(!pubkey->verify(pubkey, SIGN_ED25519, chunk_empty, chunk_empty));
-
-       /* malformed signature */
-       sig = chunk_create(sig1, 64);
-       memcpy(sig1, sig_tests[0].sig.ptr, 64);
-       sig1[63] |= 0xe0;
-       ck_assert(!pubkey->verify(pubkey, SIGN_ED25519, sig_tests[0].msg, sig));
-
-       /* wrong signature */
-       memcpy(sig1, sig_tests[0].sig.ptr, 64);
-       sig1[0] = 0xe4;
-       ck_assert(!pubkey->verify(pubkey, SIGN_ED25519, sig_tests[0].msg, sig));
-
-       /* detect all-zeroes public key */
-       pubkey->destroy(pubkey);
-       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
-                                       BUILD_BLOB_ASN1_DER, zero_pk, BUILD_END);
-       ck_assert(pubkey != NULL);
-       ck_assert(!pubkey->verify(pubkey, SIGN_ED25519, sig_tests[0].msg, sig));
-       pubkey->destroy(pubkey);
-}
-END_TEST
-
-Suite *curve25519_ed25519_suite_create()
-{
-       Suite *s;
-       TCase *tc;
-
-       s = suite_create("curve25519_ed25519");
-
-       tc = tcase_create("ed25519_sign");
-       tcase_add_loop_test(tc, test_curve25519_ed25519_sign, 0, countof(sig_tests));
-       suite_add_tcase(s, tc);
-
-       tc = tcase_create("ed25519_gen");
-       tcase_add_test(tc, test_curve25519_ed25519_gen);
-       suite_add_tcase(s, tc);
-
-       tc = tcase_create("ed25519_fail");
-       tcase_add_test(tc, test_curve25519_ed25519_fail);
-       suite_add_tcase(s, tc);
-
-       tc = tcase_create("ed25519_speed");
-       test_case_set_timeout(tc, 10);
-       tcase_add_test(tc, test_curve25519_ed25519_speed);
-       suite_add_tcase(s, tc);
-
-       return s;
-}
index caa9d3a..0231c1c 100644 (file)
@@ -55,7 +55,8 @@ tests_SOURCES = tests.h tests.c \
   suites/test_printf.c \
   suites/test_test_rng.c \
   suites/test_mgf1.c \
-  suites/test_ntru.c
+  suites/test_ntru.c \
+  suites/test_ed25519.c
 
 tests_CFLAGS = \
   -I$(top_srcdir)/src/libstrongswan \
diff --git a/src/libstrongswan/tests/suites/test_ed25519.c b/src/libstrongswan/tests/suites/test_ed25519.c
new file mode 100644 (file)
index 0000000..0084262
--- /dev/null
@@ -0,0 +1,527 @@
+/*
+ * Copyright (C) 2016 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "test_suite.h"
+
+#include <time.h>
+
+typedef struct sig_test_t sig_test_t;
+
+struct sig_test_t {
+       chunk_t key;
+       chunk_t pubkey;
+       chunk_t msg;
+       chunk_t sig;
+};
+
+/**
+ * Ed25519 Test Vectors from draft-irtf-cfrg-eddsa
+ */
+static sig_test_t sig_tests[] = {
+       /* Test 1 */
+       { chunk_from_chars(
+               0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b,
+               0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0x9d, 0x61, 0xb1, 0x9d,
+               0xef, 0xfd, 0x5a, 0x60, 0xba, 0x84, 0x4a, 0xf4, 0x92, 0xec,
+               0x2c, 0xc4, 0x44, 0x49, 0xc5, 0x69, 0x7b, 0x32, 0x69, 0x19,
+               0x70, 0x3b, 0xac, 0x03, 0x1c, 0xae, 0x7f, 0x60),
+         chunk_from_chars(
+               0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
+               0x21, 0x00, 0xd7, 0x5a, 0x98, 0x01, 0x82, 0xb1, 0x0a, 0xb7,
+               0xd5, 0x4b, 0xfe, 0xd3, 0xc9, 0x64, 0x07, 0x3a, 0x0e, 0xe1,
+               0x72, 0xf3, 0xda, 0xa6, 0x23, 0x25, 0xaf, 0x02, 0x1a, 0x68,
+               0xf7, 0x07, 0x51, 0x1a),
+         { NULL, 0 },
+         chunk_from_chars(
+               0xe5, 0x56, 0x43, 0x00, 0xc3, 0x60, 0xac, 0x72, 0x90, 0x86,
+               0xe2, 0xcc, 0x80, 0x6e, 0x82, 0x8a, 0x84, 0x87, 0x7f, 0x1e,
+               0xb8, 0xe5, 0xd9, 0x74, 0xd8, 0x73, 0xe0, 0x65, 0x22, 0x49,
+               0x01, 0x55, 0x5f, 0xb8, 0x82, 0x15, 0x90, 0xa3, 0x3b, 0xac,
+               0xc6, 0x1e, 0x39, 0x70, 0x1c, 0xf9, 0xb4, 0x6b, 0xd2, 0x5b,
+               0xf5, 0xf0, 0x59, 0x5b, 0xbe, 0x24, 0x65, 0x51, 0x41, 0x43,
+               0x8e, 0x7a, 0x10, 0x0b)
+       },
+       /* Test 2 */
+       { chunk_from_chars(
+               0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b,
+               0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0x4c, 0xcd, 0x08, 0x9b,
+               0x28, 0xff, 0x96, 0xda, 0x9d, 0xb6, 0xc3, 0x46, 0xec, 0x11,
+               0x4e, 0x0f, 0x5b, 0x8a, 0x31, 0x9f, 0x35, 0xab, 0xa6, 0x24,
+               0xda, 0x8c, 0xf6, 0xed, 0x4f, 0xb8, 0xa6, 0xfb),
+         chunk_from_chars(
+               0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
+               0x21, 0x00, 0x3d, 0x40, 0x17, 0xc3, 0xe8, 0x43, 0x89, 0x5a,
+               0x92, 0xb7, 0x0a, 0xa7, 0x4d, 0x1b, 0x7e, 0xbc, 0x9c, 0x98,
+               0x2c, 0xcf, 0x2e, 0xc4, 0x96, 0x8c, 0xc0, 0xcd, 0x55, 0xf1,
+               0x2a, 0xf4, 0x66, 0x0c),
+         chunk_from_chars(
+               0x72),
+         chunk_from_chars(
+               0x92, 0xa0, 0x09, 0xa9, 0xf0, 0xd4, 0xca, 0xb8, 0x72, 0x0e,
+               0x82, 0x0b, 0x5f, 0x64, 0x25, 0x40, 0xa2, 0xb2, 0x7b, 0x54,
+               0x16, 0x50, 0x3f, 0x8f, 0xb3, 0x76, 0x22, 0x23, 0xeb, 0xdb,
+               0x69, 0xda, 0x08, 0x5a, 0xc1, 0xe4, 0x3e, 0x15, 0x99, 0x6e,
+               0x45, 0x8f, 0x36, 0x13, 0xd0, 0xf1, 0x1d, 0x8c, 0x38, 0x7b,
+               0x2e, 0xae, 0xb4, 0x30, 0x2a, 0xee, 0xb0, 0x0d, 0x29, 0x16,
+               0x12, 0xbb, 0x0c, 0x00)
+       },
+       /* Test 3 */
+       { chunk_from_chars(
+               0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b,
+               0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0xc5, 0xaa, 0x8d, 0xf4,
+               0x3f, 0x9f, 0x83, 0x7b, 0xed, 0xb7, 0x44, 0x2f, 0x31, 0xdc,
+               0xb7, 0xb1, 0x66, 0xd3, 0x85, 0x35,0x07, 0x6f, 0x09, 0x4b,
+               0x85, 0xce, 0x3a, 0x2e, 0x0b, 0x44, 0x58, 0xf7),
+         chunk_from_chars(
+               0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
+               0x21, 0x00, 0xfc, 0x51, 0xcd, 0x8e, 0x62, 0x18, 0xa1, 0xa3,
+               0x8d, 0xa4, 0x7e, 0xd0, 0x02, 0x30, 0xf0, 0x58, 0x08, 0x16,
+               0xed, 0x13, 0xba, 0x33, 0x03, 0xac, 0x5d, 0xeb, 0x91, 0x15,
+               0x48, 0x90, 0x80, 0x25),
+         chunk_from_chars(
+               0xaf, 0x82),
+         chunk_from_chars(
+               0x62, 0x91, 0xd6, 0x57, 0xde, 0xec, 0x24, 0x02, 0x48, 0x27,
+               0xe6, 0x9c, 0x3a, 0xbe, 0x01, 0xa3, 0x0c, 0xe5, 0x48, 0xa2,
+               0x84, 0x74, 0x3a, 0x44, 0x5e, 0x36, 0x80, 0xd7, 0xdb, 0x5a,
+               0xc3, 0xac, 0x18, 0xff, 0x9b, 0x53, 0x8d, 0x16, 0xf2, 0x90,
+               0xae, 0x67, 0xf7, 0x60, 0x98, 0x4d, 0xc6, 0x59, 0x4a, 0x7c,
+               0x15, 0xe9, 0x71, 0x6e, 0xd2, 0x8d, 0xc0, 0x27, 0xbe, 0xce,
+               0xea, 0x1e, 0xc4, 0x0a)
+       },
+       /* Test 1024 */
+       { chunk_from_chars(
+               0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b,
+               0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0xf5, 0xe5, 0x76, 0x7c,
+               0xf1, 0x53, 0x31, 0x95, 0x17, 0x63, 0x0f, 0x22, 0x68, 0x76,
+               0xb8, 0x6c, 0x81, 0x60, 0xcc, 0x58, 0x3b, 0xc0, 0x13, 0x74,
+               0x4c, 0x6b, 0xf2, 0x55, 0xf5, 0xcc, 0x0e, 0xe5),
+         chunk_from_chars(
+               0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
+               0x21, 0x00, 0x27, 0x81, 0x17, 0xfc, 0x14, 0x4c, 0x72, 0x34,
+               0x0f, 0x67, 0xd0, 0xf2, 0x31, 0x6e, 0x83, 0x86, 0xce, 0xff,
+               0xbf, 0x2b, 0x24, 0x28, 0xc9, 0xc5, 0x1f, 0xef, 0x7c, 0x59,
+               0x7f, 0x1d, 0x42, 0x6e),
+         chunk_from_chars(
+               0x08, 0xb8, 0xb2, 0xb7, 0x33, 0x42, 0x42, 0x43, 0x76, 0x0f,
+               0xe4, 0x26, 0xa4, 0xb5, 0x49, 0x08, 0x63, 0x21, 0x10, 0xa6,
+               0x6c, 0x2f, 0x65, 0x91, 0xea, 0xbd, 0x33, 0x45, 0xe3, 0xe4,
+               0xeb, 0x98, 0xfa, 0x6e, 0x26, 0x4b, 0xf0, 0x9e, 0xfe, 0x12,
+               0xee, 0x50, 0xf8, 0xf5, 0x4e, 0x9f, 0x77, 0xb1, 0xe3, 0x55,
+               0xf6, 0xc5, 0x05, 0x44, 0xe2, 0x3f, 0xb1, 0x43, 0x3d, 0xdf,
+               0x73, 0xbe, 0x84, 0xd8, 0x79, 0xde, 0x7c, 0x00, 0x46, 0xdc,
+               0x49, 0x96, 0xd9, 0xe7, 0x73, 0xf4, 0xbc, 0x9e, 0xfe, 0x57,
+               0x38, 0x82, 0x9a, 0xdb, 0x26, 0xc8, 0x1b, 0x37, 0xc9, 0x3a,
+               0x1b, 0x27, 0x0b, 0x20, 0x32, 0x9d, 0x65, 0x86, 0x75, 0xfc,
+
+               0x6e, 0xa5, 0x34, 0xe0, 0x81, 0x0a, 0x44, 0x32, 0x82, 0x6b,
+               0xf5, 0x8c, 0x94, 0x1e, 0xfb, 0x65, 0xd5, 0x7a, 0x33, 0x8b,
+               0xbd, 0x2e, 0x26, 0x64, 0x0f, 0x89, 0xff, 0xbc, 0x1a, 0x85,
+               0x8e, 0xfc, 0xb8, 0x55, 0x0e, 0xe3, 0xa5, 0xe1, 0x99, 0x8b,
+               0xd1, 0x77, 0xe9, 0x3a, 0x73, 0x63, 0xc3, 0x44, 0xfe, 0x6b,
+               0x19, 0x9e, 0xe5, 0xd0, 0x2e, 0x82, 0xd5, 0x22, 0xc4, 0xfe,
+               0xba, 0x15, 0x45, 0x2f, 0x80, 0x28, 0x8a, 0x82, 0x1a, 0x57,
+               0x91, 0x16, 0xec, 0x6d, 0xad, 0x2b, 0x3b, 0x31, 0x0d, 0xa9,
+               0x03, 0x40, 0x1a, 0xa6, 0x21, 0x00, 0xab, 0x5d, 0x1a, 0x36,
+               0x55, 0x3e, 0x06, 0x20, 0x3b, 0x33, 0x89, 0x0c, 0xc9, 0xb8,
+
+               0x32, 0xf7, 0x9e, 0xf8, 0x05, 0x60, 0xcc, 0xb9, 0xa3, 0x9c,
+               0xe7, 0x67, 0x96, 0x7e, 0xd6, 0x28, 0xc6, 0xad, 0x57, 0x3c,
+               0xb1, 0x16, 0xdb, 0xef, 0xef, 0xd7, 0x54, 0x99, 0xda, 0x96,
+               0xbd, 0x68, 0xa8, 0xa9, 0x7b, 0x92, 0x8a, 0x8b, 0xbc, 0x10,
+               0x3b, 0x66, 0x21, 0xfc, 0xde, 0x2b, 0xec, 0xa1, 0x23, 0x1d,
+               0x20, 0x6b, 0xe6, 0xcd, 0x9e, 0xc7, 0xaf, 0xf6, 0xf6, 0xc9,
+               0x4f, 0xcd, 0x72, 0x04, 0xed, 0x34, 0x55, 0xc6, 0x8c, 0x83,
+               0xf4, 0xa4, 0x1d, 0xa4, 0xaf, 0x2b, 0x74, 0xef, 0x5c, 0x53,
+               0xf1, 0xd8, 0xac, 0x70, 0xbd, 0xcb, 0x7e, 0xd1, 0x85, 0xce,
+               0x81, 0xbd, 0x84, 0x35, 0x9d, 0x44, 0x25, 0x4d, 0x95, 0x62,
+
+               0x9e, 0x98, 0x55, 0xa9, 0x4a, 0x7c, 0x19, 0x58, 0xd1, 0xf8,
+               0xad, 0xa5, 0xd0, 0x53, 0x2e, 0xd8, 0xa5, 0xaa, 0x3f, 0xb2,
+               0xd1, 0x7b, 0xa7, 0x0e, 0xb6, 0x24, 0x8e, 0x59, 0x4e, 0x1a,
+               0x22, 0x97, 0xac, 0xbb, 0xb3, 0x9d, 0x50, 0x2f, 0x1a, 0x8c,
+               0x6e, 0xb6, 0xf1, 0xce, 0x22, 0xb3, 0xde, 0x1a, 0x1f, 0x40,
+               0xcc, 0x24, 0x55, 0x41, 0x19, 0xa8, 0x31, 0xa9, 0xaa, 0xd6,
+               0x07, 0x9c, 0xad, 0x88, 0x42, 0x5d, 0xe6, 0xbd, 0xe1, 0xa9,
+               0x18, 0x7e, 0xbb, 0x60, 0x92, 0xcf, 0x67, 0xbf, 0x2b, 0x13,
+               0xfd, 0x65, 0xf2, 0x70, 0x88, 0xd7, 0x8b, 0x7e, 0x88, 0x3c,
+               0x87, 0x59, 0xd2, 0xc4, 0xf5, 0xc6, 0x5a, 0xdb, 0x75, 0x53,
+
+               0x87, 0x8a, 0xd5, 0x75, 0xf9, 0xfa, 0xd8, 0x78, 0xe8, 0x0a,
+               0x0c, 0x9b, 0xa6, 0x3b, 0xcb, 0xcc, 0x27, 0x32, 0xe6, 0x94,
+               0x85, 0xbb, 0xc9, 0xc9, 0x0b, 0xfb, 0xd6, 0x24, 0x81, 0xd9,
+               0x08, 0x9b, 0xec, 0xcf, 0x80, 0xcf, 0xe2, 0xdf, 0x16, 0xa2,
+               0xcf, 0x65, 0xbd, 0x92, 0xdd, 0x59, 0x7b, 0x07, 0x07, 0xe0,
+               0x91, 0x7a, 0xf4, 0x8b, 0xbb, 0x75, 0xfe, 0xd4, 0x13, 0xd2,
+               0x38, 0xf5, 0x55, 0x5a, 0x7a, 0x56, 0x9d, 0x80, 0xc3, 0x41,
+               0x4a, 0x8d, 0x08, 0x59, 0xdc, 0x65, 0xa4, 0x61, 0x28, 0xba,
+               0xb2, 0x7a, 0xf8, 0x7a, 0x71, 0x31, 0x4f, 0x31, 0x8c, 0x78,
+               0x2b, 0x23, 0xeb, 0xfe, 0x80, 0x8b, 0x82, 0xb0, 0xce, 0x26,
+
+               0x40, 0x1d, 0x2e, 0x22, 0xf0, 0x4d, 0x83, 0xd1, 0x25, 0x5d,
+               0xc5, 0x1a, 0xdd, 0xd3, 0xb7, 0x5a, 0x2b, 0x1a, 0xe0, 0x78,
+               0x45, 0x04, 0xdf, 0x54, 0x3a, 0xf8, 0x96, 0x9b, 0xe3, 0xea,
+               0x70, 0x82, 0xff, 0x7f, 0xc9, 0x88, 0x8c, 0x14, 0x4d, 0xa2,
+               0xaf, 0x58, 0x42, 0x9e, 0xc9, 0x60, 0x31, 0xdb, 0xca, 0xd3,
+               0xda, 0xd9, 0xaf, 0x0d, 0xcb, 0xaa, 0xaf, 0x26, 0x8c, 0xb8,
+               0xfc, 0xff, 0xea, 0xd9, 0x4f, 0x3c, 0x7c, 0xa4, 0x95, 0xe0,
+               0x56, 0xa9, 0xb4, 0x7a, 0xcd, 0xb7, 0x51, 0xfb, 0x73, 0xe6,
+               0x66, 0xc6, 0xc6, 0x55, 0xad, 0xe8, 0x29, 0x72, 0x97, 0xd0,
+               0x7a, 0xd1, 0xba, 0x5e, 0x43, 0xf1, 0xbc, 0xa3, 0x23, 0x01,
+
+               0x65, 0x13, 0x39, 0xe2, 0x29, 0x04, 0xcc, 0x8c, 0x42, 0xf5,
+               0x8c, 0x30, 0xc0, 0x4a, 0xaf, 0xdb, 0x03, 0x8d, 0xda, 0x08,
+               0x47, 0xdd, 0x98, 0x8d, 0xcd, 0xa6, 0xf3, 0xbf, 0xd1, 0x5c,
+               0x4b, 0x4c, 0x45, 0x25, 0x00, 0x4a, 0xa0, 0x6e, 0xef, 0xf8,
+               0xca, 0x61, 0x78, 0x3a, 0xac, 0xec, 0x57, 0xfb, 0x3d, 0x1f,
+               0x92, 0xb0, 0xfe, 0x2f, 0xd1, 0xa8, 0x5f, 0x67, 0x24, 0x51,
+               0x7b, 0x65, 0xe6, 0x14, 0xad, 0x68, 0x08, 0xd6, 0xf6, 0xee,
+               0x34, 0xdf, 0xf7, 0x31, 0x0f, 0xdc, 0x82, 0xae, 0xbf, 0xd9,
+               0x04, 0xb0, 0x1e, 0x1d, 0xc5, 0x4b, 0x29, 0x27, 0x09, 0x4b,
+               0x2d, 0xb6, 0x8d, 0x6f, 0x90, 0x3b, 0x68, 0x40, 0x1a, 0xde,
+
+               0xbf, 0x5a, 0x7e, 0x08, 0xd7, 0x8f, 0xf4, 0xef, 0x5d, 0x63,
+               0x65, 0x3a, 0x65, 0x04, 0x0c, 0xf9, 0xbf, 0xd4, 0xac, 0xa7,
+               0x98, 0x4a, 0x74, 0xd3, 0x71, 0x45, 0x98, 0x67, 0x80, 0xfc,
+               0x0b, 0x16, 0xac, 0x45, 0x16, 0x49, 0xde, 0x61, 0x88, 0xa7,
+               0xdb, 0xdf, 0x19, 0x1f, 0x64, 0xb5, 0xfc, 0x5e, 0x2a, 0xb4,
+               0x7b, 0x57, 0xf7, 0xf7, 0x27, 0x6c, 0xd4, 0x19, 0xc1, 0x7a,
+               0x3c, 0xa8, 0xe1, 0xb9, 0x39, 0xae, 0x49, 0xe4, 0x88, 0xac,
+               0xba, 0x6b, 0x96, 0x56, 0x10, 0xb5, 0x48, 0x01, 0x09, 0xc8,
+               0xb1, 0x7b, 0x80, 0xe1, 0xb7, 0xb7, 0x50, 0xdf, 0xc7, 0x59,
+               0x8d, 0x5d, 0x50, 0x11, 0xfd, 0x2d, 0xcc, 0x56, 0x00, 0xa3,
+
+               0x2e, 0xf5, 0xb5, 0x2a, 0x1e, 0xcc, 0x82, 0x0e, 0x30, 0x8a,
+               0xa3, 0x42, 0x72, 0x1a, 0xac, 0x09, 0x43, 0xbf, 0x66, 0x86,
+               0xb6, 0x4b, 0x25, 0x79, 0x37, 0x65, 0x04, 0xcc, 0xc4, 0x93,
+               0xd9, 0x7e, 0x6a, 0xed, 0x3f, 0xb0, 0xf9, 0xcd, 0x71, 0xa4,
+               0x3d, 0xd4, 0x97, 0xf0, 0x1f, 0x17, 0xc0, 0xe2, 0xcb, 0x37,
+               0x97, 0xaa, 0x2a, 0x2f, 0x25, 0x66, 0x56, 0x16, 0x8e, 0x6c,
+               0x49, 0x6a, 0xfc, 0x5f, 0xb9, 0x32, 0x46, 0xf6, 0xb1, 0x11,
+               0x63, 0x98, 0xa3, 0x46, 0xf1, 0xa6, 0x41, 0xf3, 0xb0, 0x41,
+               0xe9, 0x89, 0xf7, 0x91, 0x4f, 0x90, 0xcc, 0x2c, 0x7f, 0xff,
+               0x35, 0x78, 0x76, 0xe5, 0x06, 0xb5, 0x0d, 0x33, 0x4b, 0xa7,
+
+               0x7c, 0x22, 0x5b, 0xc3, 0x07, 0xba, 0x53, 0x71, 0x52, 0xf3,
+               0xf1, 0x61, 0x0e, 0x4e, 0xaf, 0xe5, 0x95, 0xf6, 0xd9, 0xd9,
+               0x0d, 0x11, 0xfa, 0xa9, 0x33, 0xa1, 0x5e, 0xf1, 0x36, 0x95,
+               0x46, 0x86, 0x8a, 0x7f, 0x3a, 0x45, 0xa9, 0x67, 0x68, 0xd4,
+               0x0f, 0xd9, 0xd0, 0x34, 0x12, 0xc0, 0x91, 0xc6, 0x31, 0x5c,
+               0xf4, 0xfd, 0xe7, 0xcb, 0x68, 0x60, 0x69, 0x37, 0x38, 0x0d,
+               0xb2, 0xea, 0xaa, 0x70, 0x7b, 0x4c, 0x41, 0x85, 0xc3, 0x2e,
+               0xdd, 0xcd, 0xd3, 0x06, 0x70, 0x5e, 0x4d, 0xc1, 0xff, 0xc8,
+               0x72, 0xee, 0xee, 0x47, 0x5a, 0x64, 0xdf, 0xac, 0x86, 0xab,
+               0xa4, 0x1c, 0x06, 0x18, 0x98, 0x3f, 0x87, 0x41, 0xc5, 0xef,
+
+               0x68, 0xd3, 0xa1, 0x01, 0xe8, 0xa3, 0xb8, 0xca, 0xc6, 0x0c,
+               0x90, 0x5c, 0x15, 0xfc, 0x91, 0x08, 0x40, 0xb9, 0x4c, 0x00,
+               0xa0, 0xb9, 0xd0),
+         chunk_from_chars(
+               0x0a, 0xab, 0x4c, 0x90, 0x05, 0x01, 0xb3, 0xe2, 0x4d, 0x7c,
+               0xdf, 0x46, 0x63, 0x32, 0x6a, 0x3a, 0x87, 0xdf, 0x5e, 0x48,
+               0x43, 0xb2, 0xcb, 0xdb, 0x67, 0xcb, 0xf6, 0xe4, 0x60, 0xfe,
+               0xc3, 0x50, 0xaa, 0x53, 0x71, 0xb1, 0x50, 0x8f, 0x9f, 0x45,
+               0x28, 0xec, 0xea, 0x23, 0xc4, 0x36, 0xd9, 0x4b, 0x5e, 0x8f,
+               0xcd, 0x4f, 0x68, 0x1e, 0x30, 0xa6, 0xac, 0x00, 0xa9, 0x70,
+               0x4a, 0x18, 0x8a, 0x03)
+       },
+       /* Test SHA(abc) */
+       { chunk_from_chars(
+               0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b,
+               0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0x83, 0x3f, 0xe6, 0x24,
+               0x09, 0x23, 0x7b, 0x9d, 0x62, 0xec, 0x77, 0x58, 0x75, 0x20,
+               0x91, 0x1e, 0x9a, 0x75, 0x9c, 0xec, 0x1d, 0x19, 0x75, 0x5b,
+               0x7d, 0xa9, 0x01, 0xb9, 0x6d, 0xca, 0x3d, 0x42),
+         chunk_from_chars(
+               0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
+               0x21, 0x00, 0xec, 0x17, 0x2b, 0x93, 0xad, 0x5e, 0x56, 0x3b,
+               0xf4, 0x93, 0x2c, 0x70, 0xe1, 0x24, 0x50, 0x34, 0xc3, 0x54,
+               0x67, 0xef, 0x2e, 0xfd, 0x4d, 0x64, 0xeb, 0xf8, 0x19, 0x68,
+               0x34, 0x67, 0xe2, 0xbf),
+         chunk_from_chars(
+               0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba, 0xcc, 0x41,
+               0x73, 0x49, 0xae, 0x20, 0x41, 0x31, 0x12, 0xe6, 0xfa, 0x4e,
+               0x89, 0xa9, 0x7e, 0xa2, 0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55,
+               0xd3, 0x9a, 0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8,
+               0x36, 0xba, 0x3c, 0x23, 0xa3, 0xfe, 0xeb, 0xbd, 0x45, 0x4d,
+               0x44, 0x23, 0x64, 0x3c, 0xe8, 0x0e, 0x2a, 0x9a, 0xc9, 0x4f,
+               0xa5, 0x4c, 0xa4, 0x9f),
+         chunk_from_chars(
+               0xdc, 0x2a, 0x44, 0x59, 0xe7, 0x36, 0x96, 0x33, 0xa5, 0x2b,
+               0x1b, 0xf2, 0x77, 0x83, 0x9a, 0x00, 0x20, 0x10, 0x09, 0xa3,
+               0xef, 0xbf, 0x3e, 0xcb, 0x69, 0xbe, 0xa2, 0x18, 0x6c, 0x26,
+               0xb5, 0x89, 0x09, 0x35, 0x1f, 0xc9, 0xac, 0x90, 0xb3, 0xec,
+               0xfd, 0xfb, 0xc7, 0xc6, 0x64, 0x31, 0xe0, 0x30, 0x3d, 0xca,
+               0x17, 0x9c, 0x13, 0x8a, 0xc1, 0x7a, 0xd9, 0xbe, 0xf1, 0x17,
+               0x73, 0x31, 0xa7, 0x04)
+       }
+};
+
+START_TEST(test_ed25519_sign)
+{
+       private_key_t *key;
+       public_key_t *pubkey, *public;
+       chunk_t sig, encoding;
+
+       /* load private key */
+       key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
+                                       BUILD_BLOB_ASN1_DER, sig_tests[_i].key, BUILD_END);
+       ck_assert(key != NULL);
+       ck_assert(key->get_encoding(key, PRIVKEY_ASN1_DER, &encoding));
+       ck_assert(chunk_equals(encoding, sig_tests[_i].key));
+       chunk_free(&encoding);
+
+       /* load public key */
+       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
+                                       BUILD_BLOB_ASN1_DER, sig_tests[_i].pubkey, BUILD_END);
+       ck_assert(pubkey != NULL);
+       ck_assert(pubkey->get_encoding(pubkey, PUBKEY_SPKI_ASN1_DER, &encoding));
+       ck_assert(chunk_equals(encoding, sig_tests[_i].pubkey));
+       chunk_free(&encoding);
+
+       /* compare public keys */
+       public = key->get_public_key(key);
+       ck_assert(public != NULL);
+       ck_assert(public->equals(public, pubkey));
+
+       /* sign */
+       ck_assert(key->sign(key, SIGN_ED25519, sig_tests[_i].msg, &sig));
+       ck_assert(sig.len == 64);
+       ck_assert(chunk_equals(sig, sig_tests[_i].sig));
+
+       /* verify */
+       ck_assert(pubkey->verify(pubkey, SIGN_ED25519, sig_tests[_i].msg,
+                                                                                                  sig_tests[_i].sig));
+
+       /* cleanup */
+       key->destroy(key);
+       pubkey->destroy(pubkey);
+       public->destroy(public);
+       chunk_free(&sig);
+}
+END_TEST
+
+START_TEST(test_ed25519_gen)
+{
+       private_key_t *key, *key2;
+       public_key_t *pubkey, *pubkey2;
+       chunk_t msg = chunk_from_str("Ed25519"), sig, encoding, fp_priv, fp_pub;
+
+       /* generate private key */
+       key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
+                                                        BUILD_KEY_SIZE, 256, BUILD_END);
+       ck_assert(key != NULL);
+       ck_assert(key->get_type(key) == KEY_ED25519);
+       ck_assert(key->get_keysize(key) == 256);
+       ck_assert(!key->get_encoding(key, PRIVKEY_PGP, &encoding));
+       ck_assert(key->get_encoding(key, PRIVKEY_PEM, &encoding));
+       ck_assert(encoding.ptr != NULL);
+       ck_assert(strstr(encoding.ptr, "PRIVATE KEY"));
+       chunk_free(&encoding);
+
+       /* clone private key */
+       key2 = key->get_ref(key);
+       ck_assert(key2);
+       key2->destroy(key2);
+
+       /* decryption not supported */
+       ck_assert(!key->decrypt(key, ENCRYPT_UNKNOWN, msg, NULL));
+
+       /* wrong signature scheme */
+       ck_assert(!key->sign(key, SIGN_ED448, msg, &sig));
+
+       /* correct signature scheme*/
+       ck_assert(key->sign(key, SIGN_ED25519, msg, &sig));
+
+       /* export public key */
+       pubkey = key->get_public_key(key);
+       ck_assert(pubkey != NULL);
+       ck_assert(pubkey->get_type(pubkey) == KEY_ED25519);
+       ck_assert(pubkey->get_keysize(pubkey) == 256);
+       ck_assert(pubkey->get_encoding(pubkey, PUBKEY_PEM, &encoding));
+       ck_assert(encoding.ptr != NULL);
+       ck_assert(strstr(encoding.ptr, "PUBLIC KEY"));
+       chunk_free(&encoding);
+
+       /* generate and compare public and private key fingerprints */
+       ck_assert(!key->get_fingerprint(key, KEYID_PGPV4, &fp_priv));
+       ck_assert(key->get_fingerprint(key, KEYID_PUBKEY_SHA1, &fp_priv));
+       ck_assert(key->get_fingerprint(key, KEYID_PUBKEY_SHA1, &fp_priv));
+       ck_assert(fp_priv.ptr != NULL);
+       ck_assert(!pubkey->get_fingerprint(pubkey, KEYID_PGPV4, &fp_pub));
+       ck_assert(pubkey->get_fingerprint(pubkey, KEYID_PUBKEY_SHA1, &fp_pub));
+       ck_assert(pubkey->get_fingerprint(pubkey, KEYID_PUBKEY_SHA1, &fp_pub));
+       ck_assert(fp_pub.ptr != NULL);
+       ck_assert(chunk_equals(fp_pub, fp_priv));
+
+       /* clone public key */
+       pubkey2 = pubkey->get_ref(pubkey);
+       ck_assert(pubkey2 != NULL);
+       pubkey2->destroy(pubkey2);
+
+       /* encryption not supported */
+       ck_assert(!pubkey->encrypt(pubkey, ENCRYPT_UNKNOWN, msg, NULL));
+
+       /* verify with wrong signature scheme */
+       ck_assert(!pubkey->verify(pubkey, SIGN_ED448, msg, sig));
+
+       /* verify with correct signature scheme */
+       ck_assert(pubkey->verify(pubkey, SIGN_ED25519, msg, sig));
+
+       /* cleanup */
+       key->destroy(key);
+       pubkey->destroy(pubkey);
+       chunk_free(&sig);
+}
+END_TEST
+
+START_TEST(test_ed25519_speed)
+{
+       private_key_t *key;
+       public_key_t *pubkey;
+       chunk_t msg = chunk_from_str("Hello Ed25519"), sig;
+       int i, count = 1000;
+
+#ifdef HAVE_CLOCK_GETTIME
+       struct timespec start, stop;
+       clock_gettime(CLOCK_THREAD_CPUTIME_ID, &start);
+#endif
+
+       for (i = 0; i < count; i++)
+       {
+               key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
+                                                                BUILD_KEY_SIZE, 256, BUILD_END);
+               ck_assert(key != NULL);
+               ck_assert(key->sign(key, SIGN_ED25519, msg, &sig));
+               pubkey = key->get_public_key(key);
+               ck_assert(pubkey != NULL);
+               ck_assert(pubkey->verify(pubkey, SIGN_ED25519, msg, sig));
+               key->destroy(key);
+               pubkey->destroy(pubkey);
+               chunk_free(&sig);
+       }
+
+#ifdef HAVE_CLOCK_GETTIME
+       clock_gettime(CLOCK_THREAD_CPUTIME_ID, &stop);
+       DBG0(DBG_LIB, "%d Ed25519 keys and signatures in %d ms\n", count,
+                                 (stop.tv_nsec - start.tv_nsec) / 1000000 +
+                                 (stop.tv_sec - start.tv_sec) * 1000);
+#endif
+}
+END_TEST
+
+static chunk_t zero_pk = chunk_from_chars(
+       0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03,
+       0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00);
+
+START_TEST(test_ed25519_fail)
+{
+       private_key_t *key;
+       public_key_t *pubkey;
+       chunk_t blob, sig;
+       uint8_t sig1[64];
+
+       /* Invalid private key format */
+       key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
+                                       BUILD_BLOB_ASN1_DER, chunk_empty, BUILD_END);
+       ck_assert(key == NULL);
+
+       key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
+                                       BUILD_EDDSA_PRIV_ASN1_DER, chunk_empty, BUILD_END);
+       ck_assert(key == NULL);
+
+       blob = chunk_from_chars(0x04, 0x01, 0x9d);
+       key = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ED25519,
+                                       BUILD_EDDSA_PRIV_ASN1_DER, blob, BUILD_END);
+       ck_assert(key == NULL);
+
+       /* Invalid public key format */
+       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
+                                       BUILD_BLOB_ASN1_DER, chunk_empty, BUILD_END);
+       ck_assert(pubkey == NULL);
+
+       blob = chunk_from_chars(0x30, 0x0b, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65,
+                                                       0x70, 0x03, 0x02, 0x00, 0xd7);
+       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
+                                       BUILD_BLOB_ASN1_DER, blob, BUILD_END);
+       ck_assert(pubkey == NULL);
+
+       blob = chunk_from_chars(0x30, 0x0b, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x00,
+                                                       0x70, 0x03, 0x02, 0x00, 0xd7);
+       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
+                                       BUILD_BLOB_ASN1_DER, blob, BUILD_END);
+       ck_assert(pubkey == NULL);
+
+       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
+                                       BUILD_KEY_SIZE, 256, BUILD_BLOB_ASN1_DER, blob, BUILD_END);
+       ck_assert(pubkey == NULL);
+
+       /* Invalid signature format */
+       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
+                                       BUILD_BLOB_ASN1_DER, sig_tests[0].pubkey, BUILD_END);
+       ck_assert(pubkey != NULL);
+
+       ck_assert(!pubkey->verify(pubkey, SIGN_ED25519, chunk_empty, chunk_empty));
+
+       /* malformed signature */
+       sig = chunk_create(sig1, 64);
+       memcpy(sig1, sig_tests[0].sig.ptr, 64);
+       sig1[63] |= 0xe0;
+       ck_assert(!pubkey->verify(pubkey, SIGN_ED25519, sig_tests[0].msg, sig));
+
+       /* wrong signature */
+       memcpy(sig1, sig_tests[0].sig.ptr, 64);
+       sig1[0] = 0xe4;
+       ck_assert(!pubkey->verify(pubkey, SIGN_ED25519, sig_tests[0].msg, sig));
+
+       /* detect all-zeroes public key */
+       pubkey->destroy(pubkey);
+       pubkey = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ED25519,
+                                       BUILD_BLOB_ASN1_DER, zero_pk, BUILD_END);
+       ck_assert(pubkey != NULL);
+       ck_assert(!pubkey->verify(pubkey, SIGN_ED25519, sig_tests[0].msg, sig));
+       pubkey->destroy(pubkey);
+}
+END_TEST
+
+Suite *ed25519_suite_create()
+{
+       Suite *s;
+       TCase *tc;
+
+       s = suite_create("ed25519");
+
+       tc = tcase_create("ed25519_sign");
+       tcase_add_loop_test(tc, test_ed25519_sign, 0, countof(sig_tests));
+       suite_add_tcase(s, tc);
+
+       tc = tcase_create("ed25519_gen");
+       tcase_add_test(tc, test_ed25519_gen);
+       suite_add_tcase(s, tc);
+
+       tc = tcase_create("ed25519_fail");
+       tcase_add_test(tc, test_ed25519_fail);
+       suite_add_tcase(s, tc);
+
+       tc = tcase_create("ed25519_speed");
+       test_case_set_timeout(tc, 10);
+       tcase_add_test(tc, test_ed25519_speed);
+       suite_add_tcase(s, tc);
+
+       return s;
+}
index fabfaa8..79a88e2 100644 (file)
@@ -50,3 +50,5 @@ TEST_SUITE_DEPEND(mgf1_sha1_suite_create, XOF, XOF_MGF1_SHA1)
 TEST_SUITE_DEPEND(mgf1_sha256_suite_create, XOF, XOF_MGF1_SHA256)
 TEST_SUITE_DEPEND(ntru_suite_create, DH, NTRU_112_BIT)
 TEST_SUITE_DEPEND(fetch_http_suite_create, FETCHER, "http://")
+TEST_SUITE_DEPEND(ed25519_suite_create, PRIVKEY_GEN, KEY_ED25519)
+