Merge "Keystore 2.0: Fix infinit recursion." (544f3d52) · Commits · e / os / android_frameworks_base

keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor
		resetAll();

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

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

		// Public key operations get diverted to the default provider.
		if (opmode == Cipher.ENCRYPT_MODE
		if (!(key instanceof AndroidKeyStorePrivateKey)
		&& (key instanceof PrivateKey \|\| key instanceof PublicKey)) {
		try {
		mCipher = Cipher.getInstance(getTransform());