key/key-io.c: Add low-level `key_mergeline' and `key_extractline' functions.

[catacomb] / progs / key.1

diff --git a/progs/key.1 b/progs/key.1
index 0ffd076..15552fd 100644 (file)
--- a/progs/key.1
+++ b/progs/key.1
@@ -877,6 +877,13 @@ The private key is simply a random 256-bit string,
 from which a scalar and secret prefix are derived;
 the public key is the compressed form of the corresponding point.
 .TP
+.B ed448
+Generate a private key and a corresponding public point on the
+(Edwards-form) Ed448-Goldilocks elliptic curve.
+The private key is simply a random 456-bit string,
+from which a scalar and secret prefix are derived;
+the public key is the compressed form of the corresponding point.
+.TP
 .B empty
 Generate an empty key, with trivial contents.
 This is useful as a `parameters' key,
@@ -899,7 +906,12 @@ new tag to be set.  If no second argument is given, the existing tag, if
 any, is removed and no new tag is set.  It is an error to set a tag
 which already exists on another key, unless you give the
 .B \-r
-option, which removes the tag first.
+option.
+.PP
+The following options are recognized.
+.TP
+.B "\-r, \-\-retag"
+Untag the existing key with the desired new tag, if any.
 .SS "setattr"
 Attaches attributes to a key.  The key to which the attributes should be
 attached is given by its