diff options
| author | Sergio Giro <sgiro@google.com> | 2016-02-01 18:54:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-01 18:54:35 +0000 |
| commit | 3e75bd6b407dd472c834a50f16aae54cca67ea9c (patch) | |
| tree | b5eb091b97b2aade28e5b45a15352125a4a776d7 /bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java | |
| parent | 9218edabd1ef9852bc2f13115dcadc81b442dd6c (diff) | |
| parent | c1040cb5656c3299f1c2d0fe0bd7c44b10466aaf (diff) | |
| download | android_external_bouncycastle-3e75bd6b407dd472c834a50f16aae54cca67ea9c.tar.gz android_external_bouncycastle-3e75bd6b407dd472c834a50f16aae54cca67ea9c.tar.bz2 android_external_bouncycastle-3e75bd6b407dd472c834a50f16aae54cca67ea9c.zip | |
Merge "Restoring the contents of aosp after"
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, 24 insertions, 14 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 2206a33..cf3c760 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java @@ -6,7 +6,9 @@ import java.util.Vector; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.nist.NISTNamedCurves; import org.bouncycastle.asn1.sec.SECNamedCurves; -import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves; +// BEGIN android-removed +// import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves; +// END android-removed /** * A general class that reads all X9.62 style EC curve tables. @@ -30,10 +32,12 @@ public class ECNamedCurveTable ecP = SECNamedCurves.getByName(name); } - if (ecP == null) - { - ecP = TeleTrusTNamedCurves.getByName(name); - } + // BEGIN android-removed + // if (ecP == null) + // { + // ecP = TeleTrusTNamedCurves.getByName(name); + // } + // END android-removed if (ecP == null) { @@ -59,10 +63,12 @@ public class ECNamedCurveTable oid = SECNamedCurves.getOID(name); } - if (oid == null) - { - oid = TeleTrusTNamedCurves.getOID(name); - } + // BEGIN android-removed + // if (oid == null) + // { + // oid = TeleTrusTNamedCurves.getOID(name); + // } + // END android-removed if (oid == null) { @@ -89,10 +95,12 @@ public class ECNamedCurveTable ecP = SECNamedCurves.getByOID(oid); } - if (ecP == null) - { - ecP = TeleTrusTNamedCurves.getByOID(oid); - } + // BEGIN android-removed + // if (ecP == null) + // { + // ecP = TeleTrusTNamedCurves.getByOID(oid); + // } + // END android-removed // NOTE: All the NIST curves are currently from SEC, so no point in redundant OID lookup @@ -111,7 +119,9 @@ public class ECNamedCurveTable addEnumeration(v, X962NamedCurves.getNames()); addEnumeration(v, SECNamedCurves.getNames()); addEnumeration(v, NISTNamedCurves.getNames()); - addEnumeration(v, TeleTrusTNamedCurves.getNames()); + // BEGIN android-removed + // addEnumeration(v, TeleTrusTNamedCurves.getNames()); + // END android-removed return v.elements(); } |