diff options
| author | Adam Vartanian <flooey@google.com> | 2017-10-16 10:51:45 +0100 |
|---|---|---|
| committer | Adam Vartanian <flooey@google.com> | 2017-10-26 11:43:03 +0100 |
| commit | 12442ce0398b6ca0917462d33709f15c68f7e095 (patch) | |
| tree | 17c34aba66e6d08105fd8c31a90f907fa7e538af /support | |
| parent | b4685403b21ba4390a46d81ac3511ad046611b08 (diff) | |
Update tests for Conscrypt upstream merge.
Adds basic compliance tests for ChaCha20/Poly1305/NoPadding.
Adds test that AES/GCM/NoPadding can be initialized with GCM
AlgorithmParameters.
Adds reuse test for ChaCha20/Poly1305/NoPadding.
Updates StandardNames for new names.
Updates SSLSocketTest for changed Conscrypt implementation details.
Test: cts -m CtsLibcoreTestCases
Change-Id: I608e4bbcced678fdfac8b28d500f7fa8b4599319
Diffstat (limited to 'support')
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 3 |
1 files changed, 3 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 db5d0b1fa0..65aa67497d 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -570,6 +570,9 @@ public final class StandardNames { provide("Cipher", "DESEDE/OFB/PKCS7PADDING"); // Provided by our OpenSSL provider + provide("AlgorithmParameters", "ChaCha20"); + provide("Cipher", "ChaCha20"); + provide("KeyGenerator", "ChaCha20"); provideCipherPaddings("AES", new String[] { "PKCS7Padding" }); // removed LDAP |