diff options
| author | Sergio Giro <sgiro@google.com> | 2017-01-04 18:16:22 +0000 |
|---|---|---|
| committer | Sergio Giro <sgiro@google.com> | 2017-01-19 19:49:45 +0000 |
| commit | 7dad97b63c47edea4e3afb374dcd00c7b7a1bdd4 (patch) | |
| tree | 8ebc72ead6f9a80938fdba92e217da96ee451037 /bcprov/src/main/java/org/bouncycastle/asn1/x509/TBSCertificate.java | |
| parent | fba1a1dba277746d3be0667de9eb4b98494a1963 (diff) | |
| parent | eaf604a467ff401cd0e0f74051ff5afa9e07359d (diff) | |
| download | bouncycastle-7dad97b63c47edea4e3afb374dcd00c7b7a1bdd4.tar.gz | |
bouncycastle: upgrade to version 1.56
Merge remote-tracking branch 'aosp/upstream-master' into merge-to-156
Test: ran the following cts modules: CtsLibcoreFileIOTestCases CtsLibcoreJavaUtilCollectionsTestCases CtsLibcoreJsr166TestCases CtsLibcoreLegacy22TestCases CtsLibcoreOjTestCases CtsLibcoreOkHttpTestCases CtsLibcoreTestCases
Bug: 31076342
Change-Id: Iceb926dc5a312b2047bf19d1c82fb16e42bc1461
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1/x509/TBSCertificate.java')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/x509/TBSCertificate.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/TBSCertificate.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/TBSCertificate.java index dc419649..f7f60050 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/TBSCertificate.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/x509/TBSCertificate.java @@ -77,7 +77,7 @@ public class TBSCertificate // // some certficates don't include a version number - we assume v1 // - if (seq.getObjectAt(0) instanceof DERTaggedObject) + if (seq.getObjectAt(0) instanceof ASN1TaggedObject) { version = ASN1Integer.getInstance((ASN1TaggedObject)seq.getObjectAt(0), true); } @@ -109,7 +109,7 @@ public class TBSCertificate for (int extras = seq.size() - (seqStart + 6) - 1; extras > 0; extras--) { - DERTaggedObject extra = (DERTaggedObject)seq.getObjectAt(seqStart + 6 + extras); + ASN1TaggedObject extra = (ASN1TaggedObject)seq.getObjectAt(seqStart + 6 + extras); switch (extra.getTagNo()) { |