Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfa806c6 authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Do not register Curve25519 as a key factory directly" into tm-dev am: 441e705d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17104486

Change-Id: Ib40ea70fb713667026bb4ed80cba635cf51e97f1
parents b11ee0b2 441e705d

keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java

+0 −6
Original line number Diff line number Diff line
@@ -83,16 +83,10 @@ public class AndroidKeyStoreProvider extends Provider { 
        // java.security.KeyPairGenerator

        put("KeyPairGenerator.EC", PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$EC");

        put("KeyPairGenerator.RSA", PACKAGE_NAME +  ".AndroidKeyStoreKeyPairGeneratorSpi$RSA");

        put("KeyPairGenerator." + X25519_ALIAS,

                PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$RSA");

        put("KeyPairGenerator." + ED25519_OID,

                PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$RSA");



        // java.security.KeyFactory

        putKeyFactoryImpl("EC");

        putKeyFactoryImpl("RSA");

        putKeyFactoryImpl(X25519_ALIAS);

        putKeyFactoryImpl(ED25519_OID);



        // javax.crypto.KeyGenerator

        put("KeyGenerator.AES", PACKAGE_NAME + ".AndroidKeyStoreKeyGeneratorSpi$AES");