Mercurial > hg > jdk9-shenandoah > jdk
changeset 12663:33cdc422c199
8130800: KeyStore.getInstance(File,char[]) does not throw IOE for null password
Reviewed-by: weijun, mullan
author | vinnie |
---|---|
date | Mon, 31 Aug 2015 10:14:34 +0100 |
parents | cb39fd2ecf8a |
children | 4f3c5f831833 9767a40f2708 |
files | src/java.base/share/classes/java/security/KeyStore.java |
diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.base/share/classes/java/security/KeyStore.java Fri Aug 28 13:40:43 2015 -0700 +++ b/src/java.base/share/classes/java/security/KeyStore.java Mon Aug 31 10:14:34 2015 +0100 @@ -1611,8 +1611,13 @@ * First the keystore type is determined by probing the specified file. * Then a keystore object is instantiated and loaded using the data from * that file. - * A password may be supplied to unlock the keystore data or perform an - * integrity check. + * + * <p> + * A password may be given to unlock the keystore + * (e.g. the keystore resides on a hardware token device), + * or to check the integrity of the keystore data. + * If a password is not given for integrity checking, + * then integrity checking is not performed. * * <p> * This method traverses the list of registered security