# HG changeset patch # User vinnie # Date 1471464879 -3600 # Node ID 7fe1ed0bebc2b707b0f992c66767b2cce16dcd67 # Parent 40dfee550d77b93f756c25ba5228ff802e689e42 6977937: The SunJCE PBKDF2KeyImpl is requiring the MAC instance also be from SunJCE. Reviewed-by: xuelei, ascarpino, wetmore diff -r 40dfee550d77 -r 7fe1ed0bebc2 jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java Wed Aug 17 14:41:17 2016 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java Wed Aug 17 21:14:39 2016 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, 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 @@ -107,7 +107,7 @@ throw new InvalidKeySpecException("Key length is negative"); } try { - this.prf = Mac.getInstance(prfAlgo, SunJCE.getInstance()); + this.prf = Mac.getInstance(prfAlgo); } catch (NoSuchAlgorithmException nsae) { // not gonna happen; re-throw just in case InvalidKeySpecException ike = new InvalidKeySpecException();