The key change here is to make the `normal' test-exampple/sites.conf
file be new-style, with peer-keys entries.
We also switch the tests to use the old-style file. So the tests in
fact run just as before.
The directory we give to make-secnet-sites is already mkdir'd, and
cleaned, appropriately.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
test-example/*.privkeys
test-example/pubkeys
test-example/sites.conf
+test-example/sites-nonego.conf
test-example/bogus-setup-request
build-stamp
&DEPS += &^ common.tcl
&DEPS += secnet
&DEPS += test-example/sites.conf
+&DEPS += test-example/sites-nonego.conf
&DEPS += test-example/inside.key
&DEPS += test-example/outside.key
&DEPS += test-example/all-privkeys
"
}
* {
- set sitesconf sites.conf
+ set sitesconf sites-nonego.conf
append cfg "
local-key rsa-private(\"$builddir/$privkey\");
"
-&TARGETS += & sites.conf inside.key outside.key rsa1-sites2.key all-privkeys
+&TARGETS += & sites.conf sites-nonego.conf
+&TARGETS += & inside.key outside.key rsa1-sites2.key all-privkeys
include common.make
&/%.key: &^/%.key.b64
base64 -d <$< >$@.new && mv -f $@.new $@
+&sites-nonego.conf: $(src)/make-secnet-sites &^/sites &/Dir.mk
+ $(src)/make-secnet-sites --output-version=1 &^/sites $@
+
&sites.conf: $(src)/make-secnet-sites &^/sites &/Dir.mk
mkdir -p &pubkeys
- $(src)/make-secnet-sites --output-version=1 &^/sites $@
+ &~/make-secnet-sites --pubkeys-dir=&pubkeys --pubkeys-install \
+ &^/sites $@.tmp && mv -f $@.tmp $@
&clean::
rm -rf &pubkeys