Update tests for Conscrypt upstream merge.

For the most part, this is just adjusting tests to account for the fact
that "ChaCha20" now refers to the plain stream cipher instead of
ChaCha20+Poly1305.

Test: cts -m CtsLibcoreTestCases
Change-Id: I5976027811c58910952a186f3580a3f5e561407d

1 files changed, 1 insertions, 0 deletions

diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java
index 65aa67497d..5b83c879bf 100644
--- a/support/src/test/java/libcore/java/security/StandardNames.java
+++ b/support/src/test/java/libcore/java/security/StandardNames.java
@@ -572,6 +572,7 @@ public final class StandardNames {
             // Provided by our OpenSSL provider
             provide("AlgorithmParameters", "ChaCha20");
             provide("Cipher", "ChaCha20");
+            provide("Cipher", "ChaCha20/Poly1305/NoPadding");
             provide("KeyGenerator", "ChaCha20");
             provideCipherPaddings("AES", new String[] { "PKCS7Padding" });