[freenet-cvs] r16319 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-12-05 14:14:15 +0000 (Wed, 05 Dec 2007)
New Revision: 16319

Modified:
   trunk/freenet/src/freenet/node/NodeCrypto.java
Log:
Make it final again. Sorry nextgens.

Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java      2007-12-05 14:10:27 UTC 
(rev 16318)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java      2007-12-05 14:14:15 UTC 
(rev 16319)
@@ -69,7 +69,7 @@
        static boolean logMINOR;
        final NodeCryptoConfig config;
        final NodeIPPortDetector detector;
-       private BlockCipher anonSetupCipher;
+       final BlockCipher anonSetupCipher;

        // Noderef related
        /** An ordered version of the noderef FieldSet, without the signature */
@@ -155,6 +155,8 @@
                socket.setLowLevelFilter(packetMangler = new 
FNPPacketMangler(node, this, socket));

                detector = new NodeIPPortDetector(node, node.ipDetector, this);
+
+               anonSetupCipher = new Rijndael(256,256);

                } catch (NodeInitException e) {
                        config.stopping(this);
@@ -165,6 +167,9 @@
                } catch (Error e) {
                        config.stopping(this);
                        throw e;
+               } catch (UnsupportedCipherException e) {
+                       config.stopping(this);
+                       throw new Error(e);
                } finally {
                        config.maybeStarted(this);
                }
@@ -240,12 +245,6 @@
                        myARKNumber = 0;
                }
                myARK = ark;
-
-               try {
-                       anonSetupCipher = new Rijndael(256,256);
-               } catch (UnsupportedCipherException e) {
-                       throw new Error(e);
-               }

        }

@@ -264,11 +263,6 @@
                myARK = InsertableClientSSK.createRandom(random, "ark");
                myARKNumber = 0;
                SHA256.returnMessageDigest(md);
-               try {
-                       anonSetupCipher = new Rijndael(256,256);
-               } catch (UnsupportedCipherException e) {
-                       throw new Error(e);
-               }
                anonSetupCipher.initialize(identityHash);
        }