diff options
| author | David Shaw <[email protected]> | 2006-03-06 23:14:13 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-03-06 23:14:13 +0000 |
| commit | 5d2060e211773c7031a28c50818a0244107f9559 (patch) | |
| tree | 766505c1537613b9fca6bce2789ab844374c4c49 | |
| parent | Stricter test of allowed signature packet compositions. (diff) | |
| download | gnupg-5d2060e211773c7031a28c50818a0244107f9559.tar.gz gnupg-5d2060e211773c7031a28c50818a0244107f9559.zip | |
* mainproc.c (proc_compressed): "Uncompressed" is not a valid compression
algorithm.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/mainproc.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c43c1f9f0..71a0770dd 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2006-03-06 David Shaw <[email protected]> + + * mainproc.c (proc_compressed): "Uncompressed" is not a valid + compression algorithm. + 2006-03-06 Werner Koch <[email protected]> * mainproc.c (check_sig_and_print): Made the composition test more diff --git a/g10/mainproc.c b/g10/mainproc.c index 8512a9336..dd9909bcf 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -748,7 +748,9 @@ proc_compressed( CTX c, PACKET *pkt ) int rc; /*printf("zip: compressed data packet\n");*/ - if( c->sigs_only ) + if( !zd->algorithm ) + rc=G10ERR_COMPR_ALGO; + else if( c->sigs_only ) rc = handle_compressed( c, zd, proc_compressed_cb, c ); else if( c->encrypt_only ) rc = handle_compressed( c, zd, proc_encrypt_cb, c ); |