diff options
| author | Sergio Giro <sgiro@google.com> | 2016-04-12 14:03:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-12 14:03:45 +0000 |
| commit | 42e7f905614a16dff5dff2bc6408f705a7660202 (patch) | |
| tree | 9e66bdff6d0e6fc9a863742765d4c95191c4d1ea | |
| parent | 7ddf37c01b68ff9d2de3a9dcb637d2b962b442ef (diff) | |
| parent | e62a21de02586e1654cc460326383e6a5a9fd033 (diff) | |
| download | android_external_bouncycastle-42e7f905614a16dff5dff2bc6408f705a7660202.tar.gz android_external_bouncycastle-42e7f905614a16dff5dff2bc6408f705a7660202.tar.bz2 android_external_bouncycastle-42e7f905614a16dff5dff2bc6408f705a7660202.zip | |
Merge "EC: add bug number in TODO comment about registrations failing" into nyc-dev
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java | 11 |
1 files changed, 8 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 43cc555..99a27bf 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 @@ -83,12 +83,17 @@ public class EC // registerOid(provider, SECObjectIdentifiers.dhSinglePass_stdDH_sha512kdf_scheme, "EC", new KeyFactorySpi.EC()); // registerOid(provider, SECObjectIdentifiers.dhSinglePass_cofactorDH_sha512kdf_scheme, "EC", new KeyFactorySpi.EC()); // - // // Android comment: the registration below is causing CTS tests to fail and doesn't seem - // // to be implemented by bouncycastle (so looks like an bug in bouncycastle). - // // TODO(26929227): check this still happens + // END android-removed + // BEGIN android-removed + // // Android comment: the registrations in this block are causing CTS tests to fail + // // and don't seem to be implemented by bouncycastle (so looks like an bug in + // // bouncycastle). + // // TODO(20447540): check if this occurs in upstream bouncycastle and report accordingly // registerOidAlgorithmParameters(provider, X9ObjectIdentifiers.id_ecPublicKey, "EC"); // // registerOidAlgorithmParameters(provider, X9ObjectIdentifiers.dhSinglePass_stdDH_sha1kdf_scheme, "EC"); + // END android-removed + // BEGIN android-removed // registerOidAlgorithmParameters(provider, X9ObjectIdentifiers.dhSinglePass_cofactorDH_sha1kdf_scheme, "EC"); // // registerOidAlgorithmParameters(provider, SECObjectIdentifiers.dhSinglePass_stdDH_sha224kdf_scheme, "EC"); |