X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/256bc8d0263f36d6a6589d989f809d90d6c5ec1e..f220a1d75f50cea337908a392bf7f01b573edc97:/keys/tripe-keys.conf.5.in

diff --git a/keys/tripe-keys.conf.5.in b/keys/tripe-keys.conf.5.in
index 06ba3e49..4fc0485a 100644
--- a/keys/tripe-keys.conf.5.in
+++ b/keys/tripe-keys.conf.5.in
@@ -117,6 +117,13 @@ default.  Usually set up automatically.
 Additional options for generating master keys.  Default is
 .RB ` -l '.
 .TP
+.I master-attrs
+Additional attributes to set on the master key,
+as
+.IB key = value
+pairs separated by spaces.
+Default is empty.
+.TP
 .I hk-master
 The fingerprint of the current master signing key.  No default.  Usually
 set up automatically.
@@ -141,7 +148,7 @@ or
 .B ec
 (elliptic curves).  The default is
 .BR dh .
-.ne 7
+.ne 9
 .TP
 .I kx-genalg
 Key generation algorithm name to pass to
@@ -159,9 +166,11 @@ kx	kx-genalg
 _
 dh	dh
 ec	ec
+x25519	x25519
+x448	x448
 _
 .TE
-.ne 7
+.ne 9
 .TP
 .I kx-param-genalg
 Key generation algorithm name to pass to
@@ -179,9 +188,11 @@ kx	kx-param-genalg
 _
 dh	dh-param
 ec	ec-param
+x25519	empty
+x448	empty
 _
 .TE
-.ne 7
+.ne 9
 .TP
 .I kx-param
 Options to pass to
@@ -198,6 +209,32 @@ kx	kx-param
 _
 dh	\-LS \-b3072 \-B256
 ec	\-Cnist-p256
+x25519	\fInone
+x448	\fInone
+_
+.TE
+.ne 9
+.TP
+.I kx-attrs
+Additional attributes to set on the parameters
+(and therefore copied to peer keys),
+as
+.IB key = value
+pairs separated by spaces.
+Default depends on
+.I kx
+as follows.
+.TS
+center;
+| ci | ci |
+| lb | lb |.
+_
+kx	kx-attrs
+_
+dh	serialization=constlen
+ec	serialization=constlen
+x25519	\fIempty
+x448	\fIempty
 _
 .TE
 .TP
@@ -209,40 +246,81 @@ Expiry time for generated keys.  Default is
 Hashing algorithm to use.  Default is
 .BR sha256 .
 .TP
+.I bulk
+The bulk crypto transform to use.
+Default is
+.BR iiv .
+.ne 8
+.TP
 .I mac
-Message authentication algorithm to use.  Default is
-.IB hash -hmac/ halfhashlen \fR,
-where
+Message authentication algorithm to use.
+Default depends on
+.I bulk
+as follows.
+.TS
+center;
+| ci | ci |
+| lb | lb |.
+_
+bulk	mac
+_
+v0	\fIhash\fB-hmac/\fIhalfhashlen
+iiv	\fIhash\fB-hmac/\fIhalfhashlenrijndael-cbc
+naclbox	poly1305/128
+_
+.TE
+.IP
+(In the above,
 .I halfhashlen
 is half of
 .IR hash 's
-output length.
+output length.)
 .TP
 .I mgf
 Mask-generation algorithm to use.  Default is
 .IB hash -mgf \fR.
 This is probably a good choice.
+.ne 7
 .TP
 .I cipher
-Symmetric encryption scheme to use.  Default is
-.BR rijndael-cbc .
+Symmetric encryption scheme to use.
+Default depends on
+.I bulk
+as follows.
+.TS
+center;
+| ci | ci |
+| lb | lb |.
+_
+bulk	cipher
+_
+v0	rijndael-cbc
+iiv	rijndael-cbc
+naclbox	chacha20
+_
+.TE
+.ne 8
 .TP
 .I sig
 Signature scheme to use.  Must be one of those recognized by
 .BR catsign (1).
-Default is
-.B dsa
-if
-.I kx
-is
-.BR dh ,
-or
-.B ecdsa
-if
+Default depends on
 .I kx
-is
-.BR ec .
-.ne 10
+as follows.
+.TS
+center;
+| ci | ci |
+| lb | lb |.
+_
+kx	sig
+_
+dh	dsa
+ec	ecdsa
+x25519	ed25519
+x448	ed448
+_
+.TE
+.ne 12
 .TP
 .I sig-genalg
 Key-generation algorithm for signing key.  Default depends on
@@ -261,9 +339,11 @@ rsapcs1	rsa
 rsapss	rsa
 ecdsa	ec
 eckcdsa	ec
+ed25519	ed25519
+ed448	ed448
 _
 .TE
-.ne 8
+.ne 10
 .TP
 .I sig-param
 Signature-key generation parameters.  Default depends on
@@ -280,6 +360,8 @@ dh	\-LS \-b3072 \-B256
 dsa	\-b3072 \-B256
 rsa	\-b3072
 ec	\-Cnist-p256
+ed25519	\fInone
+ed448	\fInone
 _
 .TE
 .TP