changeset 7114:402b13fc601a

8029745: Enhance algorithm checking Reviewed-by: mullan
author juh
date Thu, 16 Jan 2014 18:08:15 -0500
parents 9aaea012e6f3
children fc7bd55c4e6c
files src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java	Thu Jan 16 15:13:15 2014 +0100
+++ b/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java	Thu Jan 16 18:08:15 2014 -0500
@@ -75,7 +75,7 @@
     private PublicKey prevPubKey;
 
     private final static Set<CryptoPrimitive> SIGNATURE_PRIMITIVE_SET =
-                                    EnumSet.of(CryptoPrimitive.SIGNATURE);
+        Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.SIGNATURE));
 
     private final static DisabledAlgorithmConstraints
         certPathDefaultConstraints = new DisabledAlgorithmConstraints(
--- a/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java	Thu Jan 16 15:13:15 2014 +0100
+++ b/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java	Thu Jan 16 18:08:15 2014 -0500
@@ -68,7 +68,7 @@
 
     // performance optimization
     private final static Set<CryptoPrimitive> SIGNATURE_PRIMITIVE_SET =
-                                    EnumSet.of(CryptoPrimitive.SIGNATURE);
+        Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.SIGNATURE));
 
     // supported pairs of signature and hash algorithm
     private final static Map<Integer, SignatureAndHashAlgorithm> supportedMap;