Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase.

Browse Source 
Bug: 183101158
Test: atest CtsLibcoreTestCases:com.android.org.conscrypt.javax.crypto.CipherBasicsTest#testAeadEncryption

Change-Id: Idc9c7dc2614a47818227a06fe76078f72c0c1f57
This commit is contained in:
Janis Danisevskis
2021-03-18 10:26:48 -07:00
parent df786ca150
commit a1963a9b64
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java
View File

@@ -123,8 +123,9 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor
throws InvalidKeyException { throws InvalidKeyException {
resetAll(); resetAll();
if (!(key instanceof AndroidKeyStorePrivateKey // Public key operations get diverted to the default provider.
|| key instanceof AndroidKeyStoreSecretKey)) { if (opmode == Cipher.ENCRYPT_MODE
&& (key instanceof PrivateKey || key instanceof PublicKey)) {
try { try {
mCipher = Cipher.getInstance(getTransform()); mCipher = Cipher.getInstance(getTransform());
String transform = getTransform(); String transform = getTransform();
@@ -184,8 +185,9 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor
SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException { SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException {
resetAll(); resetAll();
if (!(key instanceof AndroidKeyStorePrivateKey // Public key operations get diverted to the default provider.
|| key instanceof AndroidKeyStoreSecretKey)) { if (opmode == Cipher.ENCRYPT_MODE
&& (key instanceof PrivateKey || key instanceof PublicKey)) {
try { try {
mCipher = Cipher.getInstance(getTransform()); mCipher = Cipher.getInstance(getTransform());
mCipher.init(opmode, key, params, random); mCipher.init(opmode, key, params, random);
@@ -213,8 +215,9 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor
SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException { SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException {
resetAll(); resetAll();
if (!(key instanceof AndroidKeyStorePrivateKey // Public key operations get diverted to the default provider.
|| key instanceof AndroidKeyStoreSecretKey)) { if (opmode == Cipher.ENCRYPT_MODE
&& (key instanceof PrivateKey || key instanceof PublicKey)) {
try { try {
mCipher = Cipher.getInstance(getTransform()); mCipher = Cipher.getInstance(getTransform());
mCipher.init(opmode, key, params, random); mCipher.init(opmode, key, params, random);