mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-21 14:47:03 +01:00
Fix bug #931
This commit is contained in:
parent
96f16f736e
commit
b77e7c9f2e
@ -1,5 +1,8 @@
|
|||||||
2008-09-25 Werner Koch <wk@g10code.com>
|
2008-09-25 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
|
* parse-packet.c (parse): Remove special treatment for compressed
|
||||||
|
new style packets. Fixes bug#931.
|
||||||
|
|
||||||
* card-util.c (change_pin): Support setting of the reset code.
|
* card-util.c (change_pin): Support setting of the reset code.
|
||||||
|
|
||||||
2008-09-24 Werner Koch <wk@g10code.com>
|
2008-09-24 Werner Koch <wk@g10code.com>
|
||||||
|
@ -395,12 +395,20 @@ parse( IOBUF inp, PACKET *pkt, int onlykeypkts, off_t *retpos,
|
|||||||
rc = gpg_error (GPG_ERR_INV_PACKET);
|
rc = gpg_error (GPG_ERR_INV_PACKET);
|
||||||
goto leave;
|
goto leave;
|
||||||
}
|
}
|
||||||
if (pkttype == PKT_COMPRESSED) {
|
|
||||||
iobuf_set_partial_block_mode(inp, c & 0xff);
|
/* The follwing code has been here for ages (2002-08-30) but it is
|
||||||
pktlen = 0;/* to indicate partial length */
|
clearly wrong: For example passing a 0 as second argument to
|
||||||
partial=1;
|
iobuf_set_partial_block_mode stops the partial block mode which we
|
||||||
}
|
definitely do not want. Also all values < 224 or 255 are not
|
||||||
else {
|
valid. Let's disable it and put PKT_COMPRESSED into the list of
|
||||||
|
allowed packets with partial header until someone complains. */
|
||||||
|
/* if (pkttype == PKT_COMPRESSED) { */
|
||||||
|
/* iobuf_set_partial_block_mode(inp, c & 0xff); */
|
||||||
|
/* pktlen = 0; /\* to indicate partial length *\/ */
|
||||||
|
/* partial=1; */
|
||||||
|
/* } */
|
||||||
|
/* else */
|
||||||
|
{
|
||||||
hdr[hdrlen++] = c;
|
hdr[hdrlen++] = c;
|
||||||
if( c < 192 )
|
if( c < 192 )
|
||||||
pktlen = c;
|
pktlen = c;
|
||||||
@ -433,19 +441,21 @@ parse( IOBUF inp, PACKET *pkt, int onlykeypkts, off_t *retpos,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Partial body length. Note that we handled
|
/* Partial body length. */
|
||||||
PKT_COMPRESSED earlier. */
|
switch (pkttype)
|
||||||
if(pkttype==PKT_PLAINTEXT || pkttype==PKT_ENCRYPTED
|
{
|
||||||
|| pkttype==PKT_ENCRYPTED_MDC)
|
case PKT_PLAINTEXT:
|
||||||
{
|
case PKT_ENCRYPTED:
|
||||||
|
case PKT_ENCRYPTED_MDC:
|
||||||
|
case PKT_COMPRESSED:
|
||||||
iobuf_set_partial_block_mode(inp, c & 0xff);
|
iobuf_set_partial_block_mode(inp, c & 0xff);
|
||||||
pktlen = 0;/* to indicate partial length */
|
pktlen = 0;/* To indicate partial length. */
|
||||||
partial=1;
|
partial=1;
|
||||||
}
|
break;
|
||||||
else
|
|
||||||
{
|
default:
|
||||||
log_error("%s: partial length for invalid"
|
log_error("%s: partial length for invalid"
|
||||||
" packet type %d\n",iobuf_where(inp),pkttype);
|
" packet type %d\n", iobuf_where(inp),pkttype);
|
||||||
rc = gpg_error (GPG_ERR_INV_PACKET);
|
rc = gpg_error (GPG_ERR_INV_PACKET);
|
||||||
goto leave;
|
goto leave;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user