diff options
Diffstat (limited to 'crypto/src/x509')
| -rw-r--r-- | crypto/src/x509/AttributeCertificateHolder.cs | 4 | ||||
| -rw-r--r-- | crypto/src/x509/X509Certificate.cs | 6 | ||||
| -rw-r--r-- | crypto/src/x509/X509Crl.cs | 2 | ||||
| -rw-r--r-- | crypto/src/x509/X509SignatureUtil.cs | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/crypto/src/x509/AttributeCertificateHolder.cs b/crypto/src/x509/AttributeCertificateHolder.cs index 3a6af4c20..04460cd59 100644 --- a/crypto/src/x509/AttributeCertificateHolder.cs +++ b/crypto/src/x509/AttributeCertificateHolder.cs @@ -103,7 +103,7 @@ namespace Org.BouncyCastle.X509 // TODO Allow 'objectDigest' to be null? holder = new Holder(new ObjectDigestInfo(digestedObjectType, otherObjectTypeID, - new AlgorithmIdentifier(digestAlgorithm), Arrays.Clone(objectDigest))); + new AlgorithmIdentifier(new DerObjectIdentifier(digestAlgorithm)), Arrays.Clone(objectDigest))); } /** @@ -147,7 +147,7 @@ namespace Org.BouncyCastle.X509 return odi == null ? null - : odi.DigestAlgorithm.ObjectID.Id; + : odi.DigestAlgorithm.Algorithm.Id; } } diff --git a/crypto/src/x509/X509Certificate.cs b/crypto/src/x509/X509Certificate.cs index 472ef7308..6d7bd7a61 100644 --- a/crypto/src/x509/X509Certificate.cs +++ b/crypto/src/x509/X509Certificate.cs @@ -246,7 +246,7 @@ namespace Org.BouncyCastle.X509 /// <returns>A sting representing the signature algorithm.</returns> public virtual string SigAlgName { - get { return SignerUtilities.GetEncodingName(c.SignatureAlgorithm.ObjectID); } + get { return SignerUtilities.GetEncodingName(c.SignatureAlgorithm.Algorithm); } } /// <summary> @@ -255,7 +255,7 @@ namespace Org.BouncyCastle.X509 /// <returns>A string containg a '.' separated object id.</returns> public virtual string SigAlgOid { - get { return c.SignatureAlgorithm.ObjectID.Id; } + get { return c.SignatureAlgorithm.Algorithm.Id; } } /// <summary> @@ -586,7 +586,7 @@ namespace Org.BouncyCastle.X509 private static bool IsAlgIDEqual(AlgorithmIdentifier id1, AlgorithmIdentifier id2) { - if (!id1.ObjectID.Equals(id2.ObjectID)) + if (!id1.Algorithm.Equals(id2.Algorithm)) return false; Asn1Encodable p1 = id1.Parameters; diff --git a/crypto/src/x509/X509Crl.cs b/crypto/src/x509/X509Crl.cs index ee564dacb..ecfb14132 100644 --- a/crypto/src/x509/X509Crl.cs +++ b/crypto/src/x509/X509Crl.cs @@ -221,7 +221,7 @@ namespace Org.BouncyCastle.X509 public virtual string SigAlgOid { - get { return c.SignatureAlgorithm.ObjectID.Id; } + get { return c.SignatureAlgorithm.Algorithm.Id; } } public virtual byte[] GetSigAlgParams() diff --git a/crypto/src/x509/X509SignatureUtil.cs b/crypto/src/x509/X509SignatureUtil.cs index 7a4ab1448..858b8f446 100644 --- a/crypto/src/x509/X509SignatureUtil.cs +++ b/crypto/src/x509/X509SignatureUtil.cs @@ -55,13 +55,13 @@ namespace Org.BouncyCastle.X509 if (parameters != null && !derNull.Equals(parameters)) { - if (sigAlgId.ObjectID.Equals(PkcsObjectIdentifiers.IdRsassaPss)) + if (sigAlgId.Algorithm.Equals(PkcsObjectIdentifiers.IdRsassaPss)) { RsassaPssParameters rsaParams = RsassaPssParameters.GetInstance(parameters); - return GetDigestAlgName(rsaParams.HashAlgorithm.ObjectID) + "withRSAandMGF1"; + return GetDigestAlgName(rsaParams.HashAlgorithm.Algorithm) + "withRSAandMGF1"; } - if (sigAlgId.ObjectID.Equals(X9ObjectIdentifiers.ECDsaWithSha2)) + if (sigAlgId.Algorithm.Equals(X9ObjectIdentifiers.ECDsaWithSha2)) { Asn1Sequence ecDsaParams = Asn1Sequence.GetInstance(parameters); @@ -69,7 +69,7 @@ namespace Org.BouncyCastle.X509 } } - return sigAlgId.ObjectID.Id; + return sigAlgId.Algorithm.Id; } /** |