aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/keylist.c2
-rw-r--r--g10/trustdb.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/g10/keylist.c b/g10/keylist.c
index 031612cd2..58c0a9699 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -870,7 +870,7 @@ list_keyblock_pka (ctrl_t ctrl, kbnode_t keyblock)
char pkstrbuf[PUBKEY_STRING_SIZE];
char *hexfpr;
char *hexkeyblock = NULL;
- unsigned int hexkeyblocklen;
+ unsigned int hexkeyblocklen = 0; /* Init to avoid -Wmaybe-uninitialized. */
const char *s;
/* Get the keyid from the keyblock. */
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 386796c68..fbb806d85 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -992,9 +992,16 @@ tdb_get_validity_core (PKT_public_key *pk, PKT_user_id *uid,
TRUSTREC trec, vrec;
gpg_error_t err;
ulong recno;
+#ifdef USE_TOFU
unsigned int tofu_validity = TRUST_UNKNOWN;
+#endif
unsigned int validity = TRUST_UNKNOWN;
+#ifndef USE_TOFU
+ (void)sig;
+ (void)may_ask;
+#endif
+
init_trustdb ();
/* If we have no trustdb (which also means it has not been created)