8001419: Build the JCE portion of JDK-8000970
Summary: Original code done by Fredrik Ohrstrom, separated/pushed by wetmore
Reviewed-by: wetmore
--- a/jdk/src/share/classes/com/sun/crypto/provider/KeyProtector.java Tue Oct 23 12:36:47 2012 -0700
+++ b/jdk/src/share/classes/com/sun/crypto/provider/KeyProtector.java Tue Oct 23 15:51:11 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, 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
@@ -363,34 +363,3 @@
super(cipherSpi, provider, transformation);
}
}
-
-final class SealedObjectForKeyProtector extends javax.crypto.SealedObject {
-
- static final long serialVersionUID = -3650226485480866989L;
-
- SealedObjectForKeyProtector(Serializable object, Cipher c)
- throws IOException, IllegalBlockSizeException {
- super(object, c);
- }
-
- SealedObjectForKeyProtector(SealedObject so) {
- super(so);
- }
-
- AlgorithmParameters getParameters() {
- AlgorithmParameters params = null;
- if (super.encodedParams != null) {
- try {
- params = AlgorithmParameters.getInstance("PBE", "SunJCE");
- params.init(super.encodedParams);
- } catch (NoSuchProviderException nspe) {
- // eat.
- } catch (NoSuchAlgorithmException nsae) {
- //eat.
- } catch (IOException ioe) {
- //eat.
- }
- }
- return params;
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java Tue Oct 23 15:51:11 2012 -0700
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 1998, 2012, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.crypto.provider;
+
+import java.io.*;
+import java.security.*;
+import javax.crypto.*;
+
+final class SealedObjectForKeyProtector extends SealedObject {
+
+ static final long serialVersionUID = -3650226485480866989L;
+
+ SealedObjectForKeyProtector(Serializable object, Cipher c)
+ throws IOException, IllegalBlockSizeException {
+ super(object, c);
+ }
+
+ SealedObjectForKeyProtector(SealedObject so) {
+ super(so);
+ }
+
+ AlgorithmParameters getParameters() {
+ AlgorithmParameters params = null;
+ if (super.encodedParams != null) {
+ try {
+ params = AlgorithmParameters.getInstance("PBE", "SunJCE");
+ params.init(super.encodedParams);
+ } catch (NoSuchProviderException nspe) {
+ // eat.
+ } catch (NoSuchAlgorithmException nsae) {
+ //eat.
+ } catch (IOException ioe) {
+ //eat.
+ }
+ }
+ return params;
+ }
+}