[Cryptix-commits] projects/openpgp/src/cryptix/openpgp/packet PGPCompressedDataPacket.java

[<ed...@bo...>]

edwin       03/08/23 07:17:45

  Modified:    openpgp/src/cryptix/openpgp/packet
                        PGPCompressedDataPacket.java
  Log:
  Now (hopefully) really fix all zlib problems.

Revision  Changes    Path
1.14      +7 -3      projects/openpgp/src/cryptix/openpgp/packet/PGPCompressedDataPacket.java

Index: PGPCompressedDataPacket.java
===================================================================
RCS file: /home/cryptix-cvs/cvsroot/projects/openpgp/src/cryptix/openpgp/packet/PGPCompressedDataPacket.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PGPCompressedDataPacket.java	23 Aug 2003 06:36:05 -0000	1.13
+++ PGPCompressedDataPacket.java	23 Aug 2003 11:17:45 -0000	1.14
@@ -1,4 +1,4 @@
-/* $Id: PGPCompressedDataPacket.java,v 1.13 2003/08/23 06:36:05 edwin Exp $
+/* $Id: PGPCompressedDataPacket.java,v 1.14 2003/08/23 11:17:45 edwin Exp $
  *
  * Copyright (C) 1999-2002 The Cryptix Foundation Limited.
  * All rights reserved.
@@ -17,6 +17,7 @@
 
 import cryptix.openpgp.io.PGPCompressorInputStream;
 import cryptix.openpgp.io.PGPCompressorOutputStream;
+import cryptix.openpgp.io.PGPInputStreamAdapter;
 import cryptix.openpgp.io.PGPOutputStreamAdapter;
 import cryptix.openpgp.io.PGPPacketDataInputStream;
 import cryptix.openpgp.io.PGPPacketDataOutputStream;
@@ -45,7 +46,7 @@
  * @see cryptix.openpgp.packet.PGPPacketFactory
  *
  * @author Mathias Kolehmainen (ri...@ro...)
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
  */
 public class PGPCompressedDataPacket extends PGPContainerPacket {
     
@@ -132,7 +133,10 @@
     PGPCompressorInputStream expander;
     try {
         PGPCompressor cp = factory.getCompressionAlgorithm(alg);
-        expander = cp.getExpansionStream(new PGPZLibInputStreamAdapter(in));
+        if (cp.needsDummy())
+            expander = cp.getExpansionStream(new PGPZLibInputStreamAdapter(in));
+        else
+            expander = cp.getExpansionStream(new PGPInputStreamAdapter(in));
     } catch (NoSuchAlgorithmException nsae) {
         in.readByteArray();
         throw new PGPDataFormatException("id not found - "+nsae);