diff options
| author | Adam Vartanian <flooey@google.com> | 2017-06-15 08:56:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-15 08:56:12 +0000 |
| commit | 682162505df1eec310280e921aa05d06e81090c6 (patch) | |
| tree | 67caebdc6f4c48c698907b5c0ad91a43dc192f53 | |
| parent | 357d2e247e311c64a3ff9af9c1e88851f56e3690 (diff) | |
| parent | c0a5538475e08d3303e136ea1def986ba87a0dcf (diff) | |
| download | conscrypt-682162505df1eec310280e921aa05d06e81090c6.tar.gz | |
Enable new Conscrypt algorithms. am: bd086d9c07 am: 5ec730a811
am: c0a5538475
Change-Id: Ic8969ff57a4b70d097e07cd93ae368fed2700d73
| -rw-r--r-- | common/src/main/java/org/conscrypt/OpenSSLProvider.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/common/src/main/java/org/conscrypt/OpenSSLProvider.java b/common/src/main/java/org/conscrypt/OpenSSLProvider.java index d3db4d83..1c23df12 100644 --- a/common/src/main/java/org/conscrypt/OpenSSLProvider.java +++ b/common/src/main/java/org/conscrypt/OpenSSLProvider.java @@ -99,8 +99,6 @@ public final class OpenSSLProvider extends Provider { put("Alg.Alias.MessageDigest.1.2.840.113549.2.5", "MD5"); /* == KeyGenerators == */ - // TODO: Enable - /* put("KeyGenerator.AES", PREFIX + "KeyGeneratorImpl$AES"); put("KeyGenerator.DESEDE", PREFIX + "KeyGeneratorImpl$DESEDE"); @@ -137,7 +135,6 @@ public final class OpenSSLProvider extends Provider { put("Alg.Alias.KeyGenerator.1.2.840.113549.2.11", "HmacSHA512"); put("Alg.Alias.KeyGenerator.HMAC-SHA512", "HmacSHA512"); put("Alg.Alias.KeyGenerator.HMAC/SHA512", "HmacSHA512"); - */ /* == KeyPairGenerators == */ put("KeyPairGenerator.RSA", PREFIX + "OpenSSLRSAKeyPairGenerator"); @@ -223,8 +220,7 @@ public final class OpenSSLProvider extends Provider { putRAWRSASignatureImplClass("OpenSSLSignatureRawRSA"); - // TODO: Enable - // putSignatureImplClass("NONEwithECDSA", "OpenSSLSignatureRawECDSA"); + putSignatureImplClass("NONEwithECDSA", "OpenSSLSignatureRawECDSA"); putSignatureImplClass("SHA1withECDSA", "OpenSSLSignature$SHA1ECDSA"); put("Alg.Alias.Signature.ECDSA", "SHA1withECDSA"); |