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

Author: dghgit

ci/common.sh

@@ -1,2 +1,3 @@
 
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+

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

@@ -94,14 +94,15 @@ protected static void sendCertificateMessage(TlsContext context, DTLSReliableHan
     protected static int validateSelectedCipherSuite(int selectedCipherSuite, short alertDescription)
         throws IOException
     {
-        switch (TlsUtils.getEncryptionAlgorithm(selectedCipherSuite))
+        int encryptionAlgorithm = TlsUtils.getEncryptionAlgorithm(selectedCipherSuite);
+        if (EncryptionAlgorithm.NULL != encryptionAlgorithm)
         {
-        case EncryptionAlgorithm.RC4_40:
-        case EncryptionAlgorithm.RC4_128:
-        case -1:
-            throw new TlsFatalAlert(alertDescription);
-        default:
-            return selectedCipherSuite;
+            int cipherType = TlsUtils.getEncryptionAlgorithmType(encryptionAlgorithm);
+            if (cipherType < 0 || CipherType.stream == cipherType)
+            {
+                throw new TlsFatalAlert(alertDescription);
+            }
         }
+        return selectedCipherSuite;
     }
 }

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

@@ -18,7 +18,6 @@ public class SecurityParameters
     short maxFragmentLength = -1;
     int prfAlgorithm = -1;
     int prfCryptoHashAlgorithm = -1;
-    short prfHashAlgorithm = -1;
     int prfHashLength = -1;
     int verifyDataLength = -1;
     TlsSecret baseKeyClient = null;
@@ -215,16 +214,6 @@ public int getPRFCryptoHashAlgorithm()
         return prfCryptoHashAlgorithm;
     }
 
-    /**
-     * @return {@link HashAlgorithm} for the current {@link PRFAlgorithm}
-     * 
-     * @deprecated Use {@link #getPRFCryptoHashAlgorithm()} instead.
-     */
-    public short getPRFHashAlgorithm()
-    {
-        return prfHashAlgorithm;
-    }
-
     public int getPRFHashLength()
     {
         return prfHashLength;

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

@@ -398,7 +398,7 @@ protected ServerHello generate13ServerHello(ClientHello clientHello, HandshakeMe
             int namedGroup = clientShare.getNamedGroup();
 
             TlsAgreement agreement;
-            if (NamedGroup.refersToASpecificCurve(namedGroup))
+            if (NamedGroup.refersToAnECDHCurve(namedGroup))
             {
                 agreement = crypto.createECDomain(new TlsECConfig(namedGroup)).createECDH();
             }

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

@@ -1960,30 +1960,6 @@ private static TlsSecret update13TrafficSecret(SecurityParameters securityParame
             EMPTY_BYTES, securityParameters.getPRFHashLength());
     }
 
-    /**
-     * @deprecated Will be removed. {@link TlsCryptoUtils#getHashForPRF(int)} should be a useful alternative.
-     */
-    public static short getHashAlgorithmForPRFAlgorithm(int prfAlgorithm)
-    {
-        switch (prfAlgorithm)
-        {
-        case PRFAlgorithm.ssl_prf_legacy:
-        case PRFAlgorithm.tls_prf_legacy:
-            throw new IllegalArgumentException("legacy PRF not a valid algorithm");
-        case PRFAlgorithm.tls_prf_sha256:
-        case PRFAlgorithm.tls13_hkdf_sha256:
-            return HashAlgorithm.sha256;
-        case PRFAlgorithm.tls_prf_sha384:
-        case PRFAlgorithm.tls13_hkdf_sha384:
-            return HashAlgorithm.sha384;
-        // TODO[RFC 8998]
-//        case PRFAlgorithm.tls13_hkdf_sm3:
-//            return HashAlgorithm.sm3;
-        default:
-            throw new IllegalArgumentException("unknown PRFAlgorithm: " + PRFAlgorithm.getText(prfAlgorithm));
-        }
-    }
-
     public static ASN1ObjectIdentifier getOIDForHashAlgorithm(short hashAlgorithm)
     {
         switch (hashAlgorithm)
@@ -5360,7 +5336,7 @@ private static void collectKeyShares(TlsClientContext clientContext, int[] suppo
             }
 
             TlsAgreement agreement = null;
-            if (NamedGroup.refersToASpecificCurve(supportedGroup))
+            if (NamedGroup.refersToAnECDHCurve(supportedGroup))
             {
                 if (crypto.hasECDHAgreement())
                 {
@@ -5433,7 +5409,7 @@ static KeyShareEntry selectKeyShare(TlsCrypto crypto, ProtocolVersion negotiated
                     continue;
                 }
 
-                if ((NamedGroup.refersToASpecificCurve(group) && !crypto.hasECDHAgreement()) ||
+                if ((NamedGroup.refersToAnECDHCurve(group) && !crypto.hasECDHAgreement()) ||
                     (NamedGroup.refersToASpecificFiniteField(group) && !crypto.hasDHAgreement()) ||
                     (NamedGroup.refersToASpecificKem(group) && !crypto.hasKemAgreement()))
                 {
@@ -5470,7 +5446,7 @@ static int selectKeyShareGroup(TlsCrypto crypto, ProtocolVersion negotiatedVersi
                     continue;
                 }
 
-                if ((NamedGroup.refersToASpecificCurve(group) && !crypto.hasECDHAgreement()) ||
+                if ((NamedGroup.refersToAnECDHCurve(group) && !crypto.hasECDHAgreement()) ||
                     (NamedGroup.refersToASpecificFiniteField(group) && !crypto.hasDHAgreement()) ||
                     (NamedGroup.refersToASpecificKem(group) && !crypto.hasKemAgreement()))
                 {
@@ -5622,7 +5598,6 @@ static void negotiatedCipherSuite(SecurityParameters securityParameters, int cip
         case PRFAlgorithm.tls_prf_legacy:
         {
             securityParameters.prfCryptoHashAlgorithm = -1;
-            securityParameters.prfHashAlgorithm = -1;
             securityParameters.prfHashLength = -1;
             break;
         }
@@ -5631,7 +5606,6 @@ static void negotiatedCipherSuite(SecurityParameters securityParameters, int cip
             int prfCryptoHashAlgorithm = TlsCryptoUtils.getHashForPRF(prfAlgorithm);
 
             securityParameters.prfCryptoHashAlgorithm = prfCryptoHashAlgorithm;
-            securityParameters.prfHashAlgorithm = getHashAlgorithmForPRFAlgorithm(prfAlgorithm);
             securityParameters.prfHashLength = TlsCryptoUtils.getHashOutputSize(prfCryptoHashAlgorithm);
             break;
         }