xdh: End-to-end tests for the new DH key agreement groups

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/stest/common.tcl b/stest/common.tcl
index 5d4518302f407afd617cef387a3f3ff64acb5ff7..00e0e759dde128990fd4acdc0cc2f81ab3365bde 100644 (file)
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -365,6 +365,11 @@ proc adj-after {timeout args} {
     eval after $timeout $args
 }
 
+proc sitesconf-hook-dh {l dh} {
+    regsub {^\s+dh .*$} $l "dh $dh;\n" l
+    return $l
+}
+
 proc test-kex {} {
     udp-proxy
     spawn-secnet in inside

diff --git a/stest/t-dh-x25519 b/stest/t-dh-x25519
new file mode 100755 (executable)
index 0000000..3df0b4b
--- /dev/null
+++ b/stest/t-dh-x25519
@@ -0,0 +1,7 @@
+#! /usr/bin/tclsh
+
+source stest/common.tcl
+
+proc sitesconf_hook {l} { return [sitesconf-hook-dh $l x25519] }
+
+test-kex

diff --git a/stest/t-dh-x448 b/stest/t-dh-x448
new file mode 100755 (executable)
index 0000000..ca6e654
--- /dev/null
+++ b/stest/t-dh-x448
@@ -0,0 +1,7 @@
+#! /usr/bin/tclsh
+
+source stest/common.tcl
+
+proc sitesconf_hook {l} { return [sitesconf-hook-dh $l x448] }
+
+test-kex