diff options
| author | Werner Koch <[email protected]> | 2007-03-20 10:00:55 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-03-20 10:00:55 +0000 |
| commit | fd628ffda1baf5a8b1a7264ae9900801a7174269 (patch) | |
| tree | 7b1b5a858a167e851f3a3a22441dcce1f1323ac8 /sm/export.c | |
| parent | * PKCS#12 import now tries several encodings in case the passphrase (diff) | |
| download | gnupg-fd628ffda1baf5a8b1a7264ae9900801a7174269.tar.gz gnupg-fd628ffda1baf5a8b1a7264ae9900801a7174269.zip | |
Allow setting of the passphrase encoding of pkcs#12 files.
New option --p12-charset.
Diffstat (limited to 'sm/export.c')
| -rw-r--r-- | sm/export.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sm/export.c b/sm/export.c index a87499f94..ec8a764c3 100644 --- a/sm/export.c +++ b/sm/export.c @@ -416,6 +416,12 @@ gpgsm_p12_export (ctrl_t ctrl, const char *name, FILE *fp) putc ('\n', fp); } + if (opt.p12_charset) + { + fprintf (fp, "The passphrase is %s encoded.\n\n", + opt.p12_charset); + } + ctrl->pem_name = "PKCS12"; rc = gpgsm_create_writer (&b64writer, ctrl, fp, NULL, &writer); if (rc) @@ -567,6 +573,11 @@ popen_protect_tool (const char *pgmname, argv[i++] = "--prompt"; argv[i++] = prompt?prompt:""; argv[i++] = "--enable-status-msg"; + if (opt.p12_charset) + { + argv[i++] = "--p12-charset"; + argv[i++] = opt.p12_charset; + } argv[i++] = "--", argv[i++] = keygrip, argv[i] = NULL; |