--- a/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java Wed Jun 28 16:52:36 2017 +0100
+++ b/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java Wed Jul 05 17:27:46 2017 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@
import java.security.NoSuchProviderException;
import java.security.UnrecoverableKeyException;
import java.security.AlgorithmParameters;
+import java.security.spec.InvalidParameterSpecException;
import java.security.spec.PKCS8EncodedKeySpec;
import javax.crypto.Cipher;
@@ -74,6 +75,8 @@
// keys in the keystore implementation that comes with JDK 1.2)
private static final String KEY_PROTECTOR_OID = "1.3.6.1.4.1.42.2.17.1.1";
+ private static final int MAX_ITERATION_COUNT = 5000000;
+ private static final int ITERATION_COUNT = 200000;
private static final int SALT_LEN = 20; // the salt length
private static final int DIGEST_LEN = 20;
@@ -100,7 +103,7 @@
SunJCE.getRandom().nextBytes(salt);
// create PBE parameters from salt and iteration count
- PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, 20);
+ PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, ITERATION_COUNT);
// create PBE key from password
PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
@@ -155,6 +158,9 @@
pbeParams.init(encodedParams);
PBEParameterSpec pbeSpec =
pbeParams.getParameterSpec(PBEParameterSpec.class);
+ if (pbeSpec.getIterationCount() > MAX_ITERATION_COUNT) {
+ throw new IOException("PBE iteration count too large");
+ }
// create PBE key from password
PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
@@ -285,7 +291,7 @@
SunJCE.getRandom().nextBytes(salt);
// create PBE parameters from salt and iteration count
- PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, 20);
+ PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, ITERATION_COUNT);
// create PBE key from password
PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
@@ -326,6 +332,15 @@
throw new UnrecoverableKeyException("Cannot get " +
"algorithm parameters");
}
+ PBEParameterSpec pbeSpec;
+ try {
+ pbeSpec = params.getParameterSpec(PBEParameterSpec.class);
+ } catch (InvalidParameterSpecException ipse) {
+ throw new IOException("Invalid PBE algorithm parameters");
+ }
+ if (pbeSpec.getIterationCount() > MAX_ITERATION_COUNT) {
+ throw new IOException("PBE iteration count too large");
+ }
PBEWithMD5AndTripleDESCipher cipherSpi;
cipherSpi = new PBEWithMD5AndTripleDESCipher();
Cipher cipher = new CipherForKeyProtector(cipherSpi,