diff options
| author | Werner Koch <[email protected]> | 2010-06-21 10:01:24 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-06-21 10:01:24 +0000 |
| commit | 91056b1976bfb7b755e53b1302f4ede2b5cbc05d (patch) | |
| tree | 32f1a4dd821d64e9aceede18c549ade7f336dde9 /sm/import.c | |
| parent | Avoid using the protect-tool to import pkcs#12. (diff) | |
| download | gnupg-91056b1976bfb7b755e53b1302f4ede2b5cbc05d.tar.gz gnupg-91056b1976bfb7b755e53b1302f4ede2b5cbc05d.zip | |
Implement export of pkcs#12 objects using a direct agent connection.
Diffstat (limited to 'sm/import.c')
| -rw-r--r-- | sm/import.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sm/import.c b/sm/import.c index c920ac51a..69a64f1c8 100644 --- a/sm/import.c +++ b/sm/import.c @@ -759,8 +759,9 @@ parse_p12 (ctrl_t ctrl, ksba_reader_t reader, struct stats_s *stats) err = gpgsm_agent_ask_passphrase - (ctrl, _("Please enter the passphrase to unprotect the PKCS#12 object."), - &passphrase); + (ctrl, + i18n_utf8 ("Please enter the passphrase to unprotect the PKCS#12 object."), + 0, &passphrase); if (err) goto leave; @@ -812,7 +813,7 @@ parse_p12 (ctrl_t ctrl, ksba_reader_t reader, struct stats_s *stats) kparms = NULL; if (err) { - log_error ("failed to created S-expression from key: %s\n", + log_error ("failed to create S-expression from key: %s\n", gpg_strerror (err)); goto leave; } @@ -828,7 +829,7 @@ parse_p12 (ctrl_t ctrl, ksba_reader_t reader, struct stats_s *stats) /* Convert to canonical encoding using a function which pads it to a multiple of 64 bits. We need this padding for AESWRAP. */ - err = make_canon_sexp_pad (s_key, &key, &keylen); + err = make_canon_sexp_pad (s_key, 1, &key, &keylen); if (err) { log_error ("error creating canonical S-expression\n"); |