Merge "Fix algorithm name passed to key class constructor for "EdDSA" Ed25519 keys." into main (ccfd479b) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -251,14 +251,17 @@ public class AndroidKeyStoreProvider extends Provider {
		} else if (KeyProperties.KEY_ALGORITHM_RSA.equalsIgnoreCase(jcaKeyAlgorithm)) {
		return new AndroidKeyStoreRSAPublicKey(descriptor, metadata,
		iSecurityLevel, (RSAPublicKey) publicKey);
		} else if (ED25519_OID.equalsIgnoreCase(jcaKeyAlgorithm)
		\|\| EDDSA_ALGORITHM_NAME.equalsIgnoreCase(jcaKeyAlgorithm)) {
		// This condition should be updated to only accept "EdDSA" as the algorithm name once
		} else if (ED25519_OID.equalsIgnoreCase(jcaKeyAlgorithm)) {
		// This branch should be removed once
		// https://github.com/google/conscrypt/commit/5473d34964ce77ab2594ae0cc0ecf74931f28cc3
		// is merged into Android.
		final byte[] publicKeyEncoded = publicKey.getEncoded();
		return new AndroidKeyStoreEdECPublicKey(descriptor, metadata, ED25519_OID,
		iSecurityLevel, publicKeyEncoded);
		} else if (EDDSA_ALGORITHM_NAME.equalsIgnoreCase(jcaKeyAlgorithm)) {
		final byte[] publicKeyEncoded = publicKey.getEncoded();
		return new AndroidKeyStoreEdECPublicKey(descriptor, metadata, EDDSA_ALGORITHM_NAME,
		iSecurityLevel, publicKeyEncoded);
		} else if (X25519_ALIAS.equalsIgnoreCase(jcaKeyAlgorithm)) {
		return new AndroidKeyStoreXDHPublicKey(descriptor, metadata, X25519_ALIAS,
		iSecurityLevel, publicKey.getEncoded());