aboutsummaryrefslogtreecommitdiffstats
path: root/g10/parse-packet.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>1998-07-29 19:35:05 +0000
committerWerner Koch <[email protected]>1998-07-29 19:35:05 +0000
commit5ae562b41d9e3ec965643b902bf8593c8ca5a2d7 (patch)
tree059ed09c380b3f534479add19933dbe9a7a401c9 /g10/parse-packet.c
parentchanged trustdb design (diff)
downloadgnupg-5ae562b41d9e3ec965643b902bf8593c8ca5a2d7.tar.gz
gnupg-5ae562b41d9e3ec965643b902bf8593c8ca5a2d7.zip
edit-key is now complete
Diffstat (limited to 'g10/parse-packet.c')
-rw-r--r--g10/parse-packet.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 310feae29..60e0042da 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -349,7 +349,7 @@ parse( IOBUF inp, PACKET *pkt, int reqtype, ulong *retpos,
}
leave:
- if( rc == -1 && iobuf_error(inp) )
+ if( !rc && iobuf_error(inp) )
rc = G10ERR_INV_KEYRING;
return rc;
}
@@ -434,7 +434,8 @@ skip_rest( IOBUF inp, unsigned long pktlen )
}
else {
for( ; pktlen; pktlen-- )
- iobuf_get(inp);
+ if( iobuf_get(inp) == -1 )
+ break;
}
}
@@ -1048,6 +1049,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
rc = G10ERR_INVALID_PACKET;
goto leave;
}
+ /* fixme: Add support for other blocksizes */
for(i=0; i < 8 && pktlen; i++, pktlen-- )
temp[i] = iobuf_get_noeof(inp);
if( list_mode ) {