security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

gpg: Silence two more warnings. 

* g10/trustdb.c (tdb_get_validity_core): Silence a warning.
* g10/tofu.c (tofu_register): Move SIG_DIGEST computation to the top
so that it is not uninitialized in case of an early error.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-10-18 20:17:24 +02:00
parent 558bcd43ae
commit c2c4007148
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/tofu.c
View File

@ -2096,6 +2096,8 @@ tofu_register (const byte *fingerprint_bin, const char *user_id,
unsigned long c;
int already_verified = 0;
sig_digest = make_radix64_string (sig_digest_bin, sig_digest_bin_len);
dbs = opendbs ();
if (! dbs)
{
@ -2128,8 +2130,6 @@ tofu_register (const byte *fingerprint_bin, const char *user_id,
}
/* Save the observed signature in the DB. */
sig_digest = make_radix64_string (sig_digest_bin, sig_digest_bin_len);
db = getdb (dbs, email, DB_EMAIL);
if (! db)
{

2
g10/trustdb.c
View File

@ -1003,7 +1003,7 @@ tdb_get_validity_core (PKT_public_key *pk, PKT_user_id *uid,
if (opt.trust_model == TM_TOFU || opt.trust_model == TM_TOFU_PGP)
{
kbnode_t user_id_node;
kbnode_t user_id_node = NULL; /* Silence -Wmaybe-uninitialized. */
int user_ids = 0;
int user_ids_expired = 0;