From 82381532d402beb4d23bcc2bdec3756ff2cac020 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Thu, 2 Jan 2020 00:05:17 +0000 Subject: [PATCH] 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 Signed-off-by: Ian Jackson --- README.make-secnet-sites | 4 +++- make-secnet-sites | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.make-secnet-sites b/README.make-secnet-sites index a194906..2264d75 100644 --- 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 e10f7fc..ad96560 100755 --- 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)"), -- 2.30.2