diff options
| author | Werner Koch <[email protected]> | 2019-09-27 13:44:23 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-09-27 13:44:23 +0000 |
| commit | 9698761933f7ade732178b45df2a8763e5801763 (patch) | |
| tree | 5454a013e219a64dfd0feaf701285a65b7cfa431 /kbx/keybox-update.c | |
| parent | build: Build gpg-pair-tool only when there is newer libgcrypt. (diff) | |
| parent | kbx: Fix error code return in keyboxd. (diff) | |
| download | gnupg-9698761933f7ade732178b45df2a8763e5801763.tar.gz gnupg-9698761933f7ade732178b45df2a8763e5801763.zip | |
Merge branch 'switch-to-gpgk' into master
--
Resolved Conflicts:
* common/asshelp.c: Keep the new code in master for spawing under
Windows.
* g10/Makefile.am: Keep all new file.
* g10/photoid.c: Pass CTRL to pct_expando.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'kbx/keybox-update.c')
| -rw-r--r-- | kbx/keybox-update.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c index e25596b26..fbcaec7b9 100644 --- a/kbx/keybox-update.c +++ b/kbx/keybox-update.c @@ -182,7 +182,7 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob, if (!newfp ) return gpg_error_from_syserror (); - rc = _keybox_write_header_blob (newfp, for_openpgp); + rc = _keybox_write_header_blob (newfp, NULL, for_openpgp); if (rc) { fclose (newfp); @@ -730,7 +730,7 @@ keybox_compress (KEYBOX_HANDLE hd) } /* The header blob is missing. Insert it. */ - rc = _keybox_write_header_blob (newfp, hd->for_openpgp); + rc = _keybox_write_header_blob (newfp, NULL, hd->for_openpgp); if (rc) break; any_changes = 1; |