WolfSSL
/
wolfcrypt-jni
mirror of https://github.com/wolfSSL/wolfcrypt-jni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

F-3762: zeroize unwrapped key buffer in engineUnwrap

pull/261/head
Chris Conlon 2026-08-18 16:31:34 -06:00
parent 4f7b64fc14
commit 6b276a76e8
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/com/wolfssl/provider/jce/WolfCryptCipher.java
View File

@ -2218,37 +2218,41 @@ public class WolfCryptCipher extends CipherSpi {
throw new InvalidKeyException("Failed to unwrap key");
}
switch (wrappedKeyType) {
case Cipher.SECRET_KEY:
return new SecretKeySpec(unwrappedKey, wrappedKeyAlgo);
try {
switch (wrappedKeyType) {
case Cipher.SECRET_KEY:
return new SecretKeySpec(unwrappedKey, wrappedKeyAlgo);
case Cipher.PUBLIC_KEY:
try {
KeyFactory kf = KeyFactory.getInstance(wrappedKeyAlgo);
return kf.generatePublic(
new X509EncodedKeySpec(unwrappedKey));
case Cipher.PUBLIC_KEY:
try {
KeyFactory kf = KeyFactory.getInstance(wrappedKeyAlgo);
return kf.generatePublic(
new X509EncodedKeySpec(unwrappedKey));
} catch (InvalidKeySpecException e) {
throw new InvalidKeyException(
"Failed to reconstruct public key: " +
e.getMessage(), e);
}
} catch (InvalidKeySpecException e) {
throw new InvalidKeyException(
"Failed to reconstruct public key: " +
e.getMessage(), e);
}
case Cipher.PRIVATE_KEY:
try {
KeyFactory kf = KeyFactory.getInstance(wrappedKeyAlgo);
return kf.generatePrivate(
new PKCS8EncodedKeySpec(unwrappedKey));
case Cipher.PRIVATE_KEY:
try {
KeyFactory kf = KeyFactory.getInstance(wrappedKeyAlgo);
return kf.generatePrivate(
new PKCS8EncodedKeySpec(unwrappedKey));
} catch (InvalidKeySpecException e) {
throw new InvalidKeyException(
"Failed to reconstruct private key: " +
e.getMessage(), e);
}
} catch (InvalidKeySpecException e) {
throw new InvalidKeyException(
"Failed to reconstruct private key: " +
e.getMessage(), e);
}
default:
throw new InvalidKeyException("Invalid wrappedKeyType: " +
wrappedKeyType);
default:
throw new InvalidKeyException("Invalid wrappedKeyType: " +
wrappedKeyType);
}
} finally {
zeroArray(unwrappedKey);
}
}