aboutsummaryrefslogtreecommitdiffstats
path: root/sm/import.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2004-02-19 16:26:32 +0000
committerWerner Koch <[email protected]>2004-02-19 16:26:32 +0000
commita1b487a17a084b3d8d652d4feabb7de2d67ad292 (patch)
treef0a4fbb66f6b7d89de99fc8e69c20dc96f7db0d4 /sm/import.c
parent* acinclude.m4: Removed macros to detect gpg-error, libgcrypt, (diff)
downloadgnupg-a1b487a17a084b3d8d652d4feabb7de2d67ad292.tar.gz
gnupg-a1b487a17a084b3d8d652d4feabb7de2d67ad292.zip
* 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.
Diffstat (limited to 'sm/import.c')
-rw-r--r--sm/import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sm/import.c b/sm/import.c
index 47f062790..02d2e629f 100644
--- a/sm/import.c
+++ b/sm/import.c
@@ -562,7 +562,7 @@ parse_p12 (ksba_reader_t reader, FILE **retfp)
}
while (!(err = ksba_reader_read (reader, buffer, sizeof buffer, &nread)))
{
- if (fwrite (buffer, nread, 1, tmpfp) != 1)
+ if (nread && fwrite (buffer, nread, 1, tmpfp) != 1)
{
err = gpg_error_from_errno (errno);
log_error (_("error writing to temporary file: %s\n"),