Add new Equals method
4 files changed, 8 insertions, 3 deletions
diff --git a/crypto/src/asn1/Asn1Object.cs b/crypto/src/asn1/Asn1Object.cs
index e6498060d..9945a7fae 100644
--- a/crypto/src/asn1/Asn1Object.cs
+++ b/crypto/src/asn1/Asn1Object.cs
@@ -20,6 +20,11 @@ namespace Org.BouncyCastle.Asn1
asn1Out.FlushInternal();
}
+ public bool Equals(Asn1Object other)
+ {
+ return this == other || Asn1Equals(other);
+ }
+
/// <summary>Create a base ASN.1 object from a byte array.</summary>
/// <param name="data">The byte array to parse.</param>
/// <returns>The base ASN.1 object represented by the byte array.</returns>
diff --git a/crypto/src/asn1/Asn1ObjectDescriptor.cs b/crypto/src/asn1/Asn1ObjectDescriptor.cs
index 4d25da77b..e306d827e 100644
--- a/crypto/src/asn1/Asn1ObjectDescriptor.cs
+++ b/crypto/src/asn1/Asn1ObjectDescriptor.cs
@@ -103,7 +103,7 @@ namespace Org.BouncyCastle.Asn1
{
Asn1ObjectDescriptor that = asn1Object as Asn1ObjectDescriptor;
return null != that
- && this.m_baseGraphicString.CallAsn1Equals(that.m_baseGraphicString);
+ && this.m_baseGraphicString.Equals(that.m_baseGraphicString);
}
internal static Asn1ObjectDescriptor CreatePrimitive(byte[] contents)
diff --git a/crypto/src/asn1/Asn1Sequence.cs b/crypto/src/asn1/Asn1Sequence.cs
index 9ab41ffd3..bd1b46b49 100644
--- a/crypto/src/asn1/Asn1Sequence.cs
+++ b/crypto/src/asn1/Asn1Sequence.cs
@@ -228,7 +228,7 @@ namespace Org.BouncyCastle.Asn1
Asn1Object o1 = this.elements[i].ToAsn1Object();
Asn1Object o2 = that.elements[i].ToAsn1Object();
- if (o1 != o2 && !o1.CallAsn1Equals(o2))
+ if (!o1.Equals(o2))
return false;
}
diff --git a/crypto/src/asn1/Asn1Set.cs b/crypto/src/asn1/Asn1Set.cs
index 6193e8178..45febabaf 100644
--- a/crypto/src/asn1/Asn1Set.cs
+++ b/crypto/src/asn1/Asn1Set.cs
@@ -259,7 +259,7 @@ namespace Org.BouncyCastle.Asn1
Asn1Object o1 = this.elements[i].ToAsn1Object();
Asn1Object o2 = that.elements[i].ToAsn1Object();
- if (o1 != o2 && !o1.CallAsn1Equals(o2))
+ if (!o1.Equals(o2))
return false;
}
|