[Pkg-gnupg-commit] [gnupg2] 101/180: g10,sm: Spell out --gen-key.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Sat Dec 24 22:29:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit 892c827e72b1396e3b58e2f8869cc48328a2b59c
Author: Justus Winter <justus at g10code.com>
Date: Mon Nov 14 16:59:23 2016 +0100
g10,sm: Spell out --gen-key.
* g10/gpg.c (opts): Spell out option.
* sm/gpgsm.c (opts): Likewise.
* doc/gpg.texi: Update accordingly.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
---
doc/debugging.texi | 3 ++-
doc/faq.org | 2 +-
doc/gpg.texi | 14 +++++++-------
doc/gpgsm.texi | 6 +++---
doc/howto-create-a-server-cert.texi | 2 +-
g10/gpg.c | 9 +++++----
sm/gpgsm.c | 5 +++--
tests/openpgp/genkey1024.scm | 2 +-
8 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/doc/debugging.texi b/doc/debugging.texi
index 7fde49a..42a1a15 100644
--- a/doc/debugging.texi
+++ b/doc/debugging.texi
@@ -235,7 +235,8 @@ gpg: fatal: WriteConsole failed: Access denied
@noindent
The solution is to use the command @command{wineconsole}.
-Some operations like gen-key really want to talk to the console directly
+Some operations like @option{--generate-key} really want to talk to
+the console directly
for increased security (for example to prevent the passphrase from
appearing on the screen). So, you should use @command{wineconsole}
instead of @command{wine}, which will launch a windows console that
diff --git a/doc/faq.org b/doc/faq.org
index 22d07f0..8fc3775 100644
--- a/doc/faq.org
+++ b/doc/faq.org
@@ -1243,7 +1243,7 @@ update this FAQ in the next month. See the section "Changes" for recent updates
To generate a secret/public keypair, run:
- : $ gpg --gen-key
+ : $ gpg --generate-key
and choose the default values.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 015b930..3f73754 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -611,7 +611,7 @@ This section explains the main commands for key management.
@item --quick-gen-key @code{user-id} [@code{algo} [@code{usage} [@code{expire}]]]
@opindex quick-gen-key
This is a simple command to generate a standard key with one user id.
-In contrast to @option{--gen-key} the key is generated directly
+In contrast to @option{--generate-key} the key is generated directly
without the need to answer a bunch of prompts. Unless the option
@option{--yes} is given, the key creation will be canceled if the
given user id already exists in the keyring.
@@ -681,8 +681,8 @@ for the subkey. Several formats are supported; commonly the ISO
YYYY-MM-DD format is used. The values ``never'', ``none'', or ``-''
can be used for no expiration date.
- at item --gen-key
- at opindex gen-key
+ at item --generate-key
+ at opindex generate-key
Generate a new key pair using the current default parameters. This is
the standard command to create a new key. In addition to the key a
revocation certificate is created and stored in the
@@ -691,7 +691,7 @@ revocation certificate is created and stored in the
@item --full-gen-key
@opindex gen-key
Generate a new key pair with dialogs for all options. This is an
-extended version of @option{--gen-key}.
+extended version of @option{--generate-key}.
There is also a feature which allows you to create keys in batch
mode. See the manual section ``Unattended key generation'' on how
@@ -1342,7 +1342,7 @@ the opposite meaning. The options are:
@itemx --disable-large-rsa
@opindex enable-large-rsa
@opindex disable-large-rsa
-With --gen-key and --batch, enable the creation of RSA secret keys as
+With --generate-key and --batch, enable the creation of RSA secret keys as
large as 8192 bit. Note: 8192 bit is more than is generally
recommended. These large keys don't significantly improve security,
but they are more expensive to use, and their signatures and
@@ -3729,7 +3729,7 @@ are almost always required for this.
@node Unattended GPG key generation
@subsection Unattended key generation
-The command @option{--gen-key} may be used along with the option
+The command @option{--generate-key} may be used along with the option
@option{--batch} for unattended key generation. The parameters are
either read from stdin or given as a file on the command line.
The format of the parameter file is as follows:
@@ -3921,7 +3921,7 @@ $ cat >foo <<EOF
%commit
%echo done
EOF
-$ @gpgname --batch --gen-key foo
+$ @gpgname --batch --generate-key foo
[...]
$ @gpgname --no-default-keyring --secret-keyring ./foo.sec \
--keyring ./foo.pub --list-secret-keys
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index e3e852c..2e53a56 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -165,8 +165,8 @@ use @samp{--help} to get a list of supported operations.
@subsection How to manage the certificates and keys
@table @gnupgtabopt
- at item --gen-key
- at opindex gen-key
+ at item --generate-key
+ at opindex generate-key
This command allows the creation of a certificate signing request or a
self-signed certificate. It is commonly used along with the
@option{--output} option to save the created CSR or certificate into a
@@ -1005,7 +1005,7 @@ this is a missing certificate.
@node CSR and certificate creation
@subsection CSR and certificate creation
-The command @option{--gen-key} may be used along with the option
+The command @option{--generate-key} may be used along with the option
@option{--batch} to either create a certificate signing request (CSR)
or an X.509 certificate. This is controlled by a parameter file; the
format of this file is as follows:
diff --git a/doc/howto-create-a-server-cert.texi b/doc/howto-create-a-server-cert.texi
index ea0ce71..55f1a91 100644
--- a/doc/howto-create-a-server-cert.texi
+++ b/doc/howto-create-a-server-cert.texi
@@ -12,7 +12,7 @@ is no need for a configuration file, you may simply enter:
@cartouche
@example
- $ gpgsm --gen-key >example.com.cert-req.pem
+ $ gpgsm --generate-key >example.com.cert-req.pem
Please select what kind of key you want:
(1) RSA
(2) Existing key
diff --git a/g10/gpg.c b/g10/gpg.c
index dd959c9..96a8ab9 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -444,8 +444,9 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aCheckKeys, "check-sigs", "@"),
ARGPARSE_c (oFingerprint, "fingerprint", N_("list keys and fingerprints")),
ARGPARSE_c (aListSecretKeys, "list-secret-keys", N_("list secret keys")),
- ARGPARSE_c (aKeygen, "gen-key",
+ ARGPARSE_c (aKeygen, "generate-key",
N_("generate a new key pair")),
+ ARGPARSE_c (aKeygen, "gen-key", "@"),
ARGPARSE_c (aQuickKeygen, "quick-gen-key" ,
N_("quickly generate a new key pair")),
ARGPARSE_c (aQuickAddUid, "quick-adduid",
@@ -4318,20 +4319,20 @@ main (int argc, char **argv)
case aKeygen: /* generate a key */
if( opt.batch ) {
if( argc > 1 )
- wrong_args("--gen-key [parameterfile]");
+ wrong_args("--generate-key [parameterfile]");
generate_keypair (ctrl, 0, argc? *argv : NULL, NULL, 0);
}
else {
if (opt.command_fd != -1 && argc)
{
if( argc > 1 )
- wrong_args("--gen-key [parameterfile]");
+ wrong_args("--generate-key [parameterfile]");
opt.batch = 1;
generate_keypair (ctrl, 0, argc? *argv : NULL, NULL, 0);
}
else if (argc)
- wrong_args ("--gen-key");
+ wrong_args ("--generate-key");
else
generate_keypair (ctrl, 0, NULL, NULL, 0);
}
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 9582996..a2ec441 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -210,7 +210,8 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aListSecretKeys, "list-secret-keys", N_("list secret keys")),
ARGPARSE_c (aListChain, "list-chain", N_("list certificate chain")),
ARGPARSE_c (aFingerprint, "fingerprint", N_("list keys and fingerprints")),
- ARGPARSE_c (aKeygen, "gen-key", N_("generate a new key pair")),
+ ARGPARSE_c (aKeygen, "generate-key", N_("generate a new key pair")),
+ ARGPARSE_c (aKeygen, "gen-key", "@"),
ARGPARSE_c (aDeleteKey, "delete-keys",
N_("remove keys from the public keyring")),
/*ARGPARSE_c (aSendKeys, "send-keys", N_("export keys to a keyserver")),*/
@@ -1904,7 +1905,7 @@ main ( int argc, char **argv)
else if (argc == 1) /* From file. */
fpin = open_es_fread (*argv, "r");
else
- wrong_args ("--gen-key --batch [parmfile]");
+ wrong_args ("--generate-key --batch [parmfile]");
}
fpout = open_es_fwrite (opt.outfile?opt.outfile:"-");
diff --git a/tests/openpgp/genkey1024.scm b/tests/openpgp/genkey1024.scm
index e5008c3..60eba0b 100755
--- a/tests/openpgp/genkey1024.scm
+++ b/tests/openpgp/genkey1024.scm
@@ -23,7 +23,7 @@
(define (genkey config)
(pipe:do
(pipe:echo config)
- (pipe:spawn `(,(tool 'gpg) --quiet --batch --gen-key))))
+ (pipe:spawn `(,(tool 'gpg) --quiet --batch --generate-key))))
(info "Checking batch key generation")
(genkey "Key-Type: DSA
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list