Skip to content

Support non-fips OpenJCEPlus testing #6114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JasonFengJ9 merged 1 commit into from
Mar 28, 2025
Merged

Support non-fips OpenJCEPlus testing #6114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions buildenv/jenkins/openjdk_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,14 @@ def runTest() {
]
}
}
if (params.TEST_FLAG == "OpenJCEPlus") {
def javaSecurityFile = "${env.WORKSPACE}/aqa-tests/config/openjceplus/jdk${params.JDK_VERSION}/java.security"
if (!fileExists(javaSecurityFile)) {
javaSecurityFile = "${env.WORKSPACE}/aqa-tests/config/openjceplus/jdk/java.security"
}
echo "Set -Djava.security.properties=${javaSecurityFile} in EXTRA_OPTIONS"
env.EXTRA_OPTIONS += " -Djava.security.properties=${javaSecurityFile}"
}
jenkinsfile = load "${WORKSPACE}/aqa-tests/buildenv/jenkins/JenkinsfileBase"
if (LABEL.contains('ci.agent.dynamic') && CLOUD_PROVIDER.equals('azure')) {
//Set dockerimage for azure agent. Fyre has stencil to setup the right environment
Expand Down
16 changes: 16 additions & 0 deletions config/openjceplus/jdk/java.security
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Add OpenJCEPlus to the top of the provider list. This file should be kept in sync with
# the out of the box security provider list except for placing OpenJCEPlus at the highest
# priority.
security.provider.1=com.ibm.crypto.plus.provider.OpenJCEPlus
security.provider.2=SUN
security.provider.3=SunRsaSign
security.provider.4=SunEC
security.provider.5=SunJSSE
security.provider.6=SunJCE
security.provider.7=SunJGSS
security.provider.8=SunSASL
security.provider.9=XMLDSig
security.provider.10=SunPCSC
security.provider.11=JdkLDAP
security.provider.12=JdkSASL
security.provider.13=SunPKCS11
16 changes: 16 additions & 0 deletions config/openjceplus/jdk21/java.security
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Add OpenJCEPlus to the top of the provider list. This file should be kept in sync with
# the out of the box security provider list except for placing OpenJCEPlus at the highest
# priority.
security.provider.1=com.ibm.crypto.plus.provider.OpenJCEPlus
security.provider.2=SUN
security.provider.3=SunRsaSign
security.provider.4=SunEC
security.provider.5=SunJSSE
security.provider.6=SunJCE
security.provider.7=SunJGSS
security.provider.8=SunSASL
security.provider.9=XMLDSig
security.provider.10=SunPCSC
security.provider.11=JdkLDAP
security.provider.12=JdkSASL
security.provider.13=SunPKCS11