[freenet-cvs] r15390 - branches/freenet-jfk/src/freenet/node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-09-29 18:13:44 +0000 (Sat, 29 Sep 2007)
New Revision: 15390

Modified:
   branches/freenet-jfk/src/freenet/node/FNPPacketMangler.java
Log:
Renew DH parameters every 30mins

Modified: branches/freenet-jfk/src/freenet/node/FNPPacketMangler.java
===================================================================
--- branches/freenet-jfk/src/freenet/node/FNPPacketMangler.java 2007-09-29 
17:49:29 UTC (rev 15389)
+++ branches/freenet-jfk/src/freenet/node/FNPPacketMangler.java 2007-09-29 
18:13:44 UTC (rev 15390)
@@ -75,8 +75,10 @@

        private final HashMap authenticatorCache;

-       /** We renew it on each *successful* run of the protocol (the spec. 
says "once a while") - access is synchronized! */
+       /** We renew it every 30mins (the spec. says "once a while") - access 
is synchronized! */
        private DiffieHellmanLightContext currentDHContext = null;
+       private long currentDHContextLifetime = 0;
+       
        protected static final int NONCE_SIZE = 8;
        /**
         * How big can the authenticator get before we flush it ?
@@ -815,7 +817,6 @@
                // Send reply
                sendMessage4Packet(1, 2, 3, nonceInitiator, 
nonceResponder,initiatorExponential, responderExponential, c, Ke, Ka, 
authenticator, pn, replyTo);

-               //FIXME: rekey .... ?
                c.initialize(Ks);
                if(!pn.completedHandshake(bootID, data, 8, data.length-8, c, 
Ks, replyTo, true)) {
                        Logger.error(this, "Handshake failure! with "+pn);
@@ -2381,10 +2382,15 @@
                return crypto.config.alwaysAllowLocalAddresses();
        }

-       private synchronized DiffieHellmanLightContext 
getLightDiffieHellmanContext(PeerNode pn) {
-               if(currentDHContext == null) {
-                       currentDHContext = DiffieHellman.generateLightContext();
-                       
currentDHContext.setSignature(signDHParams(currentDHContext.myExponential, 
pn.peerCryptoGroup));
+       private DiffieHellmanLightContext getLightDiffieHellmanContext(PeerNode 
pn) {
+               final long now = System.currentTimeMillis();
+               
+               synchronized (this) {
+                       if((currentDHContext == null) || 
(currentDHContextLifetime + 1800000 /*30mins*/) < now) {
+                               currentDHContextLifetime = now;
+                               currentDHContext = 
DiffieHellman.generateLightContext();
+                               
currentDHContext.setSignature(signDHParams(currentDHContext.myExponential, 
pn.peerCryptoGroup));
+                       }
                }
                return currentDHContext;
        }