Merge pull request #30502 from jimmy1wu/FIPSwork_01072025

FIPS
OpenLiberty · Jan 23, 2025 · 5bdb0c9 · 5bdb0c9
2 parents 8607d1a + c8ce205
commit 5bdb0c9
Show file tree

Hide file tree

Showing 543 changed files with 4,036 additions and 2,665 deletions.
diff --git a/dev/build.sharedResources/usrShared/resources/security/ltpaFIPS.keys b/dev/build.sharedResources/usrShared/resources/security/ltpaFIPS.keys
@@ -0,0 +1,8 @@
+#Fri Sep 13 14:24:02 PDT 2024
+com.ibm.websphere.CreationDate=Fri Sep 13 14\:23\:52 PDT 2024
+com.ibm.websphere.ltpa.version=1.0
+com.ibm.websphere.ltpa.3DESKey=9KfdS15V4ujMTvaYSYEnESiQaiPIQEN9lZFH+w5EpJ07FkUM+sPxiF83QqOSdinQ
+com.ibm.websphere.CreationHost=localhost
+com.ibm.websphere.ltpa.PrivateKey=NweYlrwEnk7++//sSn6DVF+RRegEnryv67yZ5y6NeIqP0TFkkszUqVWoh58n87dm4UTgP5CRJcHv7p79yEgpVkTJjfW7cUTujtGXUO9JGcdVFqS6kE37fHhWwpDLaCCln9M1/ef0ZjyC+ciZWScgoVGLpaJTcX7i9hsAM/1xUl2mKoWMVNEPecnUBsz4+8rZRWQD0i2QjOLmKQKljcOWw+11byOZZwyKgiqWN/S3q/ILLdhQMFfCnwWCHxsbqKsp5lKvX48LFHk2d7Ig1DtpdIMdRjTT0qeMfFSMtmeMBPAZMwpLFOsn0IZCzwUFeXmwH15NIFt4WwOpo4kVFOgn0wxqgii787+/l79XLT+Gq2tJpMP5HQbXrNDByp+ZdXoIsHWGM9jKC61BJlLX/WZ5GwND4yRQRhPx15K48XYxpTn6PZc7oK924HxWY6tJF3wjrGKE7l5PNdVTo39ZO3tTrHXxVAxiT0GS2Ct/Ikq8qIfPV0SvOOyWpAef4Oq2LXD9S2vyLC4OmECeXmGpEHkksZEN39Pfxiv3CCf3ImDdPQhKr79GcjUjimGeMTBQUxNLNltQwYImtBjL8yUSLwEpUn+cPSOLznKtrVtundbQL22aMKkg9z1n7hsY/0KkDliSWtAhxFukiKrlNZBxFtsmmF8ehj+PjOaRTJwEqvpoYLvNyAW5F80xpMBBt0580yG6nhm2scSonmShJg\=\=
+com.ibm.websphere.ltpa.Realm=BasicRealm
+com.ibm.websphere.ltpa.PublicKey=AKibrRdG/x9EW1aW6wXya0oGmis22cdZniIX4Z2Tyb1y7c/9CeRLJqIFbSPe+MAVTjvFSuUFLj2vfL9ih+QcsWW/t5ZJjVJL2zkve5aUaPLIqSRe+727o0TEHNMW8/odQq+zYdj4yZahgJp5YpuCgR9bs7wMVpDaKxCRD37fQao96HgaFCCl0s2iqJaOD5L/EQX51MMlV3zxUQgsbT5ItbnzWAW57AQ4hGi6v4L+y1fIm2mpA/xvB8GugOZv3TGU3W8QPIFjnsIH3V6Ff+hkwQAsjuuGaeA/Gs4xtoRat/BQe4u6KwRCpoz2e3Q6k6sAiAsB8GHoNwvLYPHXwdeG/JkBAAE\=
diff --git a/dev/com.ibm.websphere.appserver.api.ssl/bnd.bnd b/dev/com.ibm.websphere.appserver.api.ssl/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2017, 2024 IBM Corporation and others.
+# Copyright (c) 2017, 2025 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
@@ -11,7 +11,7 @@
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
 -include= ~../cnf/resources/bnd/bundle.props
-bVersion: 1.7
+bVersion: 1.8
 
 Bundle-Name: WebSphere SSL API
 Bundle-Description: WebSphere SSL API, version ${bVersion}

diff --git a/...er.features/visibility/public/samlWeb-2.0/com.ibm.websphere.appserver.samlWeb-2.0.feature b/...er.features/visibility/public/samlWeb-2.0/com.ibm.websphere.appserver.samlWeb-2.0.feature
@@ -12,7 +12,6 @@ Subsystem-Name: SAML Web Single Sign-On 2.0
 -bundles=\
   io.openliberty.org.apache.commons.logging, \
   io.openliberty.org.apache.commons.codec, \
-  com.ibm.ws.org.jose4j, \
-  com.ibm.ws.crypto.common
+  com.ibm.ws.org.jose4j
 kind=ga
 edition=core
diff --git a/....appserver.features/visibility/public/ssl-1.0/com.ibm.websphere.appserver.ssl-1.0.feature b/....appserver.features/visibility/public/ssl-1.0/com.ibm.websphere.appserver.ssl-1.0.feature
@@ -15,7 +15,6 @@ Subsystem-Name: Secure Socket Layer 1.0
  com.ibm.ws.channel.ssl, \
  com.ibm.websphere.security, \
  com.ibm.ws.crypto.certificateutil, \
- com.ibm.ws.crypto.common, \
  io.openliberty.wsoc.ssl.internal, \
  io.openliberty.endpoint, \
  io.openliberty.io.netty, \
@@ -25,7 +24,7 @@ Subsystem-Name: Secure Socket Layer 1.0
 -jars=com.ibm.websphere.appserver.spi.ssl; location:=dev/spi/ibm/, \
  com.ibm.websphere.appserver.api.ssl; location:=dev/api/ibm/
 -files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.ssl_1.6-javadoc.zip, \
- dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.ssl_1.7-javadoc.zip
+ dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.ssl_1.8-javadoc.zip
 kind=ga
 edition=core
 superseded-by=transportSecurity-1.0

diff --git a/...tures/visibility/public/wsSecurity-1.1/com.ibm.websphere.appserver.wsSecurity-1.1.feature b/...tures/visibility/public/wsSecurity-1.1/com.ibm.websphere.appserver.wsSecurity-1.1.feature
@@ -15,7 +15,6 @@ Subsystem-Name: Web Service Security 1.1
   io.openliberty.wsSecurity1.1.internal.jaxws-2.2; ibm.tolerates:="3.0,4.0,11.0", \
   io.openliberty.org.bouncycastle
 -bundles=\
-  io.openliberty.org.apache.commons.logging, \
-  com.ibm.ws.crypto.common
+  io.openliberty.org.apache.commons.logging
 kind=ga
 edition=base
diff --git a/...at.1/publish/servers/com.ibm.websphere.security.fat.passwordutil.api/bootstrap.properties b/...at.1/publish/servers/com.ibm.websphere.security.fat.passwordutil.api/bootstrap.properties
@@ -11,7 +11,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
+#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.common.crypto.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
 bootstrap.include=../testports.properties
 
 #com.ibm.ws.logging.trace.specification=*=info=enabled:webcontainer=all=enabled:com.ibm.ws.webcontainer*=all=enable:

diff --git a/...ty_fat.1/publish/servers/com.ibm.websphere.security.fat.passwordutil/bootstrap.properties b/...ty_fat.1/publish/servers/com.ibm.websphere.security.fat.passwordutil/bootstrap.properties
@@ -11,7 +11,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
+#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.common.crypto.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
 bootstrap.include=../testports.properties
 
 #com.ibm.ws.logging.trace.specification=*=info=enabled:webcontainer=all=enabled:com.ibm.ws.webcontainer*=all=enable:

diff --git a/...fat.1/publish/servers/com.ibm.websphere.security.fat.registry.custom/bootstrap.properties b/...fat.1/publish/servers/com.ibm.websphere.security.fat.registry.custom/bootstrap.properties
@@ -11,7 +11,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
+#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.common.crypto.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
 bootstrap.include=../testports.properties
 
 #com.ibm.ws.logging.trace.specification=*=info=enabled:webcontainer=all=enabled:com.ibm.ws.webcontainer*=all=enable:

diff --git a/...curity_fat.1/publish/servers/com.ibm.websphere.security.fat.registry/bootstrap.properties b/...curity_fat.1/publish/servers/com.ibm.websphere.security.fat.registry/bootstrap.properties
@@ -11,7 +11,7 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
+#com.ibm.ws.logging.trace.specification=*=event=enabled:com.ibm.ws.security.*=all=enabled:com.ibm.ws.common.crypto.*=all=enabled:com.ibm.ws.webcontainer.security.*=all=enabled
 bootstrap.include=../testports.properties
 
 #com.ibm.ws.logging.trace.specification=*=info=enabled:webcontainer=all=enabled:com.ibm.ws.webcontainer*=all=enable:

diff --git a/...lientcontainer.cdi_fat/publish/clients/cdiClientSecurity/resources/security/ltpaFIPS.keys b/...lientcontainer.cdi_fat/publish/clients/cdiClientSecurity/resources/security/ltpaFIPS.keys
@@ -0,0 +1,8 @@
+#Fri Sep 13 14:24:02 PDT 2024
+com.ibm.websphere.CreationDate=Fri Sep 13 14\:23\:52 PDT 2024
+com.ibm.websphere.ltpa.version=1.0
+com.ibm.websphere.ltpa.3DESKey=9KfdS15V4ujMTvaYSYEnESiQaiPIQEN9lZFH+w5EpJ07FkUM+sPxiF83QqOSdinQ
+com.ibm.websphere.CreationHost=localhost
+com.ibm.websphere.ltpa.PrivateKey=NweYlrwEnk7++//sSn6DVF+RRegEnryv67yZ5y6NeIqP0TFkkszUqVWoh58n87dm4UTgP5CRJcHv7p79yEgpVkTJjfW7cUTujtGXUO9JGcdVFqS6kE37fHhWwpDLaCCln9M1/ef0ZjyC+ciZWScgoVGLpaJTcX7i9hsAM/1xUl2mKoWMVNEPecnUBsz4+8rZRWQD0i2QjOLmKQKljcOWw+11byOZZwyKgiqWN/S3q/ILLdhQMFfCnwWCHxsbqKsp5lKvX48LFHk2d7Ig1DtpdIMdRjTT0qeMfFSMtmeMBPAZMwpLFOsn0IZCzwUFeXmwH15NIFt4WwOpo4kVFOgn0wxqgii787+/l79XLT+Gq2tJpMP5HQbXrNDByp+ZdXoIsHWGM9jKC61BJlLX/WZ5GwND4yRQRhPx15K48XYxpTn6PZc7oK924HxWY6tJF3wjrGKE7l5PNdVTo39ZO3tTrHXxVAxiT0GS2Ct/Ikq8qIfPV0SvOOyWpAef4Oq2LXD9S2vyLC4OmECeXmGpEHkksZEN39Pfxiv3CCf3ImDdPQhKr79GcjUjimGeMTBQUxNLNltQwYImtBjL8yUSLwEpUn+cPSOLznKtrVtundbQL22aMKkg9z1n7hsY/0KkDliSWtAhxFukiKrlNZBxFtsmmF8ehj+PjOaRTJwEqvpoYLvNyAW5F80xpMBBt0580yG6nhm2scSonmShJg\=\=
+com.ibm.websphere.ltpa.Realm=BasicRealm
+com.ibm.websphere.ltpa.PublicKey=AKibrRdG/x9EW1aW6wXya0oGmis22cdZniIX4Z2Tyb1y7c/9CeRLJqIFbSPe+MAVTjvFSuUFLj2vfL9ih+QcsWW/t5ZJjVJL2zkve5aUaPLIqSRe+727o0TEHNMW8/odQq+zYdj4yZahgJp5YpuCgR9bs7wMVpDaKxCRD37fQao96HgaFCCl0s2iqJaOD5L/EQX51MMlV3zxUQgsbT5ItbnzWAW57AQ4hGi6v4L+y1fIm2mpA/xvB8GugOZv3TGU3W8QPIFjnsIH3V6Ff+hkwQAsjuuGaeA/Gs4xtoRat/BQe4u6KwRCpoz2e3Q6k6sAiAsB8GHoNwvLYPHXwdeG/JkBAAE\=
diff --git a/dev/com.ibm.ws.crypto.common/.classpath b/dev/com.ibm.ws.crypto.common/.classpath
diff --git a/dev/com.ibm.ws.crypto.common/.gitignore b/dev/com.ibm.ws.crypto.common/.gitignore
diff --git a/dev/com.ibm.ws.crypto.common/.project b/dev/com.ibm.ws.crypto.common/.project
diff --git a/dev/com.ibm.ws.crypto.common/.settings/bndtools.core.prefs b/dev/com.ibm.ws.crypto.common/.settings/bndtools.core.prefs
diff --git a/dev/com.ibm.ws.crypto.common/.settings/org.eclipse.core.resources.prefs b/dev/com.ibm.ws.crypto.common/.settings/org.eclipse.core.resources.prefs