diff options
| author | Sergio Giro <sgiro@google.com> | 2016-02-01 18:52:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-01 18:52:42 +0000 |
| commit | 9218edabd1ef9852bc2f13115dcadc81b442dd6c (patch) | |
| tree | 8229ff72c8cbb06f49dce3a8382930919fa6fc2b /bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java | |
| parent | 9b30eb05e5be69d51881a0d1b31e503e97acd784 (diff) | |
| parent | 397d32894b89b506dc318e0f83446187c9b76ebe (diff) | |
| download | android_external_bouncycastle-9218edabd1ef9852bc2f13115dcadc81b442dd6c.tar.gz android_external_bouncycastle-9218edabd1ef9852bc2f13115dcadc81b442dd6c.tar.bz2 android_external_bouncycastle-9218edabd1ef9852bc2f13115dcadc81b442dd6c.zip | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge-152-from-upstream"
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java b/bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java index cf3c760..2206a33 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java @@ -6,9 +6,7 @@ import java.util.Vector; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.nist.NISTNamedCurves; import org.bouncycastle.asn1.sec.SECNamedCurves; -// BEGIN android-removed -// import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves; -// END android-removed +import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves; /** * A general class that reads all X9.62 style EC curve tables. @@ -32,12 +30,10 @@ public class ECNamedCurveTable ecP = SECNamedCurves.getByName(name); } - // BEGIN android-removed - // if (ecP == null) - // { - // ecP = TeleTrusTNamedCurves.getByName(name); - // } - // END android-removed + if (ecP == null) + { + ecP = TeleTrusTNamedCurves.getByName(name); + } if (ecP == null) { @@ -63,12 +59,10 @@ public class ECNamedCurveTable oid = SECNamedCurves.getOID(name); } - // BEGIN android-removed - // if (oid == null) - // { - // oid = TeleTrusTNamedCurves.getOID(name); - // } - // END android-removed + if (oid == null) + { + oid = TeleTrusTNamedCurves.getOID(name); + } if (oid == null) { @@ -95,12 +89,10 @@ public class ECNamedCurveTable ecP = SECNamedCurves.getByOID(oid); } - // BEGIN android-removed - // if (ecP == null) - // { - // ecP = TeleTrusTNamedCurves.getByOID(oid); - // } - // END android-removed + if (ecP == null) + { + ecP = TeleTrusTNamedCurves.getByOID(oid); + } // NOTE: All the NIST curves are currently from SEC, so no point in redundant OID lookup @@ -119,9 +111,7 @@ public class ECNamedCurveTable addEnumeration(v, X962NamedCurves.getNames()); addEnumeration(v, SECNamedCurves.getNames()); addEnumeration(v, NISTNamedCurves.getNames()); - // BEGIN android-removed - // addEnumeration(v, TeleTrusTNamedCurves.getNames()); - // END android-removed + addEnumeration(v, TeleTrusTNamedCurves.getNames()); return v.elements(); } |