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

Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646146

Change-Id: Id4280de7e3f6f6693e0d03c901f4e9665803b92b
This commit is contained in:
Treehugger Robot
2021-03-19 00:31:59 +00:00
committed by Automerger Merge Worker
parent 02ee21ec65 be1b1d5550
commit 1ade004e0f
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);