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

Merge "Keystore 2.0: Fix infinit recursion." am: 544f3d5211 am: d68724597d

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

Change-Id: Ibc53be4a881787c592a8b7869b8e7973d83ad5b5
This commit is contained in:
Yo Chiang
2021-03-19 09:02:32 +00:00
committed by Automerger Merge Worker
parent 6c7233c57e d68724597d
commit bcd0c980ff
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,7 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor
resetAll(); resetAll();
// Public key operations get diverted to the default provider. // Public key operations get diverted to the default provider.
if (opmode == Cipher.ENCRYPT_MODE if (!(key instanceof AndroidKeyStorePrivateKey)
&& (key instanceof PrivateKey || key instanceof PublicKey)) { && (key instanceof PrivateKey || key instanceof PublicKey)) {
try { try {
mCipher = Cipher.getInstance(getTransform()); mCipher = Cipher.getInstance(getTransform());
@@ -186,7 +186,7 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor
resetAll(); resetAll();
// Public key operations get diverted to the default provider. // Public key operations get diverted to the default provider.
if (opmode == Cipher.ENCRYPT_MODE if (!(key instanceof AndroidKeyStorePrivateKey)
&& (key instanceof PrivateKey || key instanceof PublicKey)) { && (key instanceof PrivateKey || key instanceof PublicKey)) {
try { try {
mCipher = Cipher.getInstance(getTransform()); mCipher = Cipher.getInstance(getTransform());
@@ -216,7 +216,7 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor
resetAll(); resetAll();
// Public key operations get diverted to the default provider. // Public key operations get diverted to the default provider.
if (opmode == Cipher.ENCRYPT_MODE if (!(key instanceof AndroidKeyStorePrivateKey)
&& (key instanceof PrivateKey || key instanceof PublicKey)) { && (key instanceof PrivateKey || key instanceof PublicKey)) {
try { try {
mCipher = Cipher.getInstance(getTransform()); mCipher = Cipher.getInstance(getTransform());