diff options
| author | Oren Novotny <oren@novotny.org> | 2019-04-14 19:28:41 -0400 |
|---|---|---|
| committer | Oren Novotny <oren@novotny.org> | 2019-04-14 19:28:41 -0400 |
| commit | 70425a6f13b8fd669b6087710f63572c841bc68d (patch) | |
| tree | c6fb38c18a65dfd6d332a9c224f802f30c10d8db | |
| parent | Merge branch 'master' into netstandard (diff) | |
| parent | Merge branch 'kakkerlakgly-patch-3' (diff) | |
| download | BouncyCastle.NET-ed25519-70425a6f13b8fd669b6087710f63572c841bc68d.tar.xz | |
Merge branch 'master' into netstandard
| -rw-r--r-- | crypto/src/cms/CMSSignedHelper.cs | 2 | ||||
| -rw-r--r-- | crypto/src/pkix/PkixBuilderParameters.cs | 2 | ||||
| -rw-r--r-- | crypto/src/pkix/PkixCertPath.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/src/cms/CMSSignedHelper.cs b/crypto/src/cms/CMSSignedHelper.cs index 3fb3cee26..6d49a5513 100644 --- a/crypto/src/cms/CMSSignedHelper.cs +++ b/crypto/src/cms/CMSSignedHelper.cs @@ -84,7 +84,7 @@ namespace Org.BouncyCastle.Cms encryptionAlgs.Add(X9ObjectIdentifiers.IdDsa.Id, "DSA"); encryptionAlgs.Add(PkcsObjectIdentifiers.RsaEncryption.Id, "RSA"); - encryptionAlgs.Add(TeleTrusTObjectIdentifiers.TeleTrusTRsaSignatureAlgorithm, "RSA"); + encryptionAlgs.Add(TeleTrusTObjectIdentifiers.TeleTrusTRsaSignatureAlgorithm.Id, "RSA"); encryptionAlgs.Add(X509ObjectIdentifiers.IdEARsa.Id, "RSA"); encryptionAlgs.Add(CmsSignedGenerator.EncryptionRsaPss, "RSAandMGF1"); encryptionAlgs.Add(CryptoProObjectIdentifiers.GostR3410x94.Id, "GOST3410"); diff --git a/crypto/src/pkix/PkixBuilderParameters.cs b/crypto/src/pkix/PkixBuilderParameters.cs index 32fc04360..9b8fb3dc3 100644 --- a/crypto/src/pkix/PkixBuilderParameters.cs +++ b/crypto/src/pkix/PkixBuilderParameters.cs @@ -84,7 +84,7 @@ namespace Org.BouncyCastle.Pkix { if (excludedCerts == null) { - excludedCerts = new HashSet(); + this.excludedCerts = new HashSet(); } else { diff --git a/crypto/src/pkix/PkixCertPath.cs b/crypto/src/pkix/PkixCertPath.cs index 3c428f6fb..459c1612f 100644 --- a/crypto/src/pkix/PkixCertPath.cs +++ b/crypto/src/pkix/PkixCertPath.cs @@ -306,7 +306,7 @@ namespace Org.BouncyCastle.Pkix return false; IEnumerator e1 = thisCerts.GetEnumerator(); - IEnumerator e2 = thisCerts.GetEnumerator(); + IEnumerator e2 = otherCerts.GetEnumerator(); while (e1.MoveNext()) { |