|
From: <ed...@bo...> - 2003-08-23 11:17:32
|
edwin 03/08/23 07:17:30
Modified: openpgp/src/cryptix/openpgp/algorithm PGPCompressor.java
PGPDeflate.java PGPUncompressed.java
Log:
Now (hopefully) really fix all zlib problems.
Revision Changes Path
1.9 +5 -2 projects/openpgp/src/cryptix/openpgp/algorithm/PGPCompressor.java
Index: PGPCompressor.java
===================================================================
RCS file: /home/cryptix-cvs/cvsroot/projects/openpgp/src/cryptix/openpgp/algorithm/PGPCompressor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PGPCompressor.java 9 Aug 2001 21:19:47 -0000 1.8
+++ PGPCompressor.java 23 Aug 2003 11:17:30 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Id: PGPCompressor.java,v 1.8 2001/08/09 21:19:47 edwin Exp $
+/* $Id: PGPCompressor.java,v 1.9 2003/08/23 11:17:30 edwin Exp $
*
* Copyright (C) 1999-2001 The Cryptix Foundation Limited.
* All rights reserved.
@@ -32,7 +32,7 @@
* @see cryptix.openpgp.algorithm.PGPAlgorithmFactory
*
* @author Mathias Kolehmainen (ri...@ro...)
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public interface PGPCompressor {
@@ -55,4 +55,7 @@
PGPCompressorInputStream getExpansionStream(InputStream in);
+
+ boolean needsDummy();
+
}
1.2 +6 -2 projects/openpgp/src/cryptix/openpgp/algorithm/PGPDeflate.java
Index: PGPDeflate.java
===================================================================
RCS file: /home/cryptix-cvs/cvsroot/projects/openpgp/src/cryptix/openpgp/algorithm/PGPDeflate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PGPDeflate.java 26 Aug 2001 19:20:20 -0000 1.1
+++ PGPDeflate.java 23 Aug 2003 11:17:30 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: PGPDeflate.java,v 1.1 2001/08/26 19:20:20 edwin Exp $
+/* $Id: PGPDeflate.java,v 1.2 2003/08/23 11:17:30 edwin Exp $
*
* Copyright (C) 1999-2001 The Cryptix Foundation Limited.
* All rights reserved.
@@ -34,7 +34,7 @@
*
* @author Mathias Kolehmainen (ri...@ro...)
* @author Edwin Woudt (ed...@cr...)
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class PGPDeflate implements PGPCompressor {
@@ -126,6 +126,10 @@
public PGPCompressorInputStream getExpansionStream(InputStream in) {
return(new ZlibIn(new InflaterInputStream(in, createInflater())));
+ }
+
+ public boolean needsDummy() {
+ return nowrap;
}
1.9 +7 -2 projects/openpgp/src/cryptix/openpgp/algorithm/PGPUncompressed.java
Index: PGPUncompressed.java
===================================================================
RCS file: /home/cryptix-cvs/cvsroot/projects/openpgp/src/cryptix/openpgp/algorithm/PGPUncompressed.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PGPUncompressed.java 22 Apr 2002 17:42:09 -0000 1.8
+++ PGPUncompressed.java 23 Aug 2003 11:17:30 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Id: PGPUncompressed.java,v 1.8 2002/04/22 17:42:09 edwin Exp $
+/* $Id: PGPUncompressed.java,v 1.9 2003/08/23 11:17:30 edwin Exp $
*
* Copyright (C) 1999-2002 The Cryptix Foundation Limited.
* All rights reserved.
@@ -24,7 +24,7 @@
* Implements the "no compression" algorithm.
*
* @author Mathias Kolehmainen (ri...@ro...)
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class PGPUncompressed implements PGPCompressor {
@@ -84,4 +84,9 @@
}
+ public boolean needsDummy() {
+ return false;
+ }
+
+
}
|