progs/key.c, progs/key.1: Fix option discrepancies.

The `-E' option wasn't mentioned in the built-in help or the manpage
synopsis; the `--retag' long option wasn't actually recognized.

diff --git a/progs/key.1 b/progs/key.1
index f5b64455bb32d5ed9bdf2bb7b4863a0842aedce8..d93f49a96786b269a3aea84055c89c3b13c68fff 100644 (file)
--- a/progs/key.1
+++ b/progs/key.1
@@ -53,6 +53,8 @@ is one of:
 .IR alg ]
 .RB [ \-b | \-B
 .IR bits ]
 .IR alg ]
 .RB [ \-b | \-B
 .IR bits ]

+.RB [ \-E
+.IR pubexp ]

 .RB [ \-p
 .IR param ]
 .RB [ \-R
 .RB [ \-p
 .IR param ]
 .RB [ \-R

diff --git a/progs/key.c b/progs/key.c
index c38ed5dba90adb82005b2dc447127d079e58ab77..c59eac0f084a5d8c3c26ae40acd54a6b07a620f7 100644 (file)
--- a/progs/key.c
+++ b/progs/key.c
@@ -1065,6 +1065,7 @@ static int cmd_add(int argc, char *argv[])
       { "expire",      OPTF_ARGREQ,    0,      'e' },
       { "comment",     OPTF_ARGREQ,    0,      'c' },
       { "tag",         OPTF_ARGREQ,    0,      't' },
       { "expire",      OPTF_ARGREQ,    0,      'e' },
       { "comment",     OPTF_ARGREQ,    0,      'c' },
       { "tag",         OPTF_ARGREQ,    0,      't' },

+      { "retag",       0,              0,      'r' },

       { "rand-id",     OPTF_ARGREQ,    0,      'R' },
       { "key-id",      OPTF_ARGREQ,    0,      'I' },
       { "curve",       OPTF_ARGREQ,    0,      'C' },
       { "rand-id",     OPTF_ARGREQ,    0,      'R' },
       { "key-id",      OPTF_ARGREQ,    0,      'I' },
       { "curve",       OPTF_ARGREQ,    0,      'C' },


@@ -2273,7 +2274,7 @@ Options:\n\
   { "tidy", cmd_tidy, "tidy" },
   { "add", cmd_add,
     "add [-OPTIONS] TYPE [ATTR...]\n\
   { "tidy", cmd_tidy, "tidy" },
   { "add", cmd_add,
     "add [-OPTIONS] TYPE [ATTR...]\n\

-       Options: [-lqrLKS] [-a ALG] [-bB BITS] [-p PARAM] [-R TAG]\n\
+       Options: [-lqrLKS] [-a ALG] [-bB BITS] [-E PUBEXP] [-p PARAM] [-R TAG]\n\

                 [-A SEEDALG] [-s SEED] [-n BITS] [-I KEYID]\n\
                 [-e EXPIRE] [-t TAG] [-c COMMENT]", "\
 Options:\n\
                 [-A SEEDALG] [-s SEED] [-n BITS] [-I KEYID]\n\
                 [-e EXPIRE] [-t TAG] [-c COMMENT]", "\
 Options:\n\


@@ -2282,6 +2283,7 @@ Options:\n\
                          ($ show keygen for list.)\n\
 -b, --bits=N           Generate an N-bit key.\n\
 -B, --qbits=N          Use an N-bit subgroup or factors.\n\
                          ($ show keygen for list.)\n\
 -b, --bits=N           Generate an N-bit key.\n\
 -B, --qbits=N          Use an N-bit subgroup or factors.\n\

+-E, --public-exponent=E        Use E as RSA public exponent (default 65537)\n\

 -p, --parameters=TAG   Get group parameters from TAG.\n\
 -C, --curve=NAME       Use elliptic curve or DH group NAME.\n\
                          ($ show ec or $ show dh for list.)\n\
 -p, --parameters=TAG   Get group parameters from TAG.\n\
 -C, --curve=NAME       Use elliptic curve or DH group NAME.\n\
                          ($ show ec or $ show dh for list.)\n\