diff options
4 files changed, 42 insertions, 3 deletions
diff --git a/ojluni/src/main/java/java/security/AlgorithmParameters.java b/ojluni/src/main/java/java/security/AlgorithmParameters.java index 864866ef7d..bca4a5cb87 100644 --- a/ojluni/src/main/java/java/security/AlgorithmParameters.java +++ b/ojluni/src/main/java/java/security/AlgorithmParameters.java @@ -66,6 +66,10 @@ import sun.security.jca.Providers; * <td>10+</td> * </tr> * <tr> + * <td>ChaCha20</td> + * <td>28+</td> + * </tr> + * <tr> * <td>DES</td> * <td>1+</td> * </tr> diff --git a/ojluni/src/main/java/javax/crypto/Cipher.java b/ojluni/src/main/java/javax/crypto/Cipher.java index 010587d40e..f3da67929e 100644 --- a/ojluni/src/main/java/javax/crypto/Cipher.java +++ b/ojluni/src/main/java/javax/crypto/Cipher.java @@ -174,18 +174,29 @@ import sun.security.jca.*; * <td>26+</td> * </tr> * <tr> - * <td>ARC4</td> + * <td rowspan="2">ARC4</td> * <td>ECB</td> * <td>NoPadding</td> * <td>10+</td> * </tr> * <tr> + * <td>NONE</td> + * <td>NoPadding</td> + * <td>28+</td> + * </tr> + * <tr> * <td>BLOWFISH</td> * <td>CBC<br>CFB<br>CTR<br>CTS<br>ECB<br>OFB</td> * <td>ISO10126Padding<br>NoPadding<br>PKCS5Padding</td> * <td>10+</td> * </tr> * <tr> + * <td>ChaCha20</td> + * <td>NONE<br>Poly1305</td> + * <td>NoPadding</td> + * <td>28+</td> + * </tr> + * <tr> * <td>DES</td> * <td>CBC<br>CFB<br>CTR<br>CTS<br>ECB<br>OFB</td> * <td>ISO10126Padding<br>NoPadding<br>PKCS5Padding</td> diff --git a/ojluni/src/main/java/javax/crypto/KeyGenerator.java b/ojluni/src/main/java/javax/crypto/KeyGenerator.java index b0977f0a5f..2d6f43dde6 100644 --- a/ojluni/src/main/java/javax/crypto/KeyGenerator.java +++ b/ojluni/src/main/java/javax/crypto/KeyGenerator.java @@ -109,6 +109,10 @@ import sun.security.jca.GetInstance.Instance; * <td>10+</td> * </tr> * <tr> + * <td>ChaCha20</td> + * <td>28+</td> + * </tr> + * <tr> * <td>DES</td> * <td>1+</td> * </tr> diff --git a/tools/docs/crypto/data/crypto_support.json b/tools/docs/crypto/data/crypto_support.json index 124a457674..8730405440 100644 --- a/tools/docs/crypto/data/crypto_support.json +++ b/tools/docs/crypto/data/crypto_support.json @@ -1,6 +1,6 @@ # This file is autogenerated. See libcore/tools/docs/crypto/README for details. { - "api_level": "26", + "api_level": "28", "categories": [ { "algorithms": [ @@ -41,6 +41,10 @@ "supported_api_levels": "10+" }, { + "name": "ChaCha20", + "supported_api_levels": "28+" + }, + { "name": "DES", "supported_api_levels": "1+" }, @@ -283,6 +287,10 @@ "supported_api_levels": "10+" }, { + "name": "ARC4/NONE/NoPadding", + "supported_api_levels": "28+" + }, + { "name": "BLOWFISH/CBC/ISO10126Padding", "supported_api_levels": "10+" }, @@ -355,6 +363,14 @@ "supported_api_levels": "10+" }, { + "name": "ChaCha20/NONE/NoPadding", + "supported_api_levels": "28+" + }, + { + "name": "ChaCha20/Poly1305/NoPadding", + "supported_api_levels": "28+" + }, + { "name": "DES/CBC/ISO10126Padding", "supported_api_levels": "1+" }, @@ -624,6 +640,10 @@ "supported_api_levels": "10+" }, { + "name": "ChaCha20", + "supported_api_levels": "28+" + }, + { "name": "DES", "supported_api_levels": "1+" }, @@ -2721,5 +2741,5 @@ "name": "TrustManagerFactory" } ], - "last_updated": "2017-05-05 07:40:17 UTC" + "last_updated": "2018-01-03 14:21:23 UTC" }
\ No newline at end of file |