diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/packet.h | 3 | ||||
| -rw-r--r-- | g10/parse-packet.c | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/g10/packet.h b/g10/packet.h index 523178b5f..0563bb14c 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -457,8 +457,7 @@ const byte *parse_sig_subpkt ( const subpktarea_t *buffer, sigsubpkttype_t reqtype, size_t *ret_n ); const byte *parse_sig_subpkt2 ( PKT_signature *sig, - sigsubpkttype_t reqtype, - size_t *ret_n ); + sigsubpkttype_t reqtype); int parse_one_sig_subpkt( const byte *buffer, size_t n, int type ); void parse_revkeys(PKT_signature *sig); int parse_attribute_subpkts(PKT_user_id *uid); diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 1391be4cf..3393e9389 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1585,14 +1585,13 @@ parse_sig_subpkt (const subpktarea_t * buffer, sigsubpkttype_t reqtype, const byte * -parse_sig_subpkt2 (PKT_signature * sig, sigsubpkttype_t reqtype, - size_t * ret_n) +parse_sig_subpkt2 (PKT_signature * sig, sigsubpkttype_t reqtype) { const byte *p; - p = parse_sig_subpkt (sig->hashed, reqtype, ret_n); + p = parse_sig_subpkt (sig->hashed, reqtype, NULL); if (!p) - p = parse_sig_subpkt (sig->unhashed, reqtype, ret_n); + p = parse_sig_subpkt (sig->unhashed, reqtype, NULL); return p; } @@ -1767,7 +1766,7 @@ parse_signature (IOBUF inp, int pkttype, unsigned long pktlen, && opt.verbose) log_info ("signature packet without timestamp\n"); - p = parse_sig_subpkt2 (sig, SIGSUBPKT_ISSUER, NULL); + p = parse_sig_subpkt2 (sig, SIGSUBPKT_ISSUER); if (p) { sig->keyid[0] = buf32_to_u32 (p); @@ -1821,7 +1820,7 @@ parse_signature (IOBUF inp, int pkttype, unsigned long pktlen, unhashed area. In theory, anyway, we should never see this packet off of a local keyring. */ - p = parse_sig_subpkt2 (sig, SIGSUBPKT_EXPORTABLE, NULL); + p = parse_sig_subpkt2 (sig, SIGSUBPKT_EXPORTABLE); if (p && *p == 0) sig->flags.exportable = 0; |