提交 99fe59b2 编写于 作者: I igerasim

8174756: Extra validation for public keys

Reviewed-by: valeriep
上级 06f33a60
...@@ -48,6 +48,7 @@ import sun.security.x509.X509Key; ...@@ -48,6 +48,7 @@ import sun.security.x509.X509Key;
public final class RSAPublicKeyImpl extends X509Key implements RSAPublicKey { public final class RSAPublicKeyImpl extends X509Key implements RSAPublicKey {
private static final long serialVersionUID = 2644735423591199609L; private static final long serialVersionUID = 2644735423591199609L;
private static final BigInteger THREE = BigInteger.valueOf(3);
private BigInteger n; // modulus private BigInteger n; // modulus
private BigInteger e; // public exponent private BigInteger e; // public exponent
...@@ -61,6 +62,7 @@ public final class RSAPublicKeyImpl extends X509Key implements RSAPublicKey { ...@@ -61,6 +62,7 @@ public final class RSAPublicKeyImpl extends X509Key implements RSAPublicKey {
this.n = n; this.n = n;
this.e = e; this.e = e;
RSAKeyFactory.checkRSAProviderKeyLengths(n.bitLength(), e); RSAKeyFactory.checkRSAProviderKeyLengths(n.bitLength(), e);
checkExponentRange();
// generate the encoding // generate the encoding
algid = RSAPrivateCrtKeyImpl.rsaId; algid = RSAPrivateCrtKeyImpl.rsaId;
try { try {
...@@ -83,6 +85,19 @@ public final class RSAPublicKeyImpl extends X509Key implements RSAPublicKey { ...@@ -83,6 +85,19 @@ public final class RSAPublicKeyImpl extends X509Key implements RSAPublicKey {
public RSAPublicKeyImpl(byte[] encoded) throws InvalidKeyException { public RSAPublicKeyImpl(byte[] encoded) throws InvalidKeyException {
decode(encoded); decode(encoded);
RSAKeyFactory.checkRSAProviderKeyLengths(n.bitLength(), e); RSAKeyFactory.checkRSAProviderKeyLengths(n.bitLength(), e);
checkExponentRange();
}
private void checkExponentRange() throws InvalidKeyException {
// the exponent should be smaller than the modulus
if (e.compareTo(n) >= 0) {
throw new InvalidKeyException("exponent is larger than modulus");
}
// the exponent should be at least 3
if (e.compareTo(THREE) < 0) {
throw new InvalidKeyException("exponent is smaller than 3");
}
} }
// see JCA doc // see JCA doc
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册