~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/, keys/: Alternative serialization formats for hashing.
[tripe]
/
keys
/
tripe-keys.conf.5.in
diff --git
a/keys/tripe-keys.conf.5.in
b/keys/tripe-keys.conf.5.in
index
468070a
..
ee67e9a
100644
(file)
--- a/
keys/tripe-keys.conf.5.in
+++ b/
keys/tripe-keys.conf.5.in
@@
-27,7
+27,7
@@
.so ../common/defs.man \" @@@PRE@@@
.
.\"--------------------------------------------------------------------------
.so ../common/defs.man \" @@@PRE@@@
.
.\"--------------------------------------------------------------------------
-.TH tripe-keys.conf 5 "14 September 2005" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption"
+.TH tripe-keys.conf 5
tripe
"14 September 2005" "Straylight/Edgeware" "TrIPE: Trivial IP Encryption"
.
.\"--------------------------------------------------------------------------
.SH "NAME"
.
.\"--------------------------------------------------------------------------
.SH "NAME"
@@
-117,6
+117,13
@@
default. Usually set up automatically.
Additional options for generating master keys. Default is
.RB ` -l '.
.TP
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.
.I hk-master
The fingerprint of the current master signing key. No default. Usually
set up automatically.
@@
-141,6
+148,47
@@
or
.B ec
(elliptic curves). The default is
.BR dh .
.B ec
(elliptic curves). The default is
.BR dh .
+.ne 7
+.TP
+.I kx-genalg
+Key generation algorithm name to pass to
+.B "key add"
+when generating keys.
+Default depends on
+.I kx
+as follows.
+.TS
+center;
+| ci | ci |
+| lb | lb |.
+_
+kx kx-genalg
+_
+dh dh
+ec ec
+_
+.TE
+.ne 7
+.TP
+.I kx-param-genalg
+Key generation algorithm name to pass to
+.B "key add"
+when generating the parameters key.
+Default depends on
+.I kx
+as follows.
+.TS
+center;
+| ci | ci |
+| lb | lb |.
+_
+kx kx-param-genalg
+_
+dh dh-param
+ec ec-param
+_
+.TE
+.ne 7
.TP
.I kx-param
Options to pass to
.TP
.I kx-param
Options to pass to
@@
-160,6
+208,15
@@
ec \-Cnist-p256
_
.TE
.TP
_
.TE
.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 is
+.BR serialization=constlen .
+.TP
.I kx-expire
Expiry time for generated keys. Default is
.BR "now + 1 year" .
.I kx-expire
Expiry time for generated keys. Default is
.BR "now + 1 year" .
@@
-168,6
+225,10
@@
Expiry time for generated keys. Default is
Hashing algorithm to use. Default is
.BR sha256 .
.TP
Hashing algorithm to use. Default is
.BR sha256 .
.TP
+.I bulk
+The bulk crypto transform to use.
+Default is
+.BR iiv .
.I mac
Message authentication algorithm to use. Default is
.IB hash -hmac/ halfhashlen \fR,
.I mac
Message authentication algorithm to use. Default is
.IB hash -hmac/ halfhashlen \fR,
@@
-181,26
+242,31
@@
output length.
Mask-generation algorithm to use. Default is
.IB hash -mgf \fR.
This is probably a good choice.
Mask-generation algorithm to use. Default is
.IB hash -mgf \fR.
This is probably a good choice.
+.ne 6
.TP
.I cipher
Symmetric encryption scheme to use. Default is
.TP
.I cipher
Symmetric encryption scheme to use. Default is
-.BR blowfish-cbc .
+.BR rijndael-cbc .
+.ne 6
.TP
.I sig
Signature scheme to use. Must be one of those recognized by
.BR catsign (1).
.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
.I kx
-is
-.BR ec .
+as follows.
+.TS
+center;
+| ci | ci |
+| lb | lb |.
+_
+kx sig
+_
+dh dsa
+ec ecdsa
+_
+.TE
+.ne 12
.TP
.I sig-genalg
Key-generation algorithm for signing key. Default depends on
.TP
.I sig-genalg
Key-generation algorithm for signing key. Default depends on
@@
-219,8
+285,11
@@
rsapcs1 rsa
rsapss rsa
ecdsa ec
eckcdsa ec
rsapss rsa
ecdsa ec
eckcdsa ec
+ed25519 ed25519
+ed448 ed448
_
.TE
_
.TE
+.ne 10
.TP
.I sig-param
Signature-key generation parameters. Default depends on
.TP
.I sig-param
Signature-key generation parameters. Default depends on
@@
-237,6
+306,8
@@
dh \-LS \-b3072 \-B256
dsa \-b3072 \-B256
rsa \-b3072
ec \-Cnist-p256
dsa \-b3072 \-B256
rsa \-b3072
ec \-Cnist-p256
+ed25519 \fInone
+ed448 \fInone
_
.TE
.TP
_
.TE
.TP
@@
-262,7
+333,9
@@
Hash function to use for key fingerprinting. Default is
Local base directory for the repository files. This probably ought to
end in a
.RB ` / '
Local base directory for the repository files. This probably ought to
end in a
.RB ` / '
-character. No default.
+character. Unexpected files in this directory will be removed by the
+.B tripe-keys upload
+command. No default.
.TP
.I repos-file
Filename for local repository tarball. Default is the concatenation of
.TP
.I repos-file
Filename for local repository tarball. Default is the concatenation of