diff options
author | Adam Vartanian <flooey@google.com> | 2017-02-14 10:57:23 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-14 10:57:24 +0000 |
commit | cd2014ba3772c209f487d168a55d785eef2d324f (patch) | |
tree | 0f7c00e0684a48ef242040713cfcb016f9b4a2c9 /bcprov | |
parent | eebc649f31b9fe915dd07aad40ff2deee00ef6b2 (diff) | |
parent | 10e2e7994c97a5019d63b2a3ae556544a8d1900f (diff) | |
download | bouncycastle-cd2014ba3772c209f487d168a55d785eef2d324f.tar.gz |
Merge "BouncyCastle: Enable EC AlgorithmParameters."
Diffstat (limited to 'bcprov')
-rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java index 17e805be..7d0baa94 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java @@ -28,9 +28,7 @@ public class EC public void configure(ConfigurableProvider provider) { - // BEGIN android-removed - // provider.addAlgorithm("AlgorithmParameters.EC", PREFIX + "AlgorithmParametersSpi"); - // END android-removed + provider.addAlgorithm("AlgorithmParameters.EC", PREFIX + "AlgorithmParametersSpi"); provider.addAlgorithm("KeyAgreement.ECDH", PREFIX + "KeyAgreementSpi$DH"); // BEGIN android-removed |