1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

* protect-tool.c: New options --have-cert and --prompt.

(export_p12_file): Read a certificate from STDIN and pass it to
p12_build.  Detect a keygrip and construct the filename in that
case.  Unprotcet a key if needed.  Print error messages for key
formats we can't handle.
(release_passphrase): New.
(get_passphrase): New arg PROMPTNO. Return the allocated
string. Changed all callers.

* minip12.c: Revamped the build part.
(p12_build): New args CERT and CERTLEN.

* simple-pwquery.c (agent_open): Don't mangle INFOSTR.

* export.c (export_p12, popen_protect_tool)
(gpgsm_p12_export): New.
* gpgsm.c (main): New command --export-secret-key-p12.
This commit is contained in:
Werner Koch 2004-02-19 16:26:32 +00:00
parent 50ad027c9a
commit a1b487a17a
14 changed files with 1076 additions and 161 deletions

View file

@ -74,6 +74,7 @@ enum cmd_and_opt_values {
aSendKeys,
aRecvKeys,
aExport,
aExportSecretKeyP12,
aCheckKeys, /* nyi */
aServer,
aLearnCard,
@ -344,6 +345,8 @@ static ARGPARSE_OPTS opts[] = {
#endif
{ aDummy, "throw-keyid", 0, "@"},
{ aDummy, "notation-data", 2, "@"},
{ aExportSecretKeyP12, "export-secret-key-p12", 256, "@"},
{ 302, NULL, 0, N_(
"@\n(See the man page for a complete listing of all commands and options)\n"
@ -869,6 +872,7 @@ main ( int argc, char **argv)
case aSendKeys:
case aRecvKeys:
case aExport:
case aExportSecretKeyP12:
case aListKeys:
case aListExternalKeys:
case aListSecretKeys:
@ -1406,6 +1410,12 @@ main ( int argc, char **argv)
free_strlist(sl);
break;
case aExportSecretKeyP12:
if (argc == 1)
gpgsm_p12_export (&ctrl, *argv, stdout);
else
wrong_args (_("--export-secret-key-p12 KEY-ID"));
break;
case aSendKeys:
case aRecvKeys: