Skip to content

Commit 6b5a717

Browse files
author
Santiago Gala
committed
Keep test security properties for FIPS in sync with OS
1 parent 97468fa commit 6b5a717

File tree

2 files changed

+26
-16
lines changed

2 files changed

+26
-16
lines changed

core/src/main/resources/ssl/self_signed_fips/java.security.openjdk-11

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
# the command line, set the key security.overridePropertiesFile
2323
# to false in the master security properties file. It is set to true
2424
# by default.
25+
#
26+
# If this properties file fails to load, the JDK implementation will throw
27+
# an unspecified error when initializing the java.security.Security class.
2528

2629
# In this file, various security properties are set for use by
2730
# java.security classes. This is where users can statically register
@@ -306,9 +309,7 @@ keystore.type.compat=true
306309
# RuntimePermission("accessClassInPackage."+package) has been granted.
307310
#
308311
package.access=sun.misc.,\
309-
sun.reflect.,\
310-
org.GNOME.Accessibility.,\
311-
org.GNOME.Bonobo.
312+
sun.reflect.
312313

313314
#
314315
# List of comma-separated packages that start with or equal this string
@@ -320,9 +321,7 @@ package.access=sun.misc.,\
320321
# checkPackageDefinition.
321322
#
322323
package.definition=sun.misc.,\
323-
sun.reflect.,\
324-
org.GNOME.Accessibility.,\
325-
org.GNOME.Bonobo.
324+
sun.reflect.
326325

327326
#
328327
# Determines whether this properties file can be appended to
@@ -507,7 +506,16 @@ sun.security.krb5.maxReferrals=5
507506
# in the jdk.[tls|certpath|jar].disabledAlgorithms properties. To include this
508507
# list in any of the disabledAlgorithms properties, add the property name as
509508
# an entry.
510-
jdk.disabled.namedCurves = secp256k1
509+
jdk.disabled.namedCurves = secp112r1, secp112r2, secp128r1, secp128r2, \
510+
secp160k1, secp160r1, secp160r2, secp192k1, secp192r1, secp224k1, \
511+
secp224r1, secp256k1, sect113r1, sect113r2, sect131r1, sect131r2, \
512+
sect163k1, sect163r1, sect163r2, sect193r1, sect193r2, sect233k1, \
513+
sect233r1, sect239k1, sect283k1, sect283r1, sect409k1, sect409r1, \
514+
sect571k1, sect571r1, X9.62 c2tnb191v1, X9.62 c2tnb191v2, \
515+
X9.62 c2tnb191v3, X9.62 c2tnb239v1, X9.62 c2tnb239v2, X9.62 c2tnb239v3, \
516+
X9.62 c2tnb359v1, X9.62 c2tnb431r1, X9.62 prime192v2, X9.62 prime192v3, \
517+
X9.62 prime239v1, X9.62 prime239v2, X9.62 prime239v3, brainpoolP256r1, \
518+
brainpoolP320r1, brainpoolP384r1, brainpoolP512r1
511519

512520
#
513521
# Algorithm restrictions for certification path (CertPath) processing
@@ -745,7 +753,7 @@ jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
745753
#
746754
# Example:
747755
# jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048, \
748-
# rsa_pkcs1_sha1
756+
# rsa_pkcs1_sha1, secp224r1
749757
jdk.tls.disabledAlgorithms=SSLv3, TLSv1, TLSv1.1, RC4, DES, MD5withRSA, \
750758
DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, \
751759
include jdk.disabled.namedCurves
@@ -903,7 +911,8 @@ jdk.tls.legacyAlgorithms= \
903911
# Note: This property is currently used by OpenJDK's JSSE implementation. It
904912
# is not guaranteed to be examined and used by other implementations.
905913
#
906-
jdk.tls.keyLimits=AES/GCM/NoPadding KeyUpdate 2^37
914+
jdk.tls.keyLimits=AES/GCM/NoPadding KeyUpdate 2^37, \
915+
ChaCha20-Poly1305 KeyUpdate 2^37
907916

908917
#
909918
# Cryptographic Jurisdiction Policy defaults

core/src/main/resources/ssl/self_signed_fips/java.security.openjdk-17

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
# the command line, set the key security.overridePropertiesFile
2323
# to false in the master security properties file. It is set to true
2424
# by default.
25+
#
26+
# If this properties file fails to load, the JDK implementation will throw
27+
# an unspecified error when initializing the java.security.Security class.
2528

2629
# In this file, various security properties are set for use by
2730
# java.security classes. This is where users can statically register
@@ -83,6 +86,7 @@ fips.provider.3=SunEC
8386
fips.provider.4=SunJSSE
8487
fips.provider.5=SunJCE
8588
fips.provider.6=SunRsaSign
89+
fips.provider.7=XMLDSig
8690

8791
#
8892
# A list of preferred providers for specific algorithms. These providers will
@@ -347,9 +351,7 @@ keystore.type.compat=true
347351
# RuntimePermission("accessClassInPackage."+package) has been granted.
348352
#
349353
package.access=sun.misc.,\
350-
sun.reflect.,\
351-
org.GNOME.Accessibility.,\
352-
org.GNOME.Bonobo.
354+
sun.reflect.
353355

354356
#
355357
# List of comma-separated packages that start with or equal this string
@@ -361,9 +363,7 @@ package.access=sun.misc.,\
361363
# checkPackageDefinition.
362364
#
363365
package.definition=sun.misc.,\
364-
sun.reflect.,\
365-
org.GNOME.Accessibility.,\
366-
org.GNOME.Bonobo.
366+
sun.reflect.
367367

368368
#
369369
# Determines whether this properties file can be appended to
@@ -937,7 +937,8 @@ jdk.tls.legacyAlgorithms=NULL, anon, RC4, DES, 3DES_EDE_CBC
937937
# Note: This property is currently used by OpenJDK's JSSE implementation. It
938938
# is not guaranteed to be examined and used by other implementations.
939939
#
940-
jdk.tls.keyLimits=AES/GCM/NoPadding KeyUpdate 2^37
940+
jdk.tls.keyLimits=AES/GCM/NoPadding KeyUpdate 2^37, \
941+
ChaCha20-Poly1305 KeyUpdate 2^37
941942

942943
#
943944
# Cryptographic Jurisdiction Policy defaults

0 commit comments

Comments
 (0)