Avoid infinite recursion in RSAEncryptionPadding equality check

shadow-cs · Nov 22, 2019 · 1b44133 · 1b44133
2 parents 241f0c7 + cf096b0
commit 1b44133
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...Security.Cryptography.Algorithms/src/System/Security/Cryptography/RSAEncryptionPadding.cs b/...Security.Cryptography.Algorithms/src/System/Security/Cryptography/RSAEncryptionPadding.cs
@@ -100,7 +100,7 @@ public override bool Equals(object obj)
 
         public bool Equals(RSAEncryptionPadding other)
         {
-            return other != null
+            return !object.ReferenceEquals(other, null)
                 && _mode == other._mode
                 && _oaepHashAlgorithm == other._oaepHashAlgorithm;
         }

diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/RSATests.cs b/src/libraries/System.Security.Cryptography.Algorithms/tests/RSATests.cs
@@ -192,6 +192,12 @@ public void VerifyDataStream_UsesHashDataAndVerifyHash()
             Assert.True(rsa.VerifyData(new MemoryStream(new byte[] { 42 }), new byte[1] { 24 }, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1));
         }
 
+        [Fact]
+        public void RSAEncryptionPadding_Equals()
+        {
+            Assert.Equal(RSAEncryptionPadding.Pkcs1, RSAEncryptionPadding.Pkcs1);
+        }
+
         private sealed class EmptyRSA : RSA
         {
             public override RSAParameters ExportParameters(bool includePrivateParameters) => throw new NotImplementedException();