Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
taoliult committed Dec 4, 2024
1 parent 2af7641 commit cb2d493
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ public void shouldContain_expectedExitValue0(String customprofile, String securi
"-Dsemeru.fips=true",
"-Dsemeru.customprofile=" + customprofile,
"-Djava.security.properties=" + securityPropertyFile,
//"-Djava.security.debug=semerufips",
"TestProviders"
);
outputAnalyzer.reportDiagnosticSummary();
Expand Down
12 changes: 6 additions & 6 deletions closed/test/jdk/openj9/internal/security/property-java.security
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RestrictedSecurity.TestBase.Version.jce.certpath.disabledAlgorithms =
RestrictedSecurity.TestBase.Version.jce.legacyAlgorithms =
RestrictedSecurity.TestBase.Version.jce.provider.1 = sun.security.provider.Sun
RestrictedSecurity.TestBase.Version.jce.provider.2 = com.sun.crypto.provider.SunJCE
RestrictedSecurity.TestBase.Version.jce.provider.3 = sun.security.ssl.SunJSSE
RestrictedSecurity.TestBase.Version.jce.provider.3 = com.sun.net.ssl.internal.ssl.Provider

RestrictedSecurity.TestBase.Version.javax.net.ssl.keyStore = NONE
RestrictedSecurity.TestBase.Version.securerandom.provider = OpenJCEPlusFIPS
Expand All @@ -50,7 +50,7 @@ RestrictedSecurity.TestBase.Version-Extended.tls.disabledAlgorithms =
RestrictedSecurity.TestBase.Version-Extended.jce.provider.1 = sun.security.provider.Sun
RestrictedSecurity.TestBase.Version-Extended.jce.provider.2 = sun.security.rsa.SunRsaSign
RestrictedSecurity.TestBase.Version-Extended.jce.provider.3 = sun.security.ec.SunEC
RestrictedSecurity.TestBase.Version-Extended.jce.provider.4 = sun.security.ssl.SunJSSE
RestrictedSecurity.TestBase.Version-Extended.jce.provider.4 = com.sun.net.ssl.internal.ssl.Provider
RestrictedSecurity.TestBase.Version-Extended.jce.provider.5 = com.sun.crypto.provider.SunJCE
RestrictedSecurity.TestBase.Version-Extended.jce.provider.6 = sun.security.jgss.SunProvider
RestrictedSecurity.TestBase.Version-Extended.jce.provider.7 = com.sun.security.sasl.Provider
Expand All @@ -76,7 +76,7 @@ RestrictedSecurity.Test-Profile.Base.tls.disabledAlgorithmsWrongTypo =

RestrictedSecurity.Test-Profile.Base.jce.provider.1 = sun.security.provider.Sun
RestrictedSecurity.Test-Profile.Base.jce.provider.2 = com.sun.crypto.provider.SunJCE
RestrictedSecurity.Test-Profile.Base.jce.provider.3 = sun.security.ssl.SunJSSE
RestrictedSecurity.Test-Profile.Base.jce.provider.3 = com.sun.net.ssl.internal.ssl.Provider

RestrictedSecurity.Test-Profile.Base.securerandom.provider = OpenJCEPlusFIPS
RestrictedSecurity.Test-Profile.Base.securerandom.algorithm = SHA512DRBG
Expand All @@ -94,7 +94,7 @@ RestrictedSecurity.Test-Profile.Extended_1.jce.provider.1 = sun.security.provide
RestrictedSecurity.Test-Profile.Extended_1.jce.provider.2 = com.sun.crypto.provider.SunJCE
RestrictedSecurity.Test-Profile.Extended_1.jce.providerWrongTypo = sun.security.rsa.SunRsaSign
RestrictedSecurity.Test-Profile.Extended_1.jce.provider.4 = sun.security.ec.SunEC
RestrictedSecurity.Test-Profile.Extended_1.jce.provider.5 = sun.security.ssl.SunJSSE
RestrictedSecurity.Test-Profile.Extended_1.jce.provider.5 = com.sun.net.ssl.internal.ssl.Provider

#
# Test-Profile.Extended_2
Expand Down Expand Up @@ -127,7 +127,7 @@ RestrictedSecurity.Test-Profile-MultiDefault.Base.fips.mode = 140-3

RestrictedSecurity.Test-Profile-MultiDefault.Base.jce.provider.1 = sun.security.provider.Sun
RestrictedSecurity.Test-Profile-MultiDefault.Base.jce.provider.2 = com.sun.crypto.provider.SunJCE
RestrictedSecurity.Test-Profile-MultiDefault.Base.jce.provider.3 = sun.security.ssl.SunJSSE
RestrictedSecurity.Test-Profile-MultiDefault.Base.jce.provider.3 = com.sun.net.ssl.internal.ssl.Provider

RestrictedSecurity.Test-Profile-MultiDefault.Base.securerandom.provider = OpenJCEPlusFIPS
RestrictedSecurity.Test-Profile-MultiDefault.Base.securerandom.algorithm = SHA512DRBG
Expand Down Expand Up @@ -253,7 +253,7 @@ RestrictedSecurity.Test-Profile-SetProperty.Base.tls.ephemeralDHKeySize =
RestrictedSecurity.Test-Profile-SetProperty.Base.jce.certpath.disabledAlgorithms =
RestrictedSecurity.Test-Profile-SetProperty.Base.jce.provider.1 = sun.security.provider.Sun
RestrictedSecurity.Test-Profile-SetProperty.Base.jce.provider.2 = com.sun.crypto.provider.SunJCE
RestrictedSecurity.Test-Profile-SetProperty.Base.jce.provider.3 = sun.security.ssl.SunJSSE
RestrictedSecurity.Test-Profile-SetProperty.Base.jce.provider.3 = com.sun.net.ssl.internal.ssl.Provider

RestrictedSecurity.Test-Profile-SetProperty.Base.securerandom.provider = OpenJCEPlusFIPS
RestrictedSecurity.Test-Profile-SetProperty.Base.securerandom.algorithm = SHA512DRBG
Expand Down

0 comments on commit cb2d493

Please sign in to comment.