--- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java	Tue Mar 10 14:00:05 2015 -0700
+++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java	Mon Apr 06 20:24:27 2015 +0000
@@ -206,7 +206,7 @@
         }
         if (doEncrypt) {
             requireReinit = Arrays.equals(ivBytes, lastEncIv) &&
-                Arrays.equals(keyBytes, lastEncKey);
+                MessageDigest.isEqual(keyBytes, lastEncKey);
             if (requireReinit) {
                 throw new InvalidAlgorithmParameterException
                     ("Cannot reuse iv for GCM encryption");