Mercurial > hg > icedtea8-forest > jdk
changeset 11594:5ea62bb625b6 jdk8u71-b04
8138589: Correct limits on unlimited cryptography
Reviewed-by: mullan
author | igerasim |
---|---|
date | Wed, 14 Oct 2015 13:32:16 +0300 |
parents | 5d11e1da5ba2 |
children | e1385aad7740 |
files | src/share/classes/com/sun/crypto/provider/PBES2Core.java |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/crypto/provider/PBES2Core.java Wed Oct 14 12:32:05 2015 -0700 +++ b/src/share/classes/com/sun/crypto/provider/PBES2Core.java Wed Oct 14 13:32:16 2015 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2015, 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 @@ -263,7 +263,7 @@ passwdChars[i] = (char) (passwdBytes[i] & 0x7f); PBEKeySpec pbeSpec = - new PBEKeySpec(passwdChars, salt, iCount, blkSize * 8); + new PBEKeySpec(passwdChars, salt, iCount, keyLength); // password char[] was cloned in PBEKeySpec constructor, // so we can zero it out here java.util.Arrays.fill(passwdChars, ' ');