BCJSSE: Support for signature_algorithms_cert configuration

- see #1729

Author: peterdettman

tls/src/main/java/org/bouncycastle/jsse/BCSSLParameters.java

@@ -41,6 +41,7 @@ private static <T> List<T> copyList(Collection<T> list)
     private int maximumPacketSize = 0;
     private String[] applicationProtocols = TlsUtils.EMPTY_STRINGS;
     private String[] signatureSchemes = null;
+    private String[] signatureSchemesCert = null;
     private String[] namedGroups = null;
 
     public BCSSLParameters()
@@ -261,6 +262,30 @@ public void setSignatureSchemes(String[] signatureSchemes)
         this.signatureSchemes = check;
     }
 
+    public String[] getSignatureSchemesCert()
+    {
+        return TlsUtils.clone(signatureSchemesCert);
+    }
+
+    public void setSignatureSchemesCert(String[] signatureSchemesCert)
+    {
+        String[] check = null;
+
+        if (signatureSchemesCert != null)
+        {
+            check = TlsUtils.clone(signatureSchemesCert);
+            for (String entry : check)
+            {
+                if (TlsUtils.isNullOrEmpty(entry))
+                {
+                    throw new IllegalArgumentException("'signatureSchemesCert' entries cannot be null or empty strings");
+                }
+            }
+        }
+
+        this.signatureSchemesCert = check;
+    }
+
     public String[] getNamedGroups()
     {
         return TlsUtils.clone(namedGroups);

tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLParameters.java

@@ -44,6 +44,7 @@ private static <T> List<T> copyList(Collection<T> list)
     private int maximumPacketSize = 0;
     private String[] applicationProtocols = TlsUtils.EMPTY_STRINGS;
     private String[] signatureSchemes = null;
+    private String[] signatureSchemesCert = null;
     private String[] namedGroups = null;
 
     private BCApplicationProtocolSelector<SSLEngine> engineAPSelector;
@@ -72,6 +73,7 @@ ProvSSLParameters copy()
         p.maximumPacketSize = maximumPacketSize;
         p.applicationProtocols = applicationProtocols;
         p.signatureSchemes = signatureSchemes;
+        p.signatureSchemesCert = signatureSchemesCert;
         p.namedGroups = namedGroups;
         p.engineAPSelector = engineAPSelector;
         p.socketAPSelector = socketAPSelector;
@@ -257,6 +259,16 @@ public void setSignatureSchemes(String[] signatureSchemes)
         this.signatureSchemes = TlsUtils.clone(signatureSchemes);
     }
 
