security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-04 20:38:50 +01:00
Code Activity

Fix a couple of minor bugs.

Browse Source
This commit is contained in:
Werner Koch 2009-06-24 14:01:20 +00:00
parent 9c5313a791
commit 64f24da283
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2009-06-24 Werner Koch <wk@g10code.com>
* passphrase.c (passphrase_to_dek): Do not deref a PW of NULL.
* revoke.c (gen_revoke): Remove unused malloc of PK.
2009-06-17 Werner Koch <wk@g10code.com>
* parse-packet.c (parse): Use a casted -1 instead of a 32 bit

2
g10/passphrase.c
View File

@ -1003,7 +1003,7 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
get_last_passphrase(). */
dek = xmalloc_secure_clear ( sizeof *dek );
dek->algo = cipher_algo;
if( !*pw && mode == 2 )
if( (!pw || !*pw) && mode == 2 )
dek->keylen = 0;
else
hash_passphrase( dek, pw, s2k, mode==2 );

2
g10/revoke.c
View File

@ -488,8 +488,6 @@ gen_revoke( const char *uname )
keyid_from_sk( sk, sk_keyid );
print_seckey_info (sk);
pk = xmalloc_clear( sizeof *pk );
/* FIXME: We should get the public key direct from the secret one */
pub_keyblock=get_pubkeyblock(sk_keyid);

5
keyserver/ChangeLog
View File

@ -1,3 +1,8 @@
2009-06-24 Werner Koch <wk@g10code.com>
* gpgkeys_ldap.c (send_key): Do not loop over a NULL modlist in
fail. Reported by Fabian Keil.
2009-06-09 David Shaw <dshaw@jabberwocky.com>
* Makefile.am (gpgkeys_hkp_LDADD): Need DNSLIBS for the resolver

11
keyserver/gpgkeys_ldap.c
View File

@ -777,13 +777,16 @@ send_key(int *eof)
fail:
/* Unwind and free the whole modlist structure */
for(ml=modlist;*ml;ml++)
if (modlist)
{
free_mod_values(*ml);
free(*ml);
for(ml=modlist;*ml;ml++)
{
free_mod_values(*ml);
free(*ml);
}
free(modlist);
}
free(modlist);
free(addlist);
free(dn);
free(key);