Merge openj9 into openj9-staging

Signed-off-by: Peter Shipton <[email protected]>

Author: pshipton

closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java

@@ -1570,7 +1570,7 @@ private void setConstraints(String providerName, String providerInfo, boolean pr
 
             // Check whether constraints are properly specified.
             final String typeRE = "\\w+";
-            final String algoRE = "[A-Za-z0-9./_-]+";
+            final String algoRE = "[A-Za-z0-9./_:#-]+";
             final String attrRE = "[A-Za-z0-9=*|.:]+";
             final String usesRE = "[A-Za-z0-9._:/$]+";
             final String consRE = "\\{(" + typeRE + "),(" + algoRE + "),(" + attrRE + ")(," + usesRE + ")?\\}";
@@ -1916,7 +1916,7 @@ private static void checkProviderFormat(String providerInfo, boolean update) {
                 + "(\\["                                // constraints [optional]
                     + "\\s*"
                     + "([+-])?"                         // action [optional]
-                    + "[A-Za-z0-9{}.=*|:$,/_\\s-]+"     // constraint definition
+                    + "[A-Za-z0-9{}.=*|:$#,/_\\s-]+"    // constraint definition
                 + "\\])?"
                 + "\\s*"
                 + "$");