security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-18 14:17:03 +01:00
Code Activity

g10: Improve handling of no corresponding public key.

Browse Source 
* g10/getkey.c (get_seckey): Return G10ERR_NO_PUBKEY when it's not
exact match.

--

In the situation of corrupted .gnupg/ where only private subkey is
available but no corresponding public key of the subkey, the code
returned public primary key which caused mysterious error (for a
user).  This fix detects an error earlier.

GnuPG-bug-id: 1422
Debian-Bug-Id: #638619
This commit is contained in:
NIIBE Yutaka 2015-05-19 10:14:09 +09:00
parent 04667cabef
commit b3fd30451a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
g10/getkey.c
View File

@ -498,7 +498,19 @@ get_seckey( PKT_secret_key *sk, u32 *keyid )
ctx.req_usage = sk->req_usage; ctx.req_usage = sk->req_usage;
rc = lookup( &ctx, &kb, 1 ); rc = lookup( &ctx, &kb, 1 );
if ( !rc ) { if ( !rc ) {
u32 skid[2];
sk_from_block ( &ctx, sk, kb ); sk_from_block ( &ctx, sk, kb );
keyid_from_sk ( sk, skid );
/*
* Make sure it's exact match of keyid.
* If not, it's secret subkey with no public key.
*/
if (!(keyid[0] == skid[0] && keyid[1] == skid[1])) {
log_error (_("key %s: secret key without public key"
" - skipped\n"), keystr(keyid));
rc = G10ERR_NO_PUBKEY;
}
} }
get_seckey_end( &ctx ); get_seckey_end( &ctx );
release_kbnode ( kb ); release_kbnode ( kb );