server/admin.c: Remove spurious `ping' in usage message.

[tripe] / keys / tripe-keys.master

diff --git a/keys/tripe-keys.master b/keys/tripe-keys.master
index 01e094b..4fe35f3 100644 (file)
--- a/keys/tripe-keys.master
+++ b/keys/tripe-keys.master
@@ -18,16 +18,20 @@
 ###--------------------------------------------------------------------------
 ### Crypto parameters.
 
-## The key-exchange type.  May be `dh' or `ec'.
+## The key-exchange type.  May be `dh', `ec', `x25519', or `x448'.
 # kx = dh
 
 ## Key-generation parameters for key exchange group.
 # kx-param = -LS -b3072 -B256
-# kx-param = -Pnist-p256
+# kx-param = -Cnist-p256
+# kx-param =
 
 ## Expiry time for peer key-exchange keys.
 # kx-expire = now + 1 year
 
+## Bulk crypto transform to use.  May be `v0', `iiv', or `naclbox'.
+# bulk = iiv
+
 ## Symmetric encryption scheme to use.
 # cipher = rijndael-cbc
 
@@ -37,9 +41,11 @@
 ## Signature scheme to use for signing/verifying repository archives.
 # sig = dsa
 # sig = ecdsa
+# sig = ed25519
 
 ## How recently an archive must have been signed to be valid.
 # sig-fresh = always
+# sig-fresh = 28 days ago
 
 ## When the master signing key expires.
 # sig-expire = forever