jdk-sandbox: comparison jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java

equal deleted inserted replaced

-:3c7eda3ab2f5
+:0bb1999251f8
 /*
-* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2011, 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
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.cert.CertificateException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.*;
-import java.math.*;
 import java.security.AlgorithmParameters;
-import java.security.spec.AlgorithmParameterSpec;
 import javax.crypto.spec.PBEParameterSpec;
 import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.SecretKey;
 import javax.crypto.Cipher;
 import javax.crypto.Mac;
 import javax.security.auth.x500.X500Principal;
 entry.alias = alias.toLowerCase();
 // add the entry
 entries.put(alias.toLowerCase(), entry);
 } catch (Exception nsae) {
-KeyStoreException ke = new KeyStoreException("Key protection " +
+throw new KeyStoreException("Key protection " +
-" algorithm not found: " + nsae);
+" algorithm not found: " + nsae, nsae);
-ke.initCause(nsae);
-throw ke;
 }
 }
 /**
 * Assigns the given key (that has already been protected) to the given
 // key must be encoded as EncryptedPrivateKeyInfo
 // as defined in PKCS#8
 try {
 new EncryptedPrivateKeyInfo(key);
 } catch (IOException ioe) {
-KeyStoreException ke = new KeyStoreException("Private key is not"
+throw new KeyStoreException("Private key is not stored"
-+ " stored as PKCS#8 EncryptedPrivateKeyInfo: " + ioe);
++ " as PKCS#8 EncryptedPrivateKeyInfo: " + ioe, ioe);
-ke.initCause(ioe);
-throw ke;
 }
 KeyEntry entry = new KeyEntry();
 entry.date = new Date();
 new PBEParameterSpec(getSalt(), iterationCount);
 try {
 algParams = AlgorithmParameters.getInstance(algorithm);
 algParams.init(paramSpec);
 } catch (Exception e) {
-IOException ioe =
+throw new IOException("getAlgorithmParameters failed: " +
-new IOException("getAlgorithmParameters failed: " +
+e.getMessage(), e);
-e.getMessage());
-ioe.initCause(e);
-throw ioe;
 }
 return algParams;
 }
 /*
 if (params != null) {
 algParams = AlgorithmParameters.getInstance("PBE");
 algParams.init(params.toByteArray());
 }
 } catch (Exception e) {
-IOException ioe =
+throw new IOException("parseAlgParameters failed: " +
-new IOException("parseAlgParameters failed: " +
+e.getMessage(), e);
-e.getMessage());
-ioe.initCause(e);
-throw ioe;
 }
 return algParams;
 }
 /*
 try {
 PBEKeySpec keySpec = new PBEKeySpec(password);
 SecretKeyFactory skFac = SecretKeyFactory.getInstance("PBE");
 skey = skFac.generateSecret(keySpec);
 } catch (Exception e) {
-IOException ioe = new IOException("getSecretKey failed: " +
+throw new IOException("getSecretKey failed: " +
-e.getMessage());
+e.getMessage(), e);
-ioe.initCause(e);
-throw ioe;
 }
 return skey;
 }
 /*
 try {
 MessageDigest md = MessageDigest.getInstance("SHA1");
 md.update(data);
 digest = md.digest();
 } catch (Exception e) {
-IOException ioe = new IOException("generateHash failed: " + e);
+throw new IOException("generateHash failed: " + e, e);
-ioe.initCause(e);
-throw ioe;
 }
 return digest;
 }
 iterationCount);
 DerOutputStream bytes = new DerOutputStream();
 bytes.write(macData.getEncoded());
 mData = bytes.toByteArray();
 } catch (Exception e) {
-IOException ioe = new IOException("calculateMac failed: " + e);
+throw new IOException("calculateMac failed: " + e, e);
-ioe.initCause(e);
-throw ioe;
 }
 return mData;
 }
 Cipher cipher = Cipher.getInstance("PBEWithSHA1AndRC2_40");
 cipher.init(Cipher.ENCRYPT_MODE, skey, algParams);
 encryptedData = cipher.doFinal(data);
 } catch (Exception e) {
-IOException ioe = new IOException("Failed to encrypt" +
+throw new IOException("Failed to encrypt" +
-" safe contents entry: " + e);
+" safe contents entry: " + e, e);
-ioe.initCause(e);
-throw ioe;
 }
 // create EncryptedContentInfo
 DerOutputStream bytes2 = new DerOutputStream();
 bytes2.putOID(ContentInfo.DATA_OID);
 */
 byte[] authSafeData;
 ContentInfo authSafe = new ContentInfo(s);
 ObjectIdentifier contentType = authSafe.getContentType();
-if (contentType.equals(ContentInfo.DATA_OID)) {
+if (contentType.equals((Object)ContentInfo.DATA_OID)) {
 authSafeData = authSafe.getData();
 } else /* signed data */ {
 throw new IOException("public key protected PKCS12 not supported");
 }
 sci = new DerInputStream(safeContentsArray[i].toByteArray());
 safeContents = new ContentInfo(sci);
 contentType = safeContents.getContentType();
 safeContentsData = null;
-if (contentType.equals(ContentInfo.DATA_OID)) {
+if (contentType.equals((Object)ContentInfo.DATA_OID)) {
 safeContentsData = safeContents.getData();
 } else if (contentType.equals(ContentInfo.ENCRYPTED_DATA_OID)) {
 if (password == null) {
 continue;
 }
 Cipher cipher = Cipher.getInstance(algOid.toString());
 cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
 safeContentsData = cipher.doFinal(safeContentsData);
 } catch (Exception e) {
-IOException ioe = new IOException("failed to decrypt safe"
+throw new IOException("failed to decrypt safe"
-+ " contents entry: " + e);
++ " contents entry: " + e, e);
-ioe.initCause(e);
-throw ioe;
 }
 } else {
 throw new IOException("public key protected PKCS12" +
 " not supported");
 }
 if (!Arrays.equals(macData.getDigest(), macResult)) {
 throw new SecurityException("Failed PKCS12" +
 " integrity checking");
 }
 } catch (Exception e) {
-IOException ioe =
+throw new IOException("Integrity check failed: " + e, e);
-new IOException("Integrity check failed: " + e);
-ioe.initCause(e);
-throw ioe;
 }
 }
 /*
 * Match up private keys with certificate chains.
 if (!bagValue.isContextSpecific((byte)0)) {
 throw new IOException("unsupported PKCS12 bag value type "
 + bagValue.tag);
 }
 bagValue = bagValue.data.getDerValue();
-if (bagId.equals(PKCS8ShroudedKeyBag_OID)) {
+if (bagId.equals((Object)PKCS8ShroudedKeyBag_OID)) {
 KeyEntry kEntry = new KeyEntry();
 kEntry.protectedPrivKey = bagValue.toByteArray();
 bagItem = kEntry;
 privateKeyCount++;
-} else if (bagId.equals(CertBag_OID)) {
+} else if (bagId.equals((Object)CertBag_OID)) {
 DerInputStream cs = new DerInputStream(bagValue.toByteArray());
 DerValue[] certValues = cs.getSequence(2);
 ObjectIdentifier certId = certValues[0].getOID();
 if (!certValues[1].isContextSpecific((byte)0)) {
 throw new IOException("unsupported PKCS12 cert value type "
 valSet = vs.getSet(1);
 } catch (IOException e) {
 throw new IOException("Attribute " + attrId +
 " should have a value " + e.getMessage());
 }
-if (attrId.equals(PKCS9FriendlyName_OID)) {
+if (attrId.equals((Object)PKCS9FriendlyName_OID)) {
 alias = valSet[0].getBMPString();
-} else if (attrId.equals(PKCS9LocalKeyId_OID)) {
+} else if (attrId.equals((Object)PKCS9LocalKeyId_OID)) {
 keyId = valSet[0].getOctetString();
 } else {
 // log error message for "unknown attr"
 }
 }

changeset 10336	0bb1999251f8
parent 5973	b48e1702532e
child 10369	e9d2e59e53f0