test-example: Test new long-term key arrangements

[secnet.git] / stest / common.tcl

diff --git a/stest/common.tcl b/stest/common.tcl
index 9a7e38f4525391b8603f32d37e5d2c40dc17418f..fb98c2ecf5edfb11051572f0031792912c398523 100644 (file)
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -25,8 +25,8 @@ set extra(inside) {
 }
 set extra(outside) {}
 
-set privkey(inside) test-example/inside.key
-set privkey(outside) test-example/outside.key
+set privkey(inside) test-example/inside.privkeys/
+set privkey(outside) test-example/outside.privkeys/
 
 proc mkconf {location site} {
     global tmp
@@ -85,6 +85,7 @@ exec cat
 "
     switch -glob $privkey {
        */ {
+           set sitesconf sites.conf
            append cfg "
                key-cache priv-cache({
                    privkeys \"$builddir/${privkey}priv.\";
@@ -92,11 +93,13 @@ exec cat
 "
        }
        * {
+           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 "
@@ -119,7 +122,7 @@ exec cat
     file delete -force $pubkeys
     exec cp -rl $builddir/test-example/pubkeys $pubkeys
 
-    set f [open $builddir/test-example/sites.conf r]
+    set f [open $sitesconf r]
     while {[gets $f l] >= 0} {
        regsub {\"[^\"]*test-example/pubkeys/} $l "\"$pubkeys/" l
        append cfg $l "\n"