Merge branch 'main' of gitlab.cryptoworkshop.com:root/bc-java

Author: dghgit

tls/src/main/java/org/bouncycastle/tls/DTLSRecordLayer.java

@@ -288,6 +288,9 @@ public int receive(byte[] buf, int off, int len, int waitMillis)
         return receive(buf, off, len, waitMillis, null);
     }
 
+    /**
+     * A waitMillis of zero is interpreted as an infinite timeout.
+     */
     int receive(byte[] buf, int off, int len, int waitMillis, DTLSRecordCallback recordCallback)
         throws IOException
     {

tls/src/main/java/org/bouncycastle/tls/DTLSReliableHandshake.java

@@ -100,15 +100,17 @@ static void sendHelloVerifyRequest(DatagramSender sender, long recordSeq, byte[]
     DTLSReliableHandshake(TlsContext context, DTLSRecordLayer transport, int timeoutMillis, int initialResendMillis,
         DTLSRequest request)
     {
+        long currentTimeMillis = System.currentTimeMillis();
+
         this.recordLayer = transport;
         this.handshakeHash = new DeferredHash(context);
-        this.handshakeTimeout = Timeout.forWaitMillis(timeoutMillis);
+        this.handshakeTimeout = Timeout.forWaitMillis(timeoutMillis, currentTimeMillis);
         this.initialResendMillis = initialResendMillis;
 
         if (null != request)
         {
             resendMillis = initialResendMillis;
-            resendTimeout = new Timeout(resendMillis);
+            resendTimeout = new Timeout(resendMillis, currentTimeMillis);
 
             long recordSeq = request.getRecordSeq();
             int messageSeq = request.getMessageSeq();

tls/src/main/java/org/bouncycastle/tls/DTLSTransport.java

@@ -31,6 +31,9 @@ public int receive(byte[] buf, int off, int len, int waitMillis)
         return receive(buf, off, len, waitMillis, null);
     }
 
+    /**
+     * A waitMillis of zero is interpreted as an infinite timeout.
+     */
     public int receive(byte[] buf, int off, int len, int waitMillis, DTLSRecordCallback recordCallback)    
         throws IOException
     {

tls/src/main/java/org/bouncycastle/tls/DatagramReceiver.java

@@ -6,5 +6,8 @@ public interface DatagramReceiver
 {
     int getReceiveLimit() throws IOException;
 
+    /**
+     * A waitMillis of zero is interpreted as an infinite timeout.
+     */
     int receive(byte[] buf, int off, int len, int waitMillis) throws IOException;
 }

tls/src/main/java/org/bouncycastle/tls/Timeout.java

@@ -16,11 +16,6 @@ class Timeout
         this.startMillis = Math.max(0, currentTimeMillis);
     }
 
-//    long remainingMillis()
-//    {
-//        return remainingMillis(System.currentTimeMillis());
-//    }
-
     synchronized long remainingMillis(long currentTimeMillis)
     {
         // If clock jumped backwards, reset start time 
@@ -42,11 +37,6 @@ synchronized long remainingMillis(long currentTimeMillis)
         return remaining;
     }
 
-//    static int constrainWaitMillis(int waitMillis, Timeout timeout)
-//    {
-//        return constrainWaitMillis(waitMillis, timeout, System.currentTimeMillis());
-//    }
-
     static int constrainWaitMillis(int waitMillis, Timeout timeout, long currentTimeMillis)
     {
         if (waitMillis < 0)
@@ -72,11 +62,6 @@ static int constrainWaitMillis(int waitMillis, Timeout timeout, long currentTime
         return Math.min(waitMillis, timeoutMillis);
     }
 
-    static Timeout forWaitMillis(int waitMillis)
-    {
-        return forWaitMillis(waitMillis, System.currentTimeMillis());
-    }
-
     static Timeout forWaitMillis(int waitMillis, long currentTimeMillis)
     {
         if (waitMillis < 0)
@@ -90,11 +75,6 @@ static Timeout forWaitMillis(int waitMillis, long currentTimeMillis)
         return null;
     }
 
-//    static int getWaitMillis(Timeout timeout)
-//    {
-//        return getWaitMillis(timeout, System.currentTimeMillis());
-//    }
-
     static int getWaitMillis(Timeout timeout, long currentTimeMillis)
     {
         if (null == timeout)
@@ -113,11 +93,6 @@ static int getWaitMillis(Timeout timeout, long currentTimeMillis)
         return (int)remainingMillis;
     }
 
-//    static boolean hasExpired(Timeout timeout)
-//    {
-//        return hasExpired(timeout, System.currentTimeMillis());
-//    }
-
     static boolean hasExpired(Timeout timeout, long currentTimeMillis)
     {
         return null != timeout && timeout.remainingMillis(currentTimeMillis) < 1L;