security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

fixed m_alloc(0) bug and added checks to revkey and numrevkeys

Browse Source
This commit is contained in:
Stefan Bellon 2002-05-04 14:45:34 +00:00
parent 4991e018bf
commit 158091ef9f
4 changed files with 58 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
g10/ChangeLog
View File

@ -1,3 +1,13 @@
2002-05-04 Stefan Bellon <sbellon@sbellon.de>
* free-packet.c (copy_public_key): Don't call m_alloc(0), therefore
added consistency check for revkey and numrefkeys.
* getkey.c (check_revocation_keys): Added consistency check for
revkey and numrefkeys.
* keyedit.c (show_key_with_all_names): Likewise.
2002-05-03 David Shaw <dshaw@jabberwocky.com> 2002-05-03 David Shaw <dshaw@jabberwocky.com>
* photoid.c: Provide default image viewer for Win32. * photoid.c: Provide default image viewer for Win32.

10
g10/free-packet.c
View File

@ -164,8 +164,14 @@ copy_public_key ( PKT_public_key *d, PKT_public_key *s)
for(i=0; i < n; i++ ) for(i=0; i < n; i++ )
d->pkey[i] = mpi_copy( s->pkey[i] ); d->pkey[i] = mpi_copy( s->pkey[i] );
} }
d->revkey=m_alloc(sizeof(struct revocation_key)*s->numrevkeys); if( !s->revkey && s->numrevkeys )
memcpy(d->revkey,s->revkey,sizeof(struct revocation_key)*s->numrevkeys); BUG();
if( s->numrevkeys ) {
d->revkey = m_alloc(sizeof(struct revocation_key)*s->numrevkeys);
memcpy(d->revkey,s->revkey,sizeof(struct revocation_key)*s->numrevkeys);
}
else
d->revkey = NULL;
return d; return d;
} }

38
g10/getkey.c
View File

@ -2314,25 +2314,25 @@ check_revocation_keys(PKT_public_key *pk,PKT_signature *sig)
(ulong)sig->keyid[1]); */ (ulong)sig->keyid[1]); */
/* is the issuer of the sig one of our revokers? */ /* is the issuer of the sig one of our revokers? */
for(i=0;i<pk->numrevkeys;i++) if( !pk->revkey && pk->numrevkeys )
{ BUG();
u32 keyid[2]; else
for(i=0;i<pk->numrevkeys;i++) {
keyid_from_fingerprint(pk->revkey[i].fpr,MAX_FINGERPRINT_LEN,keyid); u32 keyid[2];
if(keyid[0]==sig->keyid[0] && keyid[1]==sig->keyid[1]) keyid_from_fingerprint(pk->revkey[i].fpr,MAX_FINGERPRINT_LEN,keyid);
{
MD_HANDLE md; if(keyid[0]==sig->keyid[0] && keyid[1]==sig->keyid[1]) {
MD_HANDLE md;
md=md_open(sig->digest_algo,0);
hash_public_key(md,pk); md=md_open(sig->digest_algo,0);
if(signature_check(sig,md)==0) hash_public_key(md,pk);
{ if(signature_check(sig,md)==0) {
rc=0; rc=0;
break; break;
} }
} }
} }
busy=0; busy=0;

39
g10/keyedit.c
View File

@ -1478,24 +1478,27 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
} }
} }
if(with_revoker) if(with_revoker) {
for(i=0;i<pk->numrevkeys;i++) if( !pk->revkey && pk->numrevkeys )
{ BUG();
u32 r_keyid[2]; else
char *user; for(i=0;i<pk->numrevkeys;i++) {
u32 r_keyid[2];
keyid_from_fingerprint(pk->revkey[i].fpr, char *user;
MAX_FINGERPRINT_LEN,r_keyid);
keyid_from_fingerprint(pk->revkey[i].fpr,
user=get_user_id_string_native(r_keyid); MAX_FINGERPRINT_LEN,r_keyid);
tty_printf(_("This key may be revoked by %s key %s%s\n"), user=get_user_id_string_native(r_keyid);
pubkey_algo_to_string(pk->revkey[i].algid),
user, tty_printf(_("This key may be revoked by %s key %s%s\n"),
pk->revkey[i].class&0x40?_(" (sensitive)"):""); pubkey_algo_to_string(pk->revkey[i].algid),
user,
m_free(user); pk->revkey[i].class&0x40?_(" (sensitive)"):"");
}
m_free(user);
}
}
tty_printf(_("%s%c %4u%c/%08lX created: %s expires: %s"), tty_printf(_("%s%c %4u%c/%08lX created: %s expires: %s"),
node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub", node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub",