summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2015-10-18 13:01:33 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2015-10-18 13:01:33 +0700
commit1df5b7dd9235428140ae8725e0004072b13e8f99 (patch)
treeda862026de55a008520a3e3c69dbda545f8a140a
parentFollowups for the SicBlockCipher changes (diff)
downloadBouncyCastle.NET-ed25519-1df5b7dd9235428140ae8725e0004072b13e8f99.tar.xz
http://www.bouncycastle.org/jira/browse/BMA-128
- Cater for future X.509 versions
-rw-r--r--crypto/src/x509/X509Certificate.cs2
-rw-r--r--crypto/src/x509/X509Crl.cs2
-rw-r--r--crypto/test/src/asn1/test/CertificateTest.cs2
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/src/x509/X509Certificate.cs b/crypto/src/x509/X509Certificate.cs

index 4487232f0..c323fc8f1 100644 --- a/crypto/src/x509/X509Certificate.cs +++ b/crypto/src/x509/X509Certificate.cs
@@ -376,7 +376,7 @@ namespace Org.BouncyCastle.X509 protected override X509Extensions GetX509Extensions() { - return c.Version == 3 + return c.Version >= 3 ? c.TbsCertificate.Extensions : null; } diff --git a/crypto/src/x509/X509Crl.cs b/crypto/src/x509/X509Crl.cs
index 1746960fb..0679cb240 100644 --- a/crypto/src/x509/X509Crl.cs +++ b/crypto/src/x509/X509Crl.cs
@@ -64,7 +64,7 @@ namespace Org.BouncyCastle.X509 protected override X509Extensions GetX509Extensions() { - return Version == 2 + return c.Version >= 2 ? c.TbsCertList.Extensions : null; } diff --git a/crypto/test/src/asn1/test/CertificateTest.cs b/crypto/test/src/asn1/test/CertificateTest.cs
index 532e81aba..7fcb1fffa 100644 --- a/crypto/test/src/asn1/test/CertificateTest.cs +++ b/crypto/test/src/asn1/test/CertificateTest.cs
@@ -212,7 +212,7 @@ namespace Org.BouncyCastle.Asn1.Tests + " got " + tbsCert.Subject.ToString()); } - if (tbsCert.Version == 3) + if (tbsCert.Version >= 3) { X509Extensions ext = tbsCert.Extensions; if (ext != null)