diff options
| author | Neal H. Walfield <[email protected]> | 2015-08-19 09:45:24 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-08-20 12:16:29 +0000 |
| commit | c46e8bfe9a1ae3f1e5327d0451cffd6e4567b449 (patch) | |
| tree | 3ce38e1ccac97ec4467a221dcaa7e1262276adf6 /g10/parse-packet.c | |
| parent | g10/parse-packet.c:mpi_read: Detect EOF and correct boundary conditions. (diff) | |
| download | gnupg-c46e8bfe9a1ae3f1e5327d0451cffd6e4567b449.tar.gz gnupg-c46e8bfe9a1ae3f1e5327d0451cffd6e4567b449.zip | |
g10/packet.h: Remove unused argument from enum_sig_subpkt.
* g10/packet.h (enum_sig_subpkt): Remove argument RET_N. Update
callers.
* g10/parse-packet.c (enum_sig_subpkt): Remove argument RET_N.
--
Remove the RET_N argument, because it is unused and because it is
meaningless: it's not clear whether it is an offset into SIG->HASHED
or SIG->UNHASHED.
Signed-off-by: Neal H. Walfield <[email protected]>.
Diffstat (limited to 'g10/parse-packet.c')
| -rw-r--r-- | g10/parse-packet.c | 11 |
1 files changed, 5 insertions, 6 deletions
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; |