+    public String[] getSignatureSchemesCert()
+    {
+        return TlsUtils.clone(signatureSchemesCert);
+    }
+
+    public void setSignatureSchemesCert(String[] signatureSchemesCert)
+    {
+        this.signatureSchemesCert = TlsUtils.clone(signatureSchemesCert);
+    }
+
     public String[] getNamedGroups()
     {
         return TlsUtils.clone(namedGroups);

tls/src/main/java/org/bouncycastle/jsse/provider/SignatureSchemeInfo.java

@@ -37,6 +37,9 @@ class SignatureSchemeInfo
     private static final String PROPERTY_CLIENT_SIGNATURE_SCHEMES = "jdk.tls.client.SignatureSchemes";
     private static final String PROPERTY_SERVER_SIGNATURE_SCHEMES = "jdk.tls.server.SignatureSchemes";
 
+    private static final String PROPERTY_CLIENT_SIGNATURE_SCHEMES_CERT = "org.bouncycastle.jsse.client.SignatureSchemesCert";
+    private static final String PROPERTY_SERVER_SIGNATURE_SCHEMES_CERT = "org.bouncycastle.jsse.server.SignatureSchemesCert";
+
     // NOTE: Not all of these are necessarily enabled/supported; it will be checked at runtime
     private enum All
     {
@@ -148,23 +151,22 @@ static class PerConnection
         private final AtomicReference<List<SignatureSchemeInfo>> peerSigSchemes;
         private final AtomicReference<List<SignatureSchemeInfo>> peerSigSchemesCert;
 
-        PerConnection(List<SignatureSchemeInfo> localSigSchemes)
+        PerConnection(List<SignatureSchemeInfo> localSigSchemes, List<SignatureSchemeInfo> localSigSchemesCert)
         {
-            // TODO[tls13] No JSSE API to configure localSigSchemesCert?)
             this.localSigSchemes = localSigSchemes;
-            this.localSigSchemesCert = null;
+            this.localSigSchemesCert = localSigSchemesCert;
             this.peerSigSchemes = new AtomicReference<List<SignatureSchemeInfo>>();
             this.peerSigSchemesCert = new AtomicReference<List<SignatureSchemeInfo>>();
         }
 
         String[] getLocalJcaSignatureAlgorithms()
         {
-            return getJcaSignatureAlgorithms(getLocalJcaSigSchemesCert());
+            return getJcaSignatureAlgorithms(getLocalSigSchemesCert());
         }
 
         String[] getLocalJcaSignatureAlgorithmsBC()
         {
-            return getJcaSignatureAlgorithmsBC(getLocalJcaSigSchemesCert());
+            return getJcaSignatureAlgorithmsBC(getLocalSigSchemesCert());
         }
 
         Vector<SignatureAndHashAlgorithm> getLocalSignatureAndHashAlgorithms()
@@ -177,21 +179,38 @@ Vector<SignatureAndHashAlgorithm> getLocalSignatureAndHashAlgorithmsCert()
             return getSignatureAndHashAlgorithms(localSigSchemesCert);
         }
 
+        List<SignatureSchemeInfo> getLocalSigSchemes()
+        {
+            return localSigSchemes;
+        }
+
+        List<SignatureSchemeInfo> getLocalSigSchemesCert()
+        {
+            return localSigSchemesCert != null ? localSigSchemesCert : getLocalSigSchemes();
+        }
+
         String[] getPeerJcaSignatureAlgorithms()
         {
-            return getJcaSignatureAlgorithms(getPeerJcaSigSchemesCert());
+            return getJcaSignatureAlgorithms(getPeerSigSchemesCert());
         }
 
         String[] getPeerJcaSignatureAlgorithmsBC()
         {
-            return getJcaSignatureAlgorithmsBC(getPeerJcaSigSchemesCert());
+            return getJcaSignatureAlgorithmsBC(getPeerSigSchemesCert());
         }
 
-        Iterable<SignatureSchemeInfo> getPeerSigSchemes()
+        List<SignatureSchemeInfo> getPeerSigSchemes()
         {
             return peerSigSchemes.get();
         }
 
+        List<SignatureSchemeInfo> getPeerSigSchemesCert()
+        {
+            List<SignatureSchemeInfo> sigSchemesCert = peerSigSchemesCert.get();
+
+            return sigSchemesCert != null ? sigSchemesCert : getPeerSigSchemes();
+        }
+
         boolean hasLocalSignatureScheme(SignatureSchemeInfo signatureSchemeInfo)
         {
             return localSigSchemes.contains(signatureSchemeInfo);
@@ -202,30 +221,22 @@ void notifyPeerData(List<SignatureSchemeInfo> sigSchemes, List<SignatureSchemeIn
             peerSigSchemes.set(sigSchemes);
             peerSigSchemesCert.set(sigSchemesCert);
         }
-
-        private List<SignatureSchemeInfo> getLocalJcaSigSchemesCert()
-        {
-            return localSigSchemesCert == null ? localSigSchemes : localSigSchemesCert;
-        }
-
-        private List<SignatureSchemeInfo> getPeerJcaSigSchemesCert()
-        {
-            List<SignatureSchemeInfo> sigSchemesCert = peerSigSchemesCert.get();
-
-            return sigSchemesCert == null ? peerSigSchemes.get() : sigSchemesCert;
-        }
     }
 
     static class PerContext
     {
         private final Map<Integer, SignatureSchemeInfo> index;
         private final int[] candidatesClient, candidatesServer;
+        private final int[] candidatesCertClient, candidatesCertServer;
 
-        PerContext(Map<Integer, SignatureSchemeInfo> index, int[] candidatesClient, int[] candidatesServer)
+        PerContext(Map<Integer, SignatureSchemeInfo> index, int[] candidatesClient, int[] candidatesServer,
+            int[] candidatesCertClient, int[] candidatesCertServer)
         {
             this.index = index;
             this.candidatesClient = candidatesClient;
             this.candidatesServer = candidatesServer;
+            this.candidatesCertClient = candidatesCertClient;
+            this.candidatesCertServer = candidatesCertServer;
         }
     }
 
@@ -235,7 +246,7 @@ static PerConnection createPerConnectionClient(PerContext perContext, ProvSSLPar
         ProtocolVersion latest = ProtocolVersion.getLatestTLS(activeProtocolVersions);
         if (!TlsUtils.isSignatureAlgorithmsExtensionAllowed(latest))
         {
-            return new PerConnection(null);
+            return new PerConnection(null, null);
         }
 
         ProtocolVersion earliest = ProtocolVersion.getEarliestTLS(activeProtocolVersions);
@@ -248,7 +259,7 @@ static PerConnection createPerConnectionServer(PerContext perContext, ProvSSLPar
     {
         if (!TlsUtils.isSignatureAlgorithmsExtensionAllowed(negotiatedVersion))
         {
-            return new PerConnection(null);
+            return new PerConnection(null, null);
         }
 
         return createPerConnection(perContext, true, sslParameters, negotiatedVersion, negotiatedVersion, namedGroups);
@@ -257,47 +268,96 @@ static PerConnection createPerConnectionServer(PerContext perContext, ProvSSLPar
     private static PerConnection createPerConnection(PerContext perContext, boolean isServer, ProvSSLParameters sslParameters,
         ProtocolVersion earliest, ProtocolVersion latest, NamedGroupInfo.PerConnection namedGroups)
     {
-        String[] signatureSchemes = sslParameters.getSignatureSchemes();
-
         int[] candidates;
-        if (signatureSchemes == null)
         {
-            candidates = isServer ? perContext.candidatesServer : perContext.candidatesClient;
+            String[] signatureSchemes = sslParameters.getSignatureSchemes();
+
+            if (signatureSchemes == null)
+            {
+                candidates = isServer ? perContext.candidatesServer : perContext.candidatesClient;
+
+                if (candidates == null)
+                {
+                    candidates = CANDIDATES_DEFAULT;
+                }
+            }
+            else
+            {
+                candidates = createCandidates(perContext.index, signatureSchemes, "SSLParameters.signatureSchemes");
+            }
         }
-        else
+
+        int[] candidatesCert;
         {
-            candidates = createCandidates(perContext.index, signatureSchemes, "SSLParameters.signatureSchemes");
+            String[] signatureSchemesCert = sslParameters.getSignatureSchemesCert();
+
+            if (signatureSchemesCert == null)
+            {
+                candidatesCert = isServer ? perContext.candidatesCertServer : perContext.candidatesCertClient;
+            }
+            else
+            {
+                candidatesCert = createCandidates(perContext.index, signatureSchemesCert,
+                    "SSLParameters.signatureSchemesCert");
+            }
         }
 
         BCAlgorithmConstraints algorithmConstraints = sslParameters.getAlgorithmConstraints();
         boolean post13Active = TlsUtils.isTLSv13(latest);
         boolean pre13Active = !TlsUtils.isTLSv13(earliest);
 
-        int count = candidates.length;
-        ArrayList<SignatureSchemeInfo> localSigSchemes = new ArrayList<SignatureSchemeInfo>(count);
-        for (int i = 0; i < count; ++i)
+        ArrayList<SignatureSchemeInfo> localSigSchemes;
         {
-            Integer candidate = Integers.valueOf(candidates[i]);
-            SignatureSchemeInfo signatureSchemeInfo = perContext.index.get(candidate);
+            int count = candidates.length;
+            localSigSchemes = new ArrayList<SignatureSchemeInfo>(count);
+            for (int i = 0; i < count; ++i)
+            {
+                Integer candidate = Integers.valueOf(candidates[i]);
+                SignatureSchemeInfo signatureSchemeInfo = perContext.index.get(candidate);
 
-            if (null != signatureSchemeInfo
-                && signatureSchemeInfo.isActiveCerts(algorithmConstraints, post13Active, pre13Active, namedGroups))
+                if (null != signatureSchemeInfo
+                    && signatureSchemeInfo.isActiveCerts(algorithmConstraints, post13Active, pre13Active, namedGroups))
+                {
+                    localSigSchemes.add(signatureSchemeInfo);
+                }
+            }
+            localSigSchemes.trimToSize();
+        }
+
+        ArrayList<SignatureSchemeInfo> localSigSchemesCert = null;
+        if (candidatesCert != null)
+        {
+            int count = candidatesCert.length;
+            localSigSchemesCert = new ArrayList<SignatureSchemeInfo>(count);
+            for (int i = 0; i < count; ++i)
             {
-                localSigSchemes.add(signatureSchemeInfo);
+                Integer candidate = Integers.valueOf(candidatesCert[i]);
+                SignatureSchemeInfo signatureSchemeInfo = perContext.index.get(candidate);
+
+                if (null != signatureSchemeInfo
+                    && signatureSchemeInfo.isActiveCerts(algorithmConstraints, post13Active, pre13Active, namedGroups))
+                {
+                    localSigSchemesCert.add(signatureSchemeInfo);
+                }
             }
+            localSigSchemesCert.trimToSize();
         }
-        localSigSchemes.trimToSize();
-        return new PerConnection(localSigSchemes);
+
+        return new PerConnection(localSigSchemes, localSigSchemesCert);
     }
 
     static PerContext createPerContext(boolean isFipsContext, JcaTlsCrypto crypto,
         NamedGroupInfo.PerContext namedGroups)
     {
         Map<Integer, SignatureSchemeInfo> index = createIndex(isFipsContext, crypto, namedGroups);
+
         int[] candidatesClient = createCandidatesFromProperty(index, PROPERTY_CLIENT_SIGNATURE_SCHEMES);
         int[] candidatesServer = createCandidatesFromProperty(index, PROPERTY_SERVER_SIGNATURE_SCHEMES);
 
-        return new PerContext(index, candidatesClient, candidatesServer);
+        int[] candidatesCertClient = createCandidatesFromProperty(index, PROPERTY_CLIENT_SIGNATURE_SCHEMES_CERT);
+        int[] candidatesCertServer = createCandidatesFromProperty(index, PROPERTY_SERVER_SIGNATURE_SCHEMES_CERT);
+
+        return new PerContext(index, candidatesClient, candidatesServer, candidatesCertClient, candidatesCertServer);
     }
 
     private static String[] getJcaSignatureAlgorithms(Collection<SignatureSchemeInfo> infos)
@@ -458,7 +518,7 @@ private static int[] createCandidatesFromProperty(Map<Integer, SignatureSchemeIn
         String[] names = PropertyUtils.getStringArraySystemProperty(propertyName);
         if (null == names)
         {
-            return CANDIDATES_DEFAULT;
+            return null;
         }
 
         return createCandidates(index, names, propertyName);
@@ -649,6 +709,7 @@ public String toString()
         return all.text;
     }
 
+    // TODO Refactor to use this in non-cert contexts (careful for signatureSchemesCert defaulting case)
 //    private boolean isActive(BCAlgorithmConstraints algorithmConstraints, boolean post13Active, boolean pre13Active,
 //        NamedGroupInfo.PerConnection namedGroupInfos)
 //    {

tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLParametersUtil.java

@@ -83,6 +83,7 @@ static BCSSLParameters getParameters(ProvSSLParameters prov)
         ssl.setEnableRetransmissions(prov.getEnableRetransmissions());
         ssl.setMaximumPacketSize(prov.getMaximumPacketSize());
         ssl.setSignatureSchemes(prov.getSignatureSchemes());
+        ssl.setSignatureSchemesCert(prov.getSignatureSchemesCert());
         ssl.setNamedGroups(prov.getNamedGroups());
 
         return ssl;
@@ -177,6 +178,13 @@ static SSLParameters getSSLParameters(ProvSSLParameters prov)
             set(ssl, setNamedGroups, prov.getNamedGroups());
         }
 
+        // Unsupported as of JDK 21
+
+//        if (null != setSignatureSchemesCert)
+//        {
+//            set(ssl, setSignatureSchemesCert, prov.getSignatureSchemesCert());
+//        }
+
         return ssl;
     }
 
@@ -276,6 +284,13 @@ static BCSSLParameters importSSLParameters(SSLParameters ssl)
             bc.setNamedGroups((String[])get(ssl, getNamedGroups));
         }
 
+        // Unsupported as of JDK 21
+
+//        if (null != getSignatureSchemesCert)
+//        {
+//            bc.setSignatureSchemesCert((String[])get(ssl, getSignatureSchemesCert));
+//        }
+
         return bc;
     }
 
@@ -342,6 +357,8 @@ static void setParameters(ProvSSLParameters prov, BCSSLParameters ssl)
         prov.setSignatureSchemes(ssl.getSignatureSchemes());
 
         prov.setNamedGroups(ssl.getNamedGroups());
+
+        prov.setSignatureSchemesCert(ssl.getSignatureSchemesCert());
     }
 
     static void setSSLParameters(ProvSSLParameters prov, SSLParameters ssl)
@@ -449,6 +466,13 @@ static void setSSLParameters(ProvSSLParameters prov, SSLParameters ssl)
         {
             prov.setNamedGroups((String[])get(ssl, getNamedGroups));
         }
+
+        // Unsupported as of JDK 21
+
+//        if (null != getSignatureSchemesCert)
+//        {
+//            prov.setSignatureSchemesCert((String[])get(ssl, getSignatureSchemesCert));
+//        }
     }
 
     private static Object get(Object obj, Method method)