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

[t...@freenetproject.org]

Author: toad
Date: 2007-12-15 00:16:43 +0000 (Sat, 15 Dec 2007)
New Revision: 16555

Modified:
   trunk/freenet/src/freenet/node/NodeCrypto.java
Log:
Don't silently ignore failure - try the backup.

Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java      2007-12-14 23:53:36 UTC 
(rev 16554)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java      2007-12-15 00:16:43 UTC 
(rev 16555)
@@ -192,15 +192,11 @@
                        privKey = DSAPrivateKey.create(fs.subset("dsaPrivKey"), 
cryptoGroup);
                        pubKey = DSAPublicKey.create(fs.subset("dsaPubKey"), 
cryptoGroup);
                } catch (IllegalBase64Exception e) {
-                       if(logMINOR) Logger.minor(this, "Caught "+e, e);
-                       this.cryptoGroup = Global.DSAgroupBigA;
-                       this.privKey = new DSAPrivateKey(cryptoGroup, random);
-                       this.pubKey = new DSAPublicKey(cryptoGroup, privKey);
+                       Logger.error(this, "Caught "+e, e);
+                       throw new IOException(e.toString());
                } catch (FSParseException e) {
-                       if(logMINOR) Logger.minor(this, "Caught "+e, e);
-                       this.cryptoGroup = Global.DSAgroupBigA;
-                       this.privKey = new DSAPrivateKey(cryptoGroup, random);
-                       this.pubKey = new DSAPublicKey(cryptoGroup, privKey);
+                       Logger.error(this, "Caught "+e, e);
+                       throw new IOException(e.toString());
                }
                InsertableClientSSK ark = null;