stest: Provide a global `hash' key

[secnet.git] / stest / common.tcl

diff --git a/stest/common.tcl b/stest/common.tcl
index 7891e1d4a4901ce696242b550c92a2767b1a0eb9..328cb016a6b8b15b3759e5c44c16cd46c3f9547b 100644 (file)
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -54,6 +54,7 @@ exec cat
 "
     close $fakeuh
     set cfg "
+       hash sha1;
        netlink userv-ipif {
            name \"netlink\";
             userv-path \"$fakeuf\";
@@ -96,13 +97,22 @@ exec cat
        transform eax-serpent { }, serpent256-cbc { };
     }
 
+    set pubkeys $tmp/$site.pubkeys
+    file delete -force $pubkeys
+    exec cp -rl $builddir/test-example/pubkeys $pubkeys
+
     set f [open $builddir/test-example/sites.conf r]
+    while {[gets $f l] >= 0} {
+       regsub {\"[^\"]*test-example/pubkeys/} $l "\"$pubkeys/" l
+       append cfg $l "\n"
+    }
     set sites [read $f]
     close $f
     append cfg $sites
     append cfg {
        sites map(site,all-sites);
     }
+
     return $cfg
 }