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

bcgit · Apr 24, 2024 · 0e74ba0 · 0e74ba0
2 parents 541da67 + 6759453
commit 0e74ba0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/tls/src/main/java/org/bouncycastle/tls/DTLSClientProtocol.java b/tls/src/main/java/org/bouncycastle/tls/DTLSClientProtocol.java
@@ -620,13 +620,10 @@ protected boolean establishSession(ClientHandshakeState state, TlsSession sessio
             return false;
         }
 
-        boolean isEMS = sessionParameters.isExtendedMasterSecret();
-        if (!TlsUtils.isExtendedMasterSecretOptional(sessionVersion))
+        if (!sessionParameters.isExtendedMasterSecret() &&
+            !TlsUtils.isExtendedMasterSecretOptional(sessionVersion))
         {
-            if (!isEMS)
-            {
-                return false;
-            }
+            return false;
         }
 
         TlsCrypto crypto = state.clientContext.getCrypto();

diff --git a/tls/src/main/java/org/bouncycastle/tls/DTLSServerProtocol.java b/tls/src/main/java/org/bouncycastle/tls/DTLSServerProtocol.java
@@ -751,13 +751,10 @@ protected boolean establishSession(ServerHandshakeState state, TlsSession sessio
             return false;
         }
 
-        boolean isEMS = sessionParameters.isExtendedMasterSecret();
-        if (!TlsUtils.isExtendedMasterSecretOptional(sessionVersion))
+        if (!sessionParameters.isExtendedMasterSecret() &&
+            !TlsUtils.isExtendedMasterSecretOptional(sessionVersion))
         {
-            if (!isEMS)
-            {
-                return false;
-            }
+            return false;
         }
 
         TlsCrypto crypto = state.serverContext.getCrypto();

diff --git a/tls/src/main/java/org/bouncycastle/tls/TlsProtocol.java b/tls/src/main/java/org/bouncycastle/tls/TlsProtocol.java
@@ -1582,17 +1582,9 @@ protected boolean establishSession(TlsSession sessionToResume)
             return false;
         }
 
-        boolean isEMS = sessionParameters.isExtendedMasterSecret();
-        if (sessionVersion.isSSL())
+        if (!TlsUtils.isExtendedMasterSecretOptional(sessionVersion))
         {
-            if (isEMS)
-            {
-                return false;
-            }
-        }
-        else if (!TlsUtils.isExtendedMasterSecretOptional(sessionVersion))
-        {
-            if (!isEMS)
+            if (sessionParameters.isExtendedMasterSecret() == sessionVersion.isSSL())
             {
                 return false;
             }