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

[secnet.git] / stest / common.tcl

diff --git a/stest/common.tcl b/stest/common.tcl
index 7891e1d4a4901ce696242b550c92a2767b1a0eb9..cbf8fc1fae8902a7c60bc945bddfd30d31d3441c 100644 (file)
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -25,6 +25,11 @@ set extra(inside) {
 }
 set extra(outside) {}
 
+set privkey(inside) test-example/inside.privkeys/
+set privkey(outside) test-example/outside.privkeys/
+
+proc sitesconf_hook {l} { return $l }
+
 proc mkconf {location site} {
     global tmp
     global builddir
@@ -32,6 +37,7 @@ proc mkconf {location site} {
     global ports
     global extra
     global netlinkfh
+    upvar #0 privkey($site) privkey
     set pipefp $tmp/$site.netlink
     foreach tr {t r} {
        file delete $pipefp.$tr
@@ -54,6 +60,7 @@ exec cat
 "
     close $fakeuh
     set cfg "
+       hash sha1;
        netlink userv-ipif {
            name \"netlink\";
             userv-path \"$fakeuf\";
@@ -77,8 +84,25 @@ exec cat
     }
     append cfg ";
        local-name \"test-example/$location/$site\";
-       local-key rsa-private(\"$builddir/test-example/$site.key\");
 "
+    switch -glob $privkey {
+       */ {
+           set sitesconf sites.conf
+           append cfg "
+               key-cache priv-cache({
+                   privkeys \"$builddir/${privkey}priv.\";
+                });
+"
+       }
+       * {
+           set sitesconf sites-nonego.conf
+           append cfg "
+               local-key rsa-private(\"$builddir/$privkey\");
+"
+       }
+    }
+    set sitesconf $builddir/test-example/$sitesconf
+    
     append cfg $extra($site)
     append cfg "
        log logfile {
@@ -96,13 +120,23 @@ exec cat
        transform eax-serpent { }, serpent256-cbc { };
     }
 
-    set f [open $builddir/test-example/sites.conf r]
+    set pubkeys $tmp/$site.pubkeys
+    file delete -force $pubkeys
+    exec cp -rl $builddir/test-example/pubkeys $pubkeys
+
+    set f [open $sitesconf r]
+    while {[gets $f l] >= 0} {
+       regsub {\"[^\"]*test-example/pubkeys/} $l "\"$pubkeys/" l
+       set l [sitesconf_hook $l]
+       append cfg $l "\n"
+    }
     set sites [read $f]
     close $f
     append cfg $sites
     append cfg {
        sites map(site,all-sites);
     }
+
     return $cfg
 }