Skip to content

Commit f2abae3

Browse files
committed
Include Liberty base FIPS140-3 profile in WLP installs
Add new task that copies the base Liberty platform into lib directory. As this is the base Liberty profile, it is included within the Lib directory as the file is owned by the product. Included as part of PackageLibertyWithFeatures as the new task works for wlp-embeddable and ol-dev images which include the entire `wlp` directory, but the file is not pulled in as part of the OL GA, NOSHIP or BETA Images without a copy as we do for the relevant licenses and notices files
1 parent 29391a8 commit f2abae3

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

dev/build.image/build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ task copyPropertiesToBuildImage (type:Copy) {
4848
tokens: [PRODUCT_VERSION: bnd.libertyRelease, PRODUCT_EDITION: bnd.productEdition, PRODUCT_LICENSE_TYPE: bnd.productLicenseType])
4949
}
5050

51+
task copyFips1403PropertiesToBuildImage( type: Copy) {
52+
dependsOn jar
53+
from project.file('publish/wlp/security')
54+
into project.file('wlp/lib/security/fips140_3')
55+
include 'FIPS140-3-Liberty.properties'
56+
}
57+
5158
task copyPublicKeyToBuildImage (type:Copy) {
5259
dependsOn jar
5360
from project.file('publish')
@@ -154,6 +161,7 @@ jar {
154161
assemble {
155162
dependsOn publishTemplates
156163
dependsOn copyPropertiesToBuildImage
164+
dependsOn copyFips1403PropertiesToBuildImage
157165
dependsOn addServiceFingerprint
158166
dependsOn copyReadmeToBuildImage
159167
dependsOn copyBetaLicenseToBuildImage
@@ -317,6 +325,12 @@ class PackageLibertyWithFeatures extends DefaultTask {
317325
into "$outputTo/wlp"
318326
}
319327

328+
project.copy {
329+
from project.file('wlp')
330+
include 'lib/security/fips140_3/FIPS140-3-Liberty.properties'
331+
into "$outputTo/wlp"
332+
}
333+
320334
if(isBeta) {
321335
//Now add the BETA_NOTICES file
322336
project.copy {
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# org.objectweb.asm.commons.SerialVersionUIDAdder: Allow for SHA-1 to generate SerialVersionUID's to conform Java specification
2+
# org.eclipse.persistence.internal.libraries.asm.commons.SerialVersionUIDAdder: Allow for SHA-1 to generate SerialVersionUID's to conform Java specification
3+
# org.apache.yoko.rmi.impl.ValueDescriptor: Alloww for SHA-1 to generate the hash code for the RepositoryId
4+
# com.ibm.ws.wsoc.util.Utils: Allow SHA-1 for the generation of the Sec-WebSocket-Accept header
5+
# com.ibm.security.certclient.util.PkUtils: Allof for SHA-1 to generate of certificate Key Identifier(KID) value
6+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.desc.name = OpenJCEPlusFIPS Cryptographic Module FIPS 140-3 for Liberty
7+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.extends = RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Strongly-Enforced
8+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.jce.provider.1 = com.ibm.crypto.plus.provider.OpenJCEPlusFIPS [+ \
9+
{MessageDigest, SHA-1, *, FullClassName:org.objectweb.asm.commons.SerialVersionUIDAdder}, \
10+
{MessageDigest, SHA-1, *, FullClassName:org.eclipse.persistence.internal.libraries.asm.commons.SerialVersionUIDAdder}, \
11+
{MessageDigest, SHA-1, *, FullClassName:org.apache.yoko.rmi.impl.ValueDescriptor}, \
12+
{MessageDigest, SHA-1, *, FullClassName:com.ibm.ws.wsoc.util.Utils}, \
13+
{MessageDigest, SHA-1, *, FullClassName:com.ibm.security.certclient.util.PkUtils}]
14+
15+
# For Collectives
16+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.jce.provider.7 = com.ibm.ws.collective.security.internal.provider.CollectiveProvider
17+
18+
# For WebServices / SAML (uses JCE underneath)
19+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.jce.provider.8 = org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI
20+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.jce.provider.9 = org.apache.wss4j.dom.transform.STRTransformProvider
21+
# Reserved Providers in case new providers are required
22+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.jce.provider.10 = io.openliberty.PLACEHOLDER
23+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.jce.provider.11 = io.openliberty.PLACEHOLDER
24+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.jce.provider.12 = io.openliberty.PLACEHOLDER
25+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.jce.provider.13 = io.openliberty.PLACEHOLDER
26+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.jce.provider.14 = io.openliberty.PLACEHOLDER
27+
RestrictedSecurity.OpenJCEPlusFIPS.FIPS140-3-Liberty.jce.provider.15 = io.openliberty.PLACEHOLDER
28+

0 commit comments

Comments
 (0)