security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-09 12:54:23 +01:00
Code Activity

* parse-packet.c (enum_sig_subpkt, parse_signature,

Browse Source 
parse_attribute_subpkts): Make a number of warnings verbose items.
These fire on many slightly mangled keys in the field, so the
warning is becoming burdensome.
This commit is contained in:
David Shaw 2005-09-02 19:23:33 +00:00
parent be8543812d
commit 039c27f153
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2005-09-02 David Shaw <dshaw@jabberwocky.com>
* parse-packet.c (enum_sig_subpkt, parse_signature,
parse_attribute_subpkts): Make a number of warnings verbose items.
These fire on many slightly mangled keys in the field, so the
warning is becoming burdensome.
2005-09-01 David Shaw <dshaw@jabberwocky.com> 2005-09-01 David Shaw <dshaw@jabberwocky.com>
* photoid.h, photoid.c (generate_photo_id): Allow passing in a * photoid.h, photoid.c (generate_photo_id): Allow passing in a

27
g10/parse-packet.c
View File

@ -1186,7 +1186,8 @@ enum_sig_subpkt( const subpktarea_t *pktbuf, sigsubpkttype_t reqtype,
return NULL; /* end of packets; not found */ return NULL; /* end of packets; not found */
too_short: too_short:
log_error("buffer shorter than subpacket\n"); if(opt.verbose)
log_info("buffer shorter than subpacket\n");
if( start ) if( start )
*start = -1; *start = -1;
return NULL; return NULL;
@ -1322,23 +1323,23 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen,
sig->digest_start[0] = iobuf_get_noeof(inp); pktlen--; sig->digest_start[0] = iobuf_get_noeof(inp); pktlen--;
sig->digest_start[1] = iobuf_get_noeof(inp); pktlen--; sig->digest_start[1] = iobuf_get_noeof(inp); pktlen--;
if( is_v4 && sig->pubkey_algo ) { /*extract required information */ if( is_v4 && sig->pubkey_algo )
{ /*extract required information */
const byte *p; const byte *p;
size_t len; size_t len;
/* set sig->flags.unknown_critical if there is a /* set sig->flags.unknown_critical if there is a
* critical bit set for packets which we do not understand */ * critical bit set for packets which we do not understand */
if( !parse_sig_subpkt (sig->hashed, SIGSUBPKT_TEST_CRITICAL, NULL) if( !parse_sig_subpkt (sig->hashed, SIGSUBPKT_TEST_CRITICAL, NULL)
|| !parse_sig_subpkt (sig->unhashed, SIGSUBPKT_TEST_CRITICAL, || !parse_sig_subpkt (sig->unhashed, SIGSUBPKT_TEST_CRITICAL,
NULL) ) NULL) )
{ sig->flags.unknown_critical = 1;
sig->flags.unknown_critical = 1;
}
p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_SIG_CREATED, NULL ); p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_SIG_CREATED, NULL );
if(p) if(p)
sig->timestamp = buffer_to_u32(p); sig->timestamp = buffer_to_u32(p);
else if(!(sig->pubkey_algo>=100 && sig->pubkey_algo<=110)) else if(!(sig->pubkey_algo>=100 && sig->pubkey_algo<=110)
&& opt.verbose)
log_info ("signature packet without timestamp\n"); log_info ("signature packet without timestamp\n");
p = parse_sig_subpkt2( sig, SIGSUBPKT_ISSUER, NULL ); p = parse_sig_subpkt2( sig, SIGSUBPKT_ISSUER, NULL );
@ -1347,14 +1348,15 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen,
sig->keyid[0] = buffer_to_u32(p); sig->keyid[0] = buffer_to_u32(p);
sig->keyid[1] = buffer_to_u32(p+4); sig->keyid[1] = buffer_to_u32(p+4);
} }
else if(!(sig->pubkey_algo>=100 && sig->pubkey_algo<=110)) else if(!(sig->pubkey_algo>=100 && sig->pubkey_algo<=110)
&& opt.verbose)
log_info ("signature packet without keyid\n"); log_info ("signature packet without keyid\n");
p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_SIG_EXPIRE,NULL); p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_SIG_EXPIRE,NULL);
if(p) if(p)
sig->expiredate=sig->timestamp+buffer_to_u32(p); sig->expiredate=sig->timestamp+buffer_to_u32(p);
if(sig->expiredate && sig->expiredate<=make_timestamp()) if(sig->expiredate && sig->expiredate<=make_timestamp())
sig->flags.expired=1; sig->flags.expired=1;
p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_POLICY,NULL); p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_POLICY,NULL);
if(p) if(p)
@ -1401,7 +1403,7 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen,
/* Find all revocation keys. */ /* Find all revocation keys. */
if(sig->sig_class==0x1F) if(sig->sig_class==0x1F)
parse_revkeys(sig); parse_revkeys(sig);
} }
if( list_mode ) { if( list_mode ) {
fprintf (listfp, ":signature packet: algo %d, keyid %08lX%08lX\n" fprintf (listfp, ":signature packet: algo %d, keyid %08lX%08lX\n"
@ -1957,7 +1959,8 @@ parse_attribute_subpkts(PKT_user_id *uid)
return count; return count;
too_short: too_short:
log_error("buffer shorter than attribute subpacket\n"); if(opt.verbose)
log_info("buffer shorter than attribute subpacket\n");
uid->attribs=attribs; uid->attribs=attribs;
uid->numattribs=count; uid->numattribs=count;
return count; return count;