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

Author: dghgit

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

@@ -484,22 +484,34 @@ protected void handleHandshakeMessage(short type, HandshakeMessageInput buf)
                 {
                     process13HelloRetryRequest(serverHello);
                     handshakeHash.notifyPRFDetermined();
-                    handshakeHash.sealHashAlgorithms();
+
                     TlsUtils.adjustTranscriptForRetry(handshakeHash);
+
                     buf.updateHash(handshakeHash);
                     this.connection_state = CS_SERVER_HELLO_RETRY_REQUEST;
 
                     send13ClientHelloRetry();
                     this.connection_state = CS_CLIENT_HELLO_RETRY;
+
+                    /*
+                     * PSK binders (if any) when retrying ClientHello currently require handshakeHash buffering
+                     */
+                    handshakeHash.sealHashAlgorithms();
                 }
                 else
                 {
                     processServerHello(serverHello);
                     handshakeHash.notifyPRFDetermined();
+
                     if (TlsUtils.isTLSv13(securityParameters.getNegotiatedVersion()))
                     {
                         handshakeHash.sealHashAlgorithms();
                     }
+                    else
+                    {
+                        // For pre-1.3 wait until ServerHelloDone is received
+                    }
+
                     buf.updateHash(handshakeHash);
                     this.connection_state = CS_SERVER_HELLO;
 
@@ -902,15 +914,15 @@ protected void process13HelloRetryRequest(ServerHello helloRetryRequest)
             }
         }
 
-        final int selected_group = TlsExtensionsUtils.getKeyShareHelloRetryRequest(extensions);
+        final int selectedGroup = TlsExtensionsUtils.getKeyShareHelloRetryRequest(extensions);
 
         /*
          * TODO[tls:psk_ke]
          *
          * RFC 8446 4.2.8. Servers [..] MUST NOT send a KeyShareEntry when using the "psk_ke"
          * PskKeyExchangeMode.
          */
-        if (selected_group < 0)
+        if (selectedGroup < 0)
         {
             throw new TlsFatalAlert(AlertDescription.missing_extension,
                 "missing extension response: " + ExtensionType.getText(ExtensionType.key_share));
@@ -925,7 +937,7 @@ protected void process13HelloRetryRequest(ServerHello helloRetryRequest)
          * MUST abort the handshake with an "illegal_parameter" alert.
          */
         if (!TlsUtils.isValidKeyShareSelection(server_version, securityParameters.getClientSupportedGroups(),
-            clientAgreements, selected_group))
+            clientAgreements, selectedGroup))
         {
             throw new TlsFatalAlert(AlertDescription.illegal_parameter, "invalid key_share selected");
         }
@@ -946,7 +958,7 @@ protected void process13HelloRetryRequest(ServerHello helloRetryRequest)
 
         this.clientAgreements = null;
         this.retryCookie = cookie;
-        this.retryGroup = selected_group;
+        this.retryGroup = selectedGroup;
     }
 
     protected void process13ServerHello(ServerHello serverHello, boolean afterHelloRetryRequest)
@@ -1051,8 +1063,8 @@ protected void process13ServerHello(ServerHello serverHello, boolean afterHelloR
 
         TlsSecret sharedSecret = null;
         {
-            KeyShareEntry keyShareEntry = TlsExtensionsUtils.getKeyShareServerHello(extensions);
-            if (null == keyShareEntry)
+            KeyShareEntry serverShare = TlsExtensionsUtils.getKeyShareServerHello(extensions);
+            if (null == serverShare)
             {
                 if (afterHelloRetryRequest
                     || null == pskEarlySecret
@@ -1069,14 +1081,15 @@ protected void process13ServerHello(ServerHello serverHello, boolean afterHelloR
                     throw new TlsFatalAlert(AlertDescription.illegal_parameter);
                 }
 
-                int namedGroup = keyShareEntry.getNamedGroup();
+                int namedGroup = serverShare.getNamedGroup();
+
                 TlsAgreement agreement = (TlsAgreement)clientAgreements.get(Integers.valueOf(namedGroup));
                 if (null == agreement)
                 {
                     throw new TlsFatalAlert(AlertDescription.illegal_parameter);
                 }
 
-                agreement.receivePeerValue(keyShareEntry.getKeyExchange());
+                agreement.receivePeerValue(serverShare.getKeyExchange());
                 sharedSecret = agreement.calculateSecret();
             }
         }

tls/src/test/java/org/bouncycastle/tls/test/LoggingDatagramTransport.java

@@ -9,6 +9,7 @@
 public class LoggingDatagramTransport
     implements DatagramTransport
 {
+    private static final boolean ENABLE_DUMPS = false;
 
     private static final String HEX_CHARS = "0123456789ABCDEF";
 
@@ -62,6 +63,11 @@ public void close()
     private void dumpDatagram(String verb, byte[] buf, int off, int len)
         throws IOException
     {
+        if (!ENABLE_DUMPS)
+        {
+            return;
+        }
+
         long timestamp = System.currentTimeMillis() - launchTimestamp;
         StringBuffer sb = new StringBuffer("(+" + timestamp + "ms) " + verb + " " + len + " byte datagram:");
         for (int pos = 0; pos < len; ++pos)

tls/src/test/java/org/bouncycastle/tls/test/MockDTLSClient.java

@@ -80,7 +80,7 @@ public void notifyServerVersion(ProtocolVersion serverVersion) throws IOExceptio
     {
         super.notifyServerVersion(serverVersion);
 
-        System.out.println("DTLS client negotiated " + serverVersion);
+        System.out.println("DTLS client negotiated version " + serverVersion);
     }
 
     public TlsAuthentication getAuthentication() throws IOException

tls/src/test/java/org/bouncycastle/tls/test/MockDTLSServer.java

@@ -64,7 +64,7 @@ public ProtocolVersion getServerVersion() throws IOException
     {
         ProtocolVersion serverVersion = super.getServerVersion();
 
-        System.out.println("DTLS server negotiated " + serverVersion);
+        System.out.println("DTLS server negotiated version " + serverVersion);
 
         return serverVersion;
     }

tls/src/test/java/org/bouncycastle/tls/test/MockPSKDTLSClient.java

@@ -88,7 +88,7 @@ public void notifyServerVersion(ProtocolVersion serverVersion) throws IOExceptio
     {
         super.notifyServerVersion(serverVersion);
 
-        System.out.println("DTLS-PSK client negotiated " + serverVersion);
+        System.out.println("DTLS-PSK client negotiated version " + serverVersion);
     }
 
     public TlsAuthentication getAuthentication() throws IOException

tls/src/test/java/org/bouncycastle/tls/test/MockPSKDTLSServer.java

@@ -66,7 +66,7 @@ public ProtocolVersion getServerVersion() throws IOException
     {
         ProtocolVersion serverVersion = super.getServerVersion();
 
-        System.out.println("DTLS-PSK server negotiated " + serverVersion);
+        System.out.println("DTLS-PSK server negotiated version " + serverVersion);
 
         return serverVersion;
     }

tls/src/test/java/org/bouncycastle/tls/test/MockPSKTls13Client.java

@@ -109,7 +109,7 @@ public void notifyServerVersion(ProtocolVersion serverVersion) throws IOExceptio
     {
         super.notifyServerVersion(serverVersion);
 
-        System.out.println("TLS 1.3 PSK client negotiated " + serverVersion);
+        System.out.println("TLS 1.3 PSK client negotiated version " + serverVersion);
     }
 
     public TlsAuthentication getAuthentication() throws IOException

tls/src/test/java/org/bouncycastle/tls/test/MockPSKTls13Server.java

@@ -68,7 +68,7 @@ public ProtocolVersion getServerVersion() throws IOException
     {
         ProtocolVersion serverVersion = super.getServerVersion();
 
-        System.out.println("TLS 1.3 PSK server negotiated " + serverVersion);
+        System.out.println("TLS 1.3 PSK server negotiated version " + serverVersion);
 
         return serverVersion;
     }

tls/src/test/java/org/bouncycastle/tls/test/MockPSKTlsClient.java

@@ -108,7 +108,7 @@ public void notifyServerVersion(ProtocolVersion serverVersion) throws IOExceptio
     {
         super.notifyServerVersion(serverVersion);
 
-        System.out.println("TLS-PSK client negotiated " + serverVersion);
+        System.out.println("TLS-PSK client negotiated version " + serverVersion);
     }
 
     public TlsAuthentication getAuthentication() throws IOException

tls/src/test/java/org/bouncycastle/tls/test/MockPSKTlsServer.java

@@ -65,7 +65,7 @@ public ProtocolVersion getServerVersion() throws IOException
     {
         ProtocolVersion serverVersion = super.getServerVersion();
 
-        System.out.println("TLS-PSK server negotiated " + serverVersion);
+        System.out.println("TLS-PSK server negotiated version " + serverVersion);
 
         return serverVersion;
     }