Portability fixes

peterdettman · peterdettman · commit a3a07f74c2ae · 2021-05-24T20:46:18.000+07:00
diff --git a/crypto/src/cms/CMSSignedHelper.cs b/crypto/src/cms/CMSSignedHelper.cs
@@ -440,7 +440,7 @@ internal string GetEncOid(
 
 		public IX509Store GetCertificates(Asn1Set certificates)
 		{
-			ArrayList certList = new ArrayList();
+            IList certList = Platform.CreateArrayList();
 			if (certificates != null)
             {				
 				foreach (Asn1Encodable enc in certificates)
diff --git a/crypto/src/openpgp/PgpObjectFactory.cs b/crypto/src/openpgp/PgpObjectFactory.cs
@@ -151,7 +151,7 @@ public IList FilterPgpObjects(Type type)
             PgpObject pgpObject;
             while ((pgpObject = NextPgpObject()) != null)
             {
-                if (type.IsAssignableFrom(pgpObject.GetType()))
+                if (type.IsInstanceOfType(pgpObject.GetType()))
                 {
                     result.Add(pgpObject);
                 }

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ internal string GetEncOid(`
`440`	`440`
`441`	`441`	`public IX509Store GetCertificates(Asn1Set certificates)`
`442`	`442`	`{`
`443`		`- ArrayList certList = new ArrayList();`
	`443`	`+ IList certList = Platform.CreateArrayList();`
`444`	`444`	`if (certificates != null)`
`445`	`445`	`{`
`446`	`446`	`foreach (Asn1Encodable enc in certificates)`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public IList FilterPgpObjects(Type type)`
`151`	`151`	`PgpObject pgpObject;`
`152`	`152`	`while ((pgpObject = NextPgpObject()) != null)`
`153`	`153`	`{`
`154`		`- if (type.IsAssignableFrom(pgpObject.GetType()))`
	`154`	`+ if (type.IsInstanceOfType(pgpObject.GetType()))`
`155`	`155`	`{`
`156`	`156`	`result.Add(pgpObject);`
`157`	`157`	`}`