logging: Move "starting" message earlier

[secnet.git] / stest / t-nonnego-oo

diff --git a/stest/t-nonnego-oo b/stest/t-nonnego-oo
index b47184401ef239cfea1b0731363e823797f0d84b..1633d6a408f4e1f4683e2e5bb6833e60d10d99c8 100755 (executable)
--- a/stest/t-nonnego-oo
+++ b/stest/t-nonnego-oo
@@ -3,11 +3,22 @@
 source stest/common.tcl
 
 # `non-negotiating' ends:
-set privkey(inside) test-example/inside.key
-set privkey(outside) test-example/outside.key
+set privkey(inside) {load-private rsa1 test-example/inside.key}
+set privkey(outside) {load-private rsa1 test-example/outside.key}
 # So old, old; ie -oo
 
 # 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