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

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-10-09 04:41:49 +0000 (Tue, 09 Oct 2007)
New Revision: 15441

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
Log:
JFK: refactor things a bit

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java	2007-10-09 04:40:19 UTC (rev 15440)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java	2007-10-09 04:41:49 UTC (rev 15441)
@@ -2440,7 +2440,7 @@
 			if((currentDHContext == null) || (currentDHContextLifetime + 1800000 /*30mins*/) < now) {
 				currentDHContextLifetime = now;
 				currentDHContext = DiffieHellman.generateLightContext();
-				currentDHContext.setSignature(signDHParams(currentDHContext.myExponential, crypto.getCryptoGroup()));
+				currentDHContext.setSignature(crypto.sign(SHA256.digest(assembleDHParams(currentDHContext.myExponential, crypto.getCryptoGroup()))));
 			}
 		}
 		return currentDHContext;
@@ -2480,13 +2480,6 @@
 
 		return result;
 	}
-
-	/*
-	 * Actually sign the DH parameters for message2
-	 */
-	private DSASignature signDHParams(BigInteger exponential, DSAGroup group) {
-		return crypto.sign(SHA256.digest(assembleDHParams(exponential, group)));
-	}
 	
 	private byte[] getTransientKey() {
 		synchronized (authenticatorCache) {