Merge pull request OpenLiberty#4 from utle/FIPSwork

add common crypto to ssl feature
utle · Oct 9, 2024 · d15c6d4 · d15c6d4
2 parents 0d67b38 + 1692ecf
commit d15c6d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/dev/com.ibm.ws.ssl/resources/OSGI-INF/l10n/metatype.properties b/dev/com.ibm.ws.ssl/resources/OSGI-INF/l10n/metatype.properties
@@ -50,7 +50,7 @@ repertoire.MEDIUM=Cipher suites DES and 40 bit
 repertoire.LOW=Cipher suites without encryption
 repertoire.CUSTOM=Custom list of cipher suites
 repertoire.verifyHostname=Host name verification
-repertoire.verifyHostname.desc=Specifies whether host name verification for outbound connections using a specific SSL configuration is enabled. If set to true, then all outbound SSL connections that use the specified SSL configuration undergo verification of the target server host name against that server's certificate. The attribute is set to false by default.
+repertoire.verifyHostname.desc=Specifies whether host name verification for outbound connections using a specific SSL configuration is enabled. If set to true, then all outbound SSL connections that use the specified SSL configuration undergo verification of the target server host name against that server's certificate. The attribute is set to true by default.
 repertoire.skipHostnameVerificationForHosts=Skip host name verification for hosts
 repertoire.skipHostnameVerificationForHosts.desc=Specifies the hostname that allow to skip the host name verification for outbound connection using a specific SSL configuration.
 repertoire.trustDefaultCerts=Trust the default certificates

diff --git a/dev/com.ibm.ws.ssl/src/com/ibm/ws/ssl/provider/AbstractJSSEProvider.java b/dev/com.ibm.ws.ssl/src/com/ibm/ws/ssl/provider/AbstractJSSEProvider.java
@@ -117,6 +117,7 @@ protected void initialize(String keyMgr, String trustMgr, String cxtProvider, St
         this.defaultProtocol = protocolType;
 
         if (tc.isDebugEnabled()) {
+            Tr.debug(tc, "contextProvider: " + contextProvider);
             Tr.debug(tc, "defaultProtocol: " + defaultProtocol);
         }
         if (FipsUtils.isFIPSEnabled()) {

diff --git a/dev/com.ibm.ws.ssl/src/com/ibm/ws/ssl/provider/IBMJSSEProvider.java b/dev/com.ibm.ws.ssl/src/com/ibm/ws/ssl/provider/IBMJSSEProvider.java
@@ -79,7 +79,7 @@ public IBMJSSEProvider() {
 //        }
 
         if (FipsUtils.isFIPSEnabled()) {
-            if (CryptoProvider.isIBMJCEPlusFIPSAvailable() || CryptoProvider.isIBMJCEPlusFIPSAvailable()) {
+            if (CryptoProvider.isIBMJCEPlusFIPSAvailable() || CryptoProvider.isOpenJCEPlusFIPSAvailable()) {
                 initialize(JSSEProviderFactory.getKeyManagerFactoryAlgorithm(), JSSEProviderFactory.getTrustManagerFactoryAlgorithm(), Constants.IBMJSSE2_NAME, null,
                            Constants.SOCKET_FACTORY_WAS_DEFAULT, null, Constants.PROTOCOL_TLS);
             }