stest/t-nonnego-oo: Use `make-public' verb

This was previously untested.  It is awkward to get make-secnet-sites
to generate this right now because it wants to generate `rsa-public'
calls for rsa1 keys for compatibility reasons.

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

diff --git a/stest/Subdir.sd.mk b/stest/Subdir.sd.mk
index 5ad6c0c444895a5a0f1d5e2564c2fd0f12642856..f3c0685ded6dcc7da4c4eeabe3a2d6077253be9c 100644 (file)
--- a/stest/Subdir.sd.mk
+++ b/stest/Subdir.sd.mk
@@ -4,6 +4,7 @@
 &DEPS += & udp-preload.so
 &DEPS += &^ common.tcl
 &DEPS += secnet
+&DEPS += base91s/base91s
 &DEPS += test-example/sites.conf
 &DEPS += test-example/sites-nonego.conf
 &DEPS += $(test-example_PRIVKEYS)

diff --git a/stest/t-nonnego-oo b/stest/t-nonnego-oo
index b47184401ef239cfea1b0731363e823797f0d84b..ab96827cca2d914edb110c9b08d16812c23ab2b5 100755 (executable)
--- a/stest/t-nonnego-oo
+++ b/stest/t-nonnego-oo
@@ -10,4 +10,15 @@ set privkey(outside) test-example/outside.key
 # There is no -no because the sites file tells a new inside to expect
 # a different key.
 
+proc sitesconf_hook {l} {
+    global builddir
+    # Use `make-public' verb, so we have a test case for it
+    if {[regexp {^(.* key )rsa-public\("(\d+)","(\d+)"\)(;.*)$} \
+            $l dummy lhs rsa_e rsa_n rhs]} {
+       set b91 [exec $builddir/base91s/base91s -w0 << "42 $rsa_e $rsa_n"]
+       set l "${lhs}make-public(\"rsa1\",\"$b91\")${rhs}"
+    }
+    return $l
+}
+
 test-kex