security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Fix bug #931

This commit is contained in:
Werner Koch 2008-09-25 12:55:50 +00:00
parent 96f16f736e
commit b77e7c9f2e
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
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.
2008-09-24 Werner Koch <wk@g10code.com>

42
g10/parse-packet.c
View File

@ -395,12 +395,20 @@ parse( IOBUF inp, PACKET *pkt, int onlykeypkts, off_t *retpos,
rc = gpg_error (GPG_ERR_INV_PACKET);
goto leave;
}
if (pkttype == PKT_COMPRESSED) {
iobuf_set_partial_block_mode(inp, c & 0xff);
pktlen = 0;/* to indicate partial length */
partial=1;
}
else {
/* The follwing code has been here for ages (2002-08-30) but it is
clearly wrong: For example passing a 0 as second argument to
iobuf_set_partial_block_mode stops the partial block mode which we
definitely do not want. Also all values < 224 or 255 are not
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;
if( c < 192 )
pktlen = c;
@ -433,19 +441,21 @@ parse( IOBUF inp, PACKET *pkt, int onlykeypkts, off_t *retpos,
}
else
{
/* Partial body length. Note that we handled
PKT_COMPRESSED earlier. */
if(pkttype==PKT_PLAINTEXT || pkttype==PKT_ENCRYPTED
|| pkttype==PKT_ENCRYPTED_MDC)
{
/* Partial body length. */
switch (pkttype)
{
case PKT_PLAINTEXT:
case PKT_ENCRYPTED:
case PKT_ENCRYPTED_MDC:
case PKT_COMPRESSED:
iobuf_set_partial_block_mode(inp, c & 0xff);
pktlen = 0;/* to indicate partial length */
pktlen = 0;/* To indicate partial length. */
partial=1;
}
else
{
break;
default:
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);
goto leave;
}