Merge pull request #30620 from OpenLiberty/revert-30502-FIPSwork_0107…

…2025 Revert "FIPS"
OpenLiberty · Jan 23, 2025 · 79bb7bc · 79bb7bc
2 parents 89a8c8b + f9e799c
commit 79bb7bc
Show file tree

Hide file tree

Showing 543 changed files with 2,665 additions and 4,036 deletions.
diff --git a/dev/build.sharedResources/usrShared/resources/security/ltpaFIPS.keys b/dev/build.sharedResources/usrShared/resources/security/ltpaFIPS.keys
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, 2025 IBM Corporation and others.
+# Copyright (c) 2017, 2024 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.8
+bVersion: 1.7
 
 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,6 +12,7 @@ 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.org.jose4j, \
+  com.ibm.ws.crypto.common
 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,6 +15,7 @@ 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, \
@@ -24,7 +25,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.8-javadoc.zip
+ dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.ssl_1.7-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,6 +15,7 @@ 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
+  io.openliberty.org.apache.commons.logging, \
+  com.ibm.ws.crypto.common
 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.common.crypto.*=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.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.common.crypto.*=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.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.common.crypto.*=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.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.common.crypto.*=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.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
diff --git a/dev/com.ibm.ws.crypto.common/.classpath b/dev/com.ibm.ws.crypto.common/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/dev/com.ibm.ws.crypto.common/.gitignore b/dev/com.ibm.ws.crypto.common/.gitignore
@@ -0,0 +1,3 @@
+/bin/
+/bin_test/
+/generated/
diff --git a/dev/com.ibm.ws.crypto.common/.project b/dev/com.ibm.ws.crypto.common/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.ibm.ws.crypto.common</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>
diff --git a/dev/com.ibm.ws.crypto.common/.settings/bndtools.core.prefs b/dev/com.ibm.ws.crypto.common/.settings/bndtools.core.prefs
@@ -0,0 +1,2 @@
+compileErrorAction=build
+eclipse.preferences.version=1
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
@@ -0,0 +1,4 @@
+#Ant properties
+#Automatically generated by the ant prepare.settings.files task
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		compileErrorAction=build
		eclipse.preferences.version=1