Skip to content

Commit

Permalink
Update SunJSSE fully qualified name for test cases
Browse files Browse the repository at this point in the history 
In JDK11, the fully qualified name for SunJSSE provider is
com.sun.net.ssl.internal.ssl.Provider. Update this for all
the restricted security mode test cases.

Signed-off-by: Tao Liu <[email protected]>
  • Loading branch information
@taoliult
taoliult committed Dec 4, 2024
1 parent 48fb22a commit 86f854a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions closed/test/jdk/openj9/internal/security/property-java.security
View file
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
20 changes: 10 additions & 10 deletions closed/test/jdk/openj9/internal/security/provider-java.security
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
RestrictedSecurity.TestBase.Version.desc.name = Test Base Profile
RestrictedSecurity.TestBase.Version.desc.default = false
RestrictedSecurity.TestBase.Version.desc.fips = true
RestrictedSecurity.TestBase.Version.desc.hash = SHA256:0ca32676ac2ae92d0469cbf293f3a69416c5d0312c80473319452f4d6995d234
RestrictedSecurity.TestBase.Version.desc.hash = SHA256:24859dcd916c3d301c0a8d0a58f96f7c3a493cadad48ff1c91a5151f2cdd2d49
RestrictedSecurity.TestBase.Version.desc.number = Certificate #XXX
RestrictedSecurity.TestBase.Version.desc.policy = https://csrc.nist.gov/projects/cryptographic-module-validation-program/certificate/
RestrictedSecurity.TestBase.Version.desc.sunsetDate = 2026-09-21
Expand All @@ -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 Down Expand Up @@ -82,7 +82,7 @@ RestrictedSecurity.Test-Profile.Updated_2.extends = RestrictedSecurity.TestBase.
RestrictedSecurity.Test-Profile.Updated_2.tls.disabledAlgorithms =

RestrictedSecurity.Test-Profile.Updated_2.jce.provider.1 = sun.security.provider.Sun
RestrictedSecurity.Test-Profile.Updated_2.jce.provider.3 = sun.security.ssl.SunJSSE
RestrictedSecurity.Test-Profile.Updated_2.jce.provider.3 = com.sun.net.ssl.internal.ssl.Provider

#
# Test-Profile.Updated_3
Expand All @@ -97,7 +97,7 @@ RestrictedSecurity.Test-Profile.Updated_3.jce.provider.1 = sun.security.provider
RestrictedSecurity.Test-Profile.Updated_3.jce.provider.2 = com.sun.crypto.provider.SunJCE
RestrictedSecurity.Test-Profile.Updated_3.jce.provider.3 =
RestrictedSecurity.Test-Profile.Updated_3.jce.provider.4 = sun.security.ec.SunEC
RestrictedSecurity.Test-Profile.Updated_3.jce.provider.5 = sun.security.ssl.SunJSSE
RestrictedSecurity.Test-Profile.Updated_3.jce.provider.5 = com.sun.net.ssl.internal.ssl.Provider

#
# Test-Profile.Updated_4
Expand All @@ -111,7 +111,7 @@ RestrictedSecurity.Test-Profile.Updated_4.tls.disabledAlgorithms =
RestrictedSecurity.Test-Profile.Updated_4.jce.provider.1 = sun.security.provider.Sun
RestrictedSecurity.Test-Profile.Updated_4.jce.provider.2 =
RestrictedSecurity.Test-Profile.Updated_4.jce.provider.3 = sun.security.ec.SunEC
RestrictedSecurity.Test-Profile.Updated_4.jce.provider.4 = sun.security.ssl.SunJSSE
RestrictedSecurity.Test-Profile.Updated_4.jce.provider.4 = com.sun.net.ssl.internal.ssl.Provider

#
# Test-Profile.Base
Expand All @@ -124,7 +124,7 @@ RestrictedSecurity.Test-Profile.Base.tls.disabledAlgorithms =

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.4 = sun.security.ssl.SunJSSE
RestrictedSecurity.Test-Profile.Base.jce.provider.4 = com.sun.net.ssl.internal.ssl.Provider

#
# Test-Profile.Extended_1
Expand All @@ -138,7 +138,7 @@ RestrictedSecurity.Test-Profile.Extended_1.tls.disabledAlgorithms =
RestrictedSecurity.Test-Profile.Extended_1.jce.provider.1 = sun.security.provider.Sun
RestrictedSecurity.Test-Profile.Extended_1.jce.provider.2 = com.sun.crypto.provider.SunJCE
RestrictedSecurity.Test-Profile.Extended_1.jce.provider.3 = sun.security.rsa.SunRsaSign
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 All @@ -163,7 +163,7 @@ RestrictedSecurity.Test-Profile.BaseOneProviderEmpty.tls.disabledAlgorithms =
RestrictedSecurity.Test-Profile.BaseOneProviderEmpty.jce.provider.1 = sun.security.provider.Sun
RestrictedSecurity.Test-Profile.BaseOneProviderEmpty.jce.provider.2 = com.sun.crypto.provider.SunJCE
RestrictedSecurity.Test-Profile.BaseOneProviderEmpty.jce.provider.3 =
RestrictedSecurity.Test-Profile.BaseOneProviderEmpty.jce.provider.4 = sun.security.ssl.SunJSSE
RestrictedSecurity.Test-Profile.BaseOneProviderEmpty.jce.provider.4 = com.sun.net.ssl.internal.ssl.Provider

#
# Test-Profile.ExtendedOneProviderEmpty
Expand All @@ -176,7 +176,7 @@ RestrictedSecurity.Test-Profile.ExtendedOneProviderEmpty.tls.disabledAlgorithms

RestrictedSecurity.Test-Profile.ExtendedOneProviderEmpty.jce.provider.1 = sun.security.provider.Sun
RestrictedSecurity.Test-Profile.ExtendedOneProviderEmpty.jce.provider.2 = com.sun.crypto.provider.SunJCE
RestrictedSecurity.Test-Profile.ExtendedOneProviderEmpty.jce.provider.3 = sun.security.ssl.SunJSSE
RestrictedSecurity.Test-Profile.ExtendedOneProviderEmpty.jce.provider.3 = com.sun.net.ssl.internal.ssl.Provider
RestrictedSecurity.Test-Profile.ExtendedOneProviderEmpty.jce.provider.4 = sun.security.ec.SunEC
RestrictedSecurity.Test-Profile.ExtendedOneProviderEmpty.jce.provider.5 =
RestrictedSecurity.Test-Profile.ExtendedOneProviderEmpty.jce.provider.6 = sun.security.pkcs11.SunPKCS11
Expand Down

0 comments on commit 86f854a

Please sign in to comment.