aboutsummaryrefslogtreecommitdiffstats
path: root/g10/parse-packet.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2000-01-24 21:14:42 +0000
committerWerner Koch <[email protected]>2000-01-24 21:14:42 +0000
commitdb43afc923f32d39d06c20c1d4fb698cbad0897c (patch)
tree9acd52a1070205f7aa290374045092e3b64e1a94 /g10/parse-packet.c
parentAdd files to new directory. (diff)
downloadgnupg-db43afc923f32d39d06c20c1d4fb698cbad0897c.tar.gz
gnupg-db43afc923f32d39d06c20c1d4fb698cbad0897c.zip
See ChangeLog: Mon Jan 24 22:24:38 CET 2000 Werner Koch
Diffstat (limited to 'g10/parse-packet.c')
-rw-r--r--g10/parse-packet.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index dffb874b0..71fa19ed5 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1420,10 +1420,11 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
printf("\tencrypted stuff follows\n");
}
}
- else { /* v3 method: the mpi length is not encrypted */
+ else { /* unencrypted v4 or v3 method (where length is not encrypted) */
for(i=npkey; i < nskey; i++ ) {
n = pktlen;
- sk->skey[i] = mpi_read_opaque(inp, &n );
+ sk->skey[i] = sk->is_protected ? mpi_read_opaque(inp, &n )
+ : mpi_read( inp, &n, 1 );
pktlen -=n;
if( list_mode ) {
printf( "\tskey[%d]: ", i);