diff options
| author | Adam Vartanian <flooey@google.com> | 2017-02-14 11:05:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-14 11:05:49 +0000 |
| commit | dc359b399e4168afd36dca12fd3873a243729147 (patch) | |
| tree | 0f7c00e0684a48ef242040713cfcb016f9b4a2c9 | |
| parent | 0d816526a3fd86150c407dea95ae271a570d4166 (diff) | |
| parent | 9e73c25399dc184960a99156a2b495a55b51b0fd (diff) | |
| download | bouncycastle-dc359b399e4168afd36dca12fd3873a243729147.tar.gz | |
Merge "BouncyCastle: Enable EC AlgorithmParameters." am: cd2014ba37 am: 2f73209199
am: 9e73c25399
Change-Id: I3fa9cf838b6d6e01c2acb6164fc5cbfb04a81378
| -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 |