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

Commit 259ca1ec authored by Eran Messeri's avatar Eran Messeri
Browse files

Do not register Curve25519 as a key factory directly 

Do not register Curve 25519 algorithms as key factories, until we fix
the registration to be in compliance with JEP 324.

Bug: 222440855
Bug: 222194540
Test: atest android.keystore.cts.Curve25519Test android.keystore.cts.KeyFactoryTest#testAlgorithmList CtsLibcoreTestCases:libcore.java.security.ProviderTest#test_Provider_getServices
Merged-In: Ibd53070a890955affaff5e4e7213892afd423db7
Change-Id: I11b3574aeff54b3eb8bf496c4c14aa1338629ce5
parent 471a9165

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");