jdk-sandbox: comparison src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java

equal deleted inserted replaced

-:0538a5cdb474
+:53c3b460503c
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 import java.security.AlgorithmParameters;
 import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Arrays;
 import javax.crypto.Cipher;
 import javax.crypto.CipherSpi;
 import javax.crypto.SecretKey;
 import javax.crypto.SealedObject;
 import javax.crypto.spec.*;
+import javax.security.auth.DestroyFailedException;
 import sun.security.x509.AlgorithmId;
 import sun.security.util.ObjectIdentifier;
 /**
 * This class implements a protection mechanism for private keys. In JCE, we
 // create PBE parameters from salt and iteration count
 PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, ITERATION_COUNT);
 // create PBE key from password
 PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
-SecretKey sKey = new PBEKey(pbeKeySpec, "PBEWithMD5AndTripleDES");
+SecretKey sKey = null;
-pbeKeySpec.clearPassword();
-// encrypt private key
 PBEWithMD5AndTripleDESCipher cipher;
-cipher = new PBEWithMD5AndTripleDESCipher();
+try {
-cipher.engineInit(Cipher.ENCRYPT_MODE, sKey, pbeSpec, null);
+sKey = new PBEKey(pbeKeySpec, "PBEWithMD5AndTripleDES", false);
+// encrypt private key
+cipher = new PBEWithMD5AndTripleDESCipher();
+cipher.engineInit(Cipher.ENCRYPT_MODE, sKey, pbeSpec, null);
+} finally {
+pbeKeySpec.clearPassword();
+if (sKey != null) sKey.destroy();
+}
 byte[] plain = key.getEncoded();
 byte[] encrKey = cipher.engineDoFinal(plain, 0, plain.length);
+Arrays.fill(plain, (byte) 0x00);
 // wrap encrypted private key in EncryptedPrivateKeyInfo
 // (as defined in PKCS#8)
 AlgorithmParameters pbeParams =
 AlgorithmParameters.getInstance("PBE", SunJCE.getInstance());
 * using the password provided at construction time.
 */
 Key recover(EncryptedPrivateKeyInfo encrInfo)
 throws UnrecoverableKeyException, NoSuchAlgorithmException
 {
-byte[] plain;
+byte[] plain = null;
+SecretKey sKey = null;
 try {
 String encrAlg = encrInfo.getAlgorithm().getOID().toString();
 if (!encrAlg.equals(PBE_WITH_MD5_AND_DES3_CBC_OID)
 && !encrAlg.equals(KEY_PROTECTOR_OID)) {
 throw new UnrecoverableKeyException("Unsupported encryption "
 throw new IOException("PBE iteration count too large");
 }
 // create PBE key from password
 PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
-SecretKey sKey =
+sKey = new PBEKey(pbeKeySpec, "PBEWithMD5AndTripleDES", false);
-new PBEKey(pbeKeySpec, "PBEWithMD5AndTripleDES");
 pbeKeySpec.clearPassword();
 // decrypt private key
 PBEWithMD5AndTripleDESCipher cipher;
 cipher = new PBEWithMD5AndTripleDESCipher();
 // using the appropriate key factory
 String oidName = new AlgorithmId
 (new PrivateKeyInfo(plain).getAlgorithm().getOID()).getName();
 KeyFactory kFac = KeyFactory.getInstance(oidName);
 return kFac.generatePrivate(new PKCS8EncodedKeySpec(plain));
 } catch (NoSuchAlgorithmException ex) {
 // Note: this catch needed to be here because of the
 // later catch of GeneralSecurityException
 throw ex;
 } catch (IOException ioe) {
 throw new UnrecoverableKeyException(ioe.getMessage());
 } catch (GeneralSecurityException gse) {
 throw new UnrecoverableKeyException(gse.getMessage());
+} finally {
+if (plain != null) Arrays.fill(plain, (byte) 0x00);
+if (sKey != null) {
+try {
+sKey.destroy();
+} catch (DestroyFailedException e) {
+//shouldn't happen
+}
+}
 }
 }
 /*
 * Recovers the cleartext version of the given key (in protected format),
 // the password, digesting the concatenation, and comparing the
 // result of the digest operation with the digest provided at the end
 // of <code>protectedKey</code>. If the two digest values are
 // different, throw an exception.
 md.update(passwdBytes);
-java.util.Arrays.fill(passwdBytes, (byte)0x00);
+Arrays.fill(passwdBytes, (byte)0x00);
 passwdBytes = null;
 md.update(plainKey);
 digest = md.digest();
 md.reset();
 for (i = 0; i < digest.length; i++) {
 // create PBE parameters from salt and iteration count
 PBEParameterSpec pbeSpec = new PBEParameterSpec(salt, ITERATION_COUNT);
 // create PBE key from password
 PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
-SecretKey sKey = new PBEKey(pbeKeySpec, "PBEWithMD5AndTripleDES");
+SecretKey sKey = null;
+Cipher cipher;
+try {
+sKey = new PBEKey(pbeKeySpec, "PBEWithMD5AndTripleDES", false);
 pbeKeySpec.clearPassword();
 // seal key
-Cipher cipher;
 PBEWithMD5AndTripleDESCipher cipherSpi;
 cipherSpi = new PBEWithMD5AndTripleDESCipher();
 cipher = new CipherForKeyProtector(cipherSpi, SunJCE.getInstance(),
 "PBEWithMD5AndTripleDES");
 cipher.init(Cipher.ENCRYPT_MODE, sKey, pbeSpec);
+} finally {
+if (sKey != null) sKey.destroy();
+}
 return new SealedObjectForKeyProtector(key, cipher);
 }
 /**
 * Unseals the sealed key.
 */
 Key unseal(SealedObject so)
-throws NoSuchAlgorithmException, UnrecoverableKeyException
+throws NoSuchAlgorithmException, UnrecoverableKeyException {
-{
+SecretKey sKey = null;
 try {
 // create PBE key from password
 PBEKeySpec pbeKeySpec = new PBEKeySpec(this.password);
-SecretKey skey = new PBEKey(pbeKeySpec, "PBEWithMD5AndTripleDES");
+sKey = new PBEKey(pbeKeySpec,
+"PBEWithMD5AndTripleDES", false);
 pbeKeySpec.clearPassword();
 SealedObjectForKeyProtector soForKeyProtector = null;
 if (!(so instanceof SealedObjectForKeyProtector)) {
 soForKeyProtector = new SealedObjectForKeyProtector(so);
 PBEWithMD5AndTripleDESCipher cipherSpi;
 cipherSpi = new PBEWithMD5AndTripleDESCipher();
 Cipher cipher = new CipherForKeyProtector(cipherSpi,
 SunJCE.getInstance(),
 "PBEWithMD5AndTripleDES");
-cipher.init(Cipher.DECRYPT_MODE, skey, params);
+cipher.init(Cipher.DECRYPT_MODE, sKey, params);
 return soForKeyProtector.getKey(cipher);
 } catch (NoSuchAlgorithmException ex) {
 // Note: this catch needed to be here because of the
 // later catch of GeneralSecurityException
 throw ex;
 throw new UnrecoverableKeyException(ioe.getMessage());
 } catch (ClassNotFoundException cnfe) {
 throw new UnrecoverableKeyException(cnfe.getMessage());
 } catch (GeneralSecurityException gse) {
 throw new UnrecoverableKeyException(gse.getMessage());
+} finally {
+if (sKey != null) {
+try {
+sKey.destroy();
+} catch (DestroyFailedException e) {
+//shouldn't happen
+}
+}
 }
 }
 }

changeset 51293	53c3b460503c
parent 49783	977c6dd636bd
child 51504	c9a3e3cac9c7