[freenet-cvs] r15108 - trunk/freenet/src/freenet/support/io

[juice...@freenetproject.org]

Author: juiceman
Date: 2007-09-10 04:42:04 +0000 (Mon, 10 Sep 2007)
New Revision: 15108

Modified:
   trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
   trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java
Log:
Remove more pre-1010 cruft.  Review encouraged

I think this is all I can remove.  There is still the variable cryptBlockSize 
in Rijndael.java but I don't know how to cleanly remove it.

Modified: 
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java  
2007-09-10 04:11:07 UTC (rev 15107)
+++ trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java  
2007-09-10 04:42:04 UTC (rev 15108)
@@ -32,7 +32,6 @@
        private SoftReference /* <Rijndael> */ aesRef;
        /** The decryption key. */
        private final byte[] key;
-       /** Broken (old) encryption? */
        private long dataLength;
        private boolean readOnly;
        private int lastOutputStream;
@@ -68,7 +67,7 @@
         * @param origRandom
         * @throws IOException 
         */
-       public PaddedEphemerallyEncryptedBucket(Bucket bucket, int minSize, 
long knownSize, byte[] key, RandomSource origRandom, boolean oldCrypto) throws 
IOException {
+       public PaddedEphemerallyEncryptedBucket(Bucket bucket, int minSize, 
long knownSize, byte[] key, RandomSource origRandom) throws IOException {
                if(bucket.size() < knownSize)
                        throw new IOException("Bucket "+bucket+" is too small 
on disk - knownSize="+knownSize+" but bucket.size="+bucket.size()+" for 
"+bucket);
                this.dataLength = knownSize;

Modified: 
trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java  
2007-09-10 04:11:07 UTC (rev 15107)
+++ trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java  
2007-09-10 04:42:04 UTC (rev 15108)
@@ -47,7 +47,7 @@
                                FileBucket fb = new FileBucket(fnam, false, 
true, false, false, true);
                                try {
                                        PaddedEphemerallyEncryptedBucket eb = 
-                                               new 
PaddedEphemerallyEncryptedBucket(fb, 1024, len, decryptKey, random, true);
+                                               new 
PaddedEphemerallyEncryptedBucket(fb, 1024, len, decryptKey, random);
                                        return eb;
                                } catch (IOException e) {
                                        throw new 
CannotCreateFromFieldSetException("Cannot create from old-format fieldset: "+e, 
e);