提交 35be7e99 编写于 作者: R robm

8064330: Remove SHA224 from the default support list if SunMSCAPI enabled

Reviewed-by: xuelei
上级 1758d200
...@@ -28,6 +28,7 @@ package sun.security.ssl; ...@@ -28,6 +28,7 @@ package sun.security.ssl;
import java.security.AlgorithmConstraints; import java.security.AlgorithmConstraints;
import java.security.CryptoPrimitive; import java.security.CryptoPrimitive;
import java.security.PrivateKey; import java.security.PrivateKey;
import java.security.Security;
import java.util.Set; import java.util.Set;
import java.util.HashSet; import java.util.HashSet;
...@@ -413,10 +414,14 @@ final class SignatureAndHashAlgorithm { ...@@ -413,10 +414,14 @@ final class SignatureAndHashAlgorithm {
"SHA1withRSA", --p); "SHA1withRSA", --p);
supports(HashAlgorithm.SHA1, SignatureAlgorithm.ECDSA, supports(HashAlgorithm.SHA1, SignatureAlgorithm.ECDSA,
"SHA1withECDSA", --p); "SHA1withECDSA", --p);
if (Security.getProvider("SunMSCAPI") == null) {
supports(HashAlgorithm.SHA224, SignatureAlgorithm.RSA, supports(HashAlgorithm.SHA224, SignatureAlgorithm.RSA,
"SHA224withRSA", --p); "SHA224withRSA", --p);
supports(HashAlgorithm.SHA224, SignatureAlgorithm.ECDSA, supports(HashAlgorithm.SHA224, SignatureAlgorithm.ECDSA,
"SHA224withECDSA", --p); "SHA224withECDSA", --p);
}
supports(HashAlgorithm.SHA256, SignatureAlgorithm.RSA, supports(HashAlgorithm.SHA256, SignatureAlgorithm.RSA,
"SHA256withRSA", --p); "SHA256withRSA", --p);
supports(HashAlgorithm.SHA256, SignatureAlgorithm.ECDSA, supports(HashAlgorithm.SHA256, SignatureAlgorithm.ECDSA,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册