Make the `dh' property be listish

(This was originally only part of a larger commit by Mark Wooding;
I (Ian Jackson) have split it out.)

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/README.make-secnet-sites b/README.make-secnet-sites
index a1949065ed2430dfe99d86d3fc0777972bd32b62..2264d7501fc16b443b47b40c46cb8034db07a0fb 100644 (file)
--- a/README.make-secnet-sites
+++ b/README.make-secnet-sites
@@ -193,7 +193,9 @@ INPUT SYNTAX
                MODULUS and GENERATOR are given, the closure is
                constructed as `diffie-hellman(P, G)'.  If a GROUP-NAME
                is given, it must be one of `x25519' or `x448', and the
-               like-named pre-existing DH closure is used.
+               like-named pre-existing DH closure is used.  This is a
+               listish property: it can be set more than once and the
+               values are accumulated into a list in the output.
 
                Acceptable at all levels; required at site level.
 

diff --git a/make-secnet-sites b/make-secnet-sites
index e10f7fcd5270191300ddc53f6c349a3d029d31a4..ad96560001ce6f6c1ac4e1e0b803e18bf0f94789 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -660,7 +660,7 @@ def somepubkey(w):
 # Possible properties of configuration nodes
 keywords={
  'contact':(email,"Contact address"),
- 'dh':(dhgroup,"Diffie-Hellman group"),
+ 'dh':(listof(dhgroup),"Diffie-Hellman group"),
  'hash':(hash,"Hash function"),
  'key-lifetime':(num,"Maximum key lifetime (ms)"),
  'setup-timeout':(num,"Key setup timeout (ms)"),