mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* keyring.c (keyring_rebuild_cache): Lock the keyring while rebuilding the
signature caches to prevent another gpg from tampering with the temporary copy. * keydb.c: Double the maximum number of keyrings to 40. * parse-packet.c (dump_sig_subpkt): Show the notation names for not-human-readable notations. Fix cosmetic off-by-one length counter.
This commit is contained in:
parent
16c925f68a
commit
208509950c
4 changed files with 25 additions and 6 deletions
|
@ -752,12 +752,12 @@ dump_sig_subpkt( int hashed, int type, int critical,
|
|||
type, (unsigned)length );
|
||||
}
|
||||
|
||||
buffer++;
|
||||
length--;
|
||||
|
||||
printf("\t%s%ssubpkt %d len %u (", /*)*/
|
||||
critical ? "critical ":"",
|
||||
hashed ? "hashed ":"", type, (unsigned)length );
|
||||
buffer++;
|
||||
length--;
|
||||
if( length > buflen ) {
|
||||
printf("too short: buffer is only %u)\n", (unsigned)buflen );
|
||||
return;
|
||||
|
@ -823,8 +823,6 @@ dump_sig_subpkt( int hashed, int type, int critical,
|
|||
fputs("notation: ", stdout );
|
||||
if( length < 8 )
|
||||
p = "[too short]";
|
||||
else if( !(*buffer & 0x80) )
|
||||
p = "[not human readable]";
|
||||
else {
|
||||
const byte *s = buffer;
|
||||
size_t n1, n2;
|
||||
|
@ -837,7 +835,11 @@ dump_sig_subpkt( int hashed, int type, int critical,
|
|||
else {
|
||||
print_string( stdout, s, n1, ')' );
|
||||
putc( '=', stdout );
|
||||
print_string( stdout, s+n1, n2, ')' );
|
||||
|
||||
if( *buffer & 0x80 )
|
||||
print_string( stdout, s+n1, n2, ')' );
|
||||
else
|
||||
p = "[not human readable]";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue