diff options
| author | David Shaw <[email protected]> | 2004-02-15 00:04:32 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-02-15 00:04:32 +0000 |
| commit | 95d05215c380895448fd900c1952fbadb4649bec (patch) | |
| tree | f6aa66ee5deaa2aac60bdb6b2f6bb872ba770e99 /g10/parse-packet.c | |
| parent | * keyserver.c (argsep): Move to misc.c. (diff) | |
| download | gnupg-95d05215c380895448fd900c1952fbadb4649bec.tar.gz gnupg-95d05215c380895448fd900c1952fbadb4649bec.zip | |
* build-packet.c (write_header2): If a suggested header length is provided
along with a zero length, interpret this as an actual zero length packet
and not as an indeterminate length packet. (do_comment, do_user_id): Use
it here as these packets might be naturally zero length.
* parse-packet.c (parse): Show packet type when failing due to an
indeterminate length packet.
* misc.c (parse_options): Only provide args for the true (i.e. not
"no-xxx") form of options.
Diffstat (limited to '')
| -rw-r--r-- | g10/parse-packet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 6bffdda52..a99ebdba3 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1,6 +1,6 @@ /* parse-packet.c - read packets - * Copyright (C) 1998, 1999, 2000, 2001, 2002, - * 2003 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, + * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -383,11 +383,11 @@ parse( IOBUF inp, PACKET *pkt, int onlykeypkts, off_t *retpos, case PKT_COMPRESSED: break; /* the orginal pgp 2 way. */ - default: - log_error ("%s: old style partial length " - "for invalid packet type\n", iobuf_where(inp) ); - rc = G10ERR_INVALID_PACKET; - goto leave; + default: + log_error ("%s: old style partial length for invalid" + " packet type %d\n", iobuf_where(inp), pkttype ); + rc = G10ERR_INVALID_PACKET; + goto leave; } } else { |