From cb4c7abb774e2d95806d8b0ec6ea5cd130c1b5b8 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 8 Dec 2016 19:02:56 +0100 Subject: [PATCH] Fix 2 compiler warnings. * dirmngr/loadswdb.c: Set ERR on malloc failure. * g10/passphrase.c (passphrase_to_dek): Initialize all fields of HELP_S2K. Signed-off-by: Werner Koch --- dirmngr/loadswdb.c | 5 ++++- g10/passphrase.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dirmngr/loadswdb.c b/dirmngr/loadswdb.c index bc56c2ab3..2d6bdc126 100644 --- a/dirmngr/loadswdb.c +++ b/dirmngr/loadswdb.c @@ -272,7 +272,10 @@ dirmngr_load_swdb (ctrl_t ctrl, int force) /* Create the filename of the file with the keys. */ keyfile_fname = make_filename_try (gnupg_datadir (), "distsigkey.gpg", NULL); if (!keyfile_fname) - goto leave; + { + err = gpg_error_from_syserror (); + goto leave; + } /* Fetch the swdb from the web. */ err = fetch_file (ctrl, "https://versions.gnupg.org/swdb.lst", &swdb); diff --git a/g10/passphrase.c b/g10/passphrase.c index ccd232a4f..fb4ec4c85 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -319,8 +319,8 @@ passphrase_to_dek (int cipher_algo, STRING2KEY *s2k, log_assert (create && !nocache); /* This is used for the old rfc1991 mode * Note: This must match the code in encode.c with opt.rfc1991 set */ + memset (&help_s2k, 0, sizeof (help_s2k)); s2k = &help_s2k; - s2k->mode = 0; s2k->hash_algo = S2K_DIGEST_ALGO; }