--- old/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java	Fri May 22 02:35:03 2015
+++ new/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java	Fri May 22 02:35:03 2015
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -48,22 +48,10 @@
         public AesGcmNoPadding() throws NoSuchAlgorithmException {
             super(-1);
         }
-    }
-    public static final class Aes128GcmNoPadding extends NativeGCMCipher {
-        public Aes128GcmNoPadding() throws NoSuchAlgorithmException {
-            super(16);
+        public AesGcmNoPadding(int keySize) throws NoSuchAlgorithmException {
+            super(keySize);
         }
     }
-    public static final class Aes192GcmNoPadding extends NativeGCMCipher {
-        public Aes192GcmNoPadding() throws NoSuchAlgorithmException {
-            super(24);
-        }
-    }
-    public static final class Aes256GcmNoPadding extends NativeGCMCipher {
-        public Aes256GcmNoPadding() throws NoSuchAlgorithmException {
-            super(32);
-        }
-    }
 
     private static final int DEFAULT_TAG_LEN = 128; // same as SunJCE provider