From b953c4d3509963749eda2323387a2a4226e13da1 Mon Sep 17 00:00:00 2001 From: Eran Messeri Date: Fri, 9 Feb 2024 16:29:21 +0000 Subject: Continue flag work for MGF1 Digest setter Adopt the new flag name. Test: atest CtsWebkitTestCases:android.webkit.cts.WebViewSslTest#testProceedClientCertRequestKeyWithAndroidKeystoreKey CtsKeystoreTestCases:android.keystore.cts.CipherTest#testKatBasicWithDifferentProviders CtsKeystoreWycheproofTestCases:RsaOaepTest Bug: 308378912 Bug: 308069562 Change-Id: Iccf8c70a3cde63a76919d52f66862bd5ac12e4b6 --- .../java/com/google/security/wycheproof/testcases/RsaOaepTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java b/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java index c0ee341..4a35879 100644 --- a/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java +++ b/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java @@ -68,7 +68,7 @@ public class RsaOaepTest { .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_RSA_PKCS1, KeyProperties.ENCRYPTION_PADDING_RSA_OAEP) .setIsStrongBoxBacked(isStrongBox); - if (Flags.mgf1DigestSetter()) { + if (Flags.mgf1DigestSetterV2()) { keyProtection.setDigests(digest); keyProtection.setMgf1Digests(mgfDigest); } else { -- cgit v1.2.3 From f3c96450efe06babb09df8735103ff18f2ba48a4 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 21 Feb 2024 10:59:22 +0000 Subject: Drop platform_apis from java_library This property is a no-op for this module type. Test: m nothing Bug: 215379393 Change-Id: I2c044e8de30fb0b0fbc276bab732df4597eaf901 --- Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/Android.bp b/Android.bp index 354d934..4e3e0f9 100644 --- a/Android.bp +++ b/Android.bp @@ -69,5 +69,4 @@ java_library_static { "cts-core-test-runner-axt", "cts-keystore-test-util", ], - platform_apis: true, } -- cgit v1.2.3