summaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2011-11-06 17:01:31 +0100
committerWerner Koch <wk@gnupg.org>2011-11-06 17:01:31 +0100
commit958f29d2251a96d09439e591ea3523133930e5e9 (patch)
tree21b939412dc91322f35b85524df4804049fa1141 /g10/gpg.c
parenttypo fixes (diff)
downloadgnupg2-958f29d2251a96d09439e591ea3523133930e5e9.tar.xz
gnupg2-958f29d2251a96d09439e591ea3523133930e5e9.zip
Allow creating subkeys using an existing key
This works by specifying the keygrip instead of an algorithm (section number 13) and requires that the option -expert has been used. It will be easy to extend this to the primary key.
Diffstat (limited to 'g10/gpg.c')
-rw-r--r--g10/gpg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index c31a55863..aa37a88b6 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3709,12 +3709,12 @@ main (int argc, char **argv)
if( opt.batch ) {
if( argc > 1 )
wrong_args("--gen-key [parameterfile]");
- generate_keypair (argc? *argv : NULL, NULL, 0);
+ generate_keypair (ctrl, argc? *argv : NULL, NULL, 0);
}
else {
if( argc )
wrong_args("--gen-key");
- generate_keypair (NULL, NULL, 0);
+ generate_keypair (ctrl, NULL, NULL, 0);
}
break;