diff --git a/crypto/src/asn1/cms/Attribute.cs b/crypto/src/asn1/cms/Attribute.cs
index c4a104a3f..69ac44148 100644
--- a/crypto/src/asn1/cms/Attribute.cs
+++ b/crypto/src/asn1/cms/Attribute.cs
@@ -1,6 +1,6 @@
using System;
-using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -25,7 +25,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new Attribute((Asn1Sequence) obj);
- throw new ArgumentException("unknown object in factory: " + obj.GetType().Name, "obj");
+ throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(obj), "obj");
}
public Attribute(
diff --git a/crypto/src/asn1/cms/AuthEnvelopedData.cs b/crypto/src/asn1/cms/AuthEnvelopedData.cs
index 4260d80f9..c30ec6bbd 100644
--- a/crypto/src/asn1/cms/AuthEnvelopedData.cs
+++ b/crypto/src/asn1/cms/AuthEnvelopedData.cs
@@ -1,5 +1,7 @@
using System;
+using Org.BouncyCastle.Utilities;
+
namespace Org.BouncyCastle.Asn1.Cms
{
public class AuthEnvelopedData
@@ -119,7 +121,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new AuthEnvelopedData((Asn1Sequence)obj);
- throw new ArgumentException("Invalid AuthEnvelopedData: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid AuthEnvelopedData: " + Platform.GetTypeName(obj));
}
public DerInteger Version
diff --git a/crypto/src/asn1/cms/AuthenticatedData.cs b/crypto/src/asn1/cms/AuthenticatedData.cs
index 15286d1aa..6f13a6f30 100644
--- a/crypto/src/asn1/cms/AuthenticatedData.cs
+++ b/crypto/src/asn1/cms/AuthenticatedData.cs
@@ -1,6 +1,7 @@
using System;
using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -123,7 +124,7 @@ namespace Org.BouncyCastle.Asn1.Cms
return new AuthenticatedData((Asn1Sequence)obj);
}
- throw new ArgumentException("Invalid AuthenticatedData: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid AuthenticatedData: " + Platform.GetTypeName(obj));
}
public DerInteger Version
diff --git a/crypto/src/asn1/cms/CompressedData.cs b/crypto/src/asn1/cms/CompressedData.cs
index 5a2869b8c..154ed35c0 100644
--- a/crypto/src/asn1/cms/CompressedData.cs
+++ b/crypto/src/asn1/cms/CompressedData.cs
@@ -1,7 +1,7 @@
using System;
-using Org.BouncyCastle.Asn1;
using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -70,7 +70,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new CompressedData((Asn1Sequence) obj);
- throw new ArgumentException("Invalid CompressedData: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid CompressedData: " + Platform.GetTypeName(obj));
}
public DerInteger Version
diff --git a/crypto/src/asn1/cms/ContentInfo.cs b/crypto/src/asn1/cms/ContentInfo.cs
index 278ceca46..f130a4bc7 100644
--- a/crypto/src/asn1/cms/ContentInfo.cs
+++ b/crypto/src/asn1/cms/ContentInfo.cs
@@ -1,7 +1,7 @@
using System;
using System.Collections;
-using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -20,7 +20,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new ContentInfo((Asn1Sequence) obj);
- throw new ArgumentException("unknown object in factory: " + obj.GetType().Name);
+ throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(obj));
}
public static ContentInfo GetInstance(Asn1TaggedObject obj, bool isExplicit)
diff --git a/crypto/src/asn1/cms/EncryptedContentInfo.cs b/crypto/src/asn1/cms/EncryptedContentInfo.cs
index 4fdc47138..999f2a01e 100644
--- a/crypto/src/asn1/cms/EncryptedContentInfo.cs
+++ b/crypto/src/asn1/cms/EncryptedContentInfo.cs
@@ -1,7 +1,7 @@
using System;
-using Org.BouncyCastle.Asn1;
using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -50,7 +50,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new EncryptedContentInfo((Asn1Sequence)obj);
- throw new ArgumentException("Invalid EncryptedContentInfo: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid EncryptedContentInfo: " + Platform.GetTypeName(obj));
}
public DerObjectIdentifier ContentType
diff --git a/crypto/src/asn1/cms/EncryptedData.cs b/crypto/src/asn1/cms/EncryptedData.cs
index cb109a640..b8492d14b 100644
--- a/crypto/src/asn1/cms/EncryptedData.cs
+++ b/crypto/src/asn1/cms/EncryptedData.cs
@@ -1,5 +1,7 @@
using System;
+using Org.BouncyCastle.Utilities;
+
namespace Org.BouncyCastle.Asn1.Cms
{
public class EncryptedData
@@ -18,7 +20,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new EncryptedData((Asn1Sequence) obj);
- throw new ArgumentException("Invalid EncryptedData: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid EncryptedData: " + Platform.GetTypeName(obj));
}
public EncryptedData(
diff --git a/crypto/src/asn1/cms/Evidence.cs b/crypto/src/asn1/cms/Evidence.cs
index 4745e565b..8374aed55 100644
--- a/crypto/src/asn1/cms/Evidence.cs
+++ b/crypto/src/asn1/cms/Evidence.cs
@@ -1,5 +1,7 @@
using System;
+using Org.BouncyCastle.Utilities;
+
namespace Org.BouncyCastle.Asn1.Cms
{
public class Evidence
@@ -28,7 +30,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1TaggedObject)
return new Evidence(Asn1TaggedObject.GetInstance(obj));
- throw new ArgumentException("Unknown object in GetInstance: " + obj.GetType().FullName, "obj");
+ throw new ArgumentException("Unknown object in GetInstance: " + Platform.GetTypeName(obj), "obj");
}
public virtual TimeStampTokenEvidence TstEvidence
diff --git a/crypto/src/asn1/cms/KEKIdentifier.cs b/crypto/src/asn1/cms/KEKIdentifier.cs
index e5d1d9090..a42217440 100644
--- a/crypto/src/asn1/cms/KEKIdentifier.cs
+++ b/crypto/src/asn1/cms/KEKIdentifier.cs
@@ -1,6 +1,6 @@
using System;
-using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -80,7 +80,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new KekIdentifier((Asn1Sequence)obj);
- throw new ArgumentException("Invalid KekIdentifier: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid KekIdentifier: " + Platform.GetTypeName(obj));
}
public Asn1OctetString KeyIdentifier
diff --git a/crypto/src/asn1/cms/KEKRecipientInfo.cs b/crypto/src/asn1/cms/KEKRecipientInfo.cs
index d847b50cc..810e7fc97 100644
--- a/crypto/src/asn1/cms/KEKRecipientInfo.cs
+++ b/crypto/src/asn1/cms/KEKRecipientInfo.cs
@@ -1,7 +1,7 @@
using System;
-using Org.BouncyCastle.Asn1;
using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -64,7 +64,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if(obj is Asn1Sequence)
return new KekRecipientInfo((Asn1Sequence)obj);
- throw new ArgumentException("Invalid KekRecipientInfo: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid KekRecipientInfo: " + Platform.GetTypeName(obj));
}
public DerInteger Version
diff --git a/crypto/src/asn1/cms/KeyAgreeRecipientIdentifier.cs b/crypto/src/asn1/cms/KeyAgreeRecipientIdentifier.cs
index fa6fdb0f3..0256c2dc2 100644
--- a/crypto/src/asn1/cms/KeyAgreeRecipientIdentifier.cs
+++ b/crypto/src/asn1/cms/KeyAgreeRecipientIdentifier.cs
@@ -1,5 +1,7 @@
using System;
+using Org.BouncyCastle.Utilities;
+
namespace Org.BouncyCastle.Asn1.Cms
{
public class KeyAgreeRecipientIdentifier
@@ -42,7 +44,7 @@ namespace Org.BouncyCastle.Asn1.Cms
(Asn1TaggedObject)obj, false));
}
- throw new ArgumentException("Invalid KeyAgreeRecipientIdentifier: " + obj.GetType().FullName, "obj");
+ throw new ArgumentException("Invalid KeyAgreeRecipientIdentifier: " + Platform.GetTypeName(obj), "obj");
}
private readonly IssuerAndSerialNumber issuerSerial;
diff --git a/crypto/src/asn1/cms/KeyAgreeRecipientInfo.cs b/crypto/src/asn1/cms/KeyAgreeRecipientInfo.cs
index aafb008d4..62a38925b 100644
--- a/crypto/src/asn1/cms/KeyAgreeRecipientInfo.cs
+++ b/crypto/src/asn1/cms/KeyAgreeRecipientInfo.cs
@@ -1,7 +1,7 @@
using System;
-using Org.BouncyCastle.Asn1;
using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -80,7 +80,7 @@ namespace Org.BouncyCastle.Asn1.Cms
return new KeyAgreeRecipientInfo((Asn1Sequence)obj);
throw new ArgumentException(
- "Illegal object in KeyAgreeRecipientInfo: " + obj.GetType().Name);
+ "Illegal object in KeyAgreeRecipientInfo: " + Platform.GetTypeName(obj));
}
diff --git a/crypto/src/asn1/cms/KeyTransRecipientInfo.cs b/crypto/src/asn1/cms/KeyTransRecipientInfo.cs
index aae18c59d..5e4fd22b4 100644
--- a/crypto/src/asn1/cms/KeyTransRecipientInfo.cs
+++ b/crypto/src/asn1/cms/KeyTransRecipientInfo.cs
@@ -1,7 +1,7 @@
using System;
-using Org.BouncyCastle.Asn1;
using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -57,7 +57,7 @@ namespace Org.BouncyCastle.Asn1.Cms
return new KeyTransRecipientInfo((Asn1Sequence) obj);
throw new ArgumentException(
- "Illegal object in KeyTransRecipientInfo: " + obj.GetType().Name);
+ "Illegal object in KeyTransRecipientInfo: " + Platform.GetTypeName(obj));
}
public DerInteger Version
diff --git a/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs b/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs
index d33a11725..f197fe965 100644
--- a/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs
+++ b/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs
@@ -1,7 +1,7 @@
using System;
-using Org.BouncyCastle.Asn1;
using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -95,7 +95,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (o is Asn1TaggedObject)
return new OriginatorIdentifierOrKey((Asn1TaggedObject)o);
- throw new ArgumentException("Invalid OriginatorIdentifierOrKey: " + o.GetType().Name);
+ throw new ArgumentException("Invalid OriginatorIdentifierOrKey: " + Platform.GetTypeName(o));
}
public Asn1Encodable ID
diff --git a/crypto/src/asn1/cms/OriginatorInfo.cs b/crypto/src/asn1/cms/OriginatorInfo.cs
index b4549bc36..33b049efa 100644
--- a/crypto/src/asn1/cms/OriginatorInfo.cs
+++ b/crypto/src/asn1/cms/OriginatorInfo.cs
@@ -1,6 +1,6 @@
using System;
-using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -79,7 +79,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new OriginatorInfo((Asn1Sequence)obj);
- throw new ArgumentException("Invalid OriginatorInfo: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid OriginatorInfo: " + Platform.GetTypeName(obj));
}
public Asn1Set Certificates
diff --git a/crypto/src/asn1/cms/OriginatorPublicKey.cs b/crypto/src/asn1/cms/OriginatorPublicKey.cs
index aabaf4386..9f29c6242 100644
--- a/crypto/src/asn1/cms/OriginatorPublicKey.cs
+++ b/crypto/src/asn1/cms/OriginatorPublicKey.cs
@@ -1,29 +1,30 @@
using System;
-using Org.BouncyCastle.Asn1;
using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
public class OriginatorPublicKey
: Asn1Encodable
{
- private AlgorithmIdentifier algorithm;
- private DerBitString publicKey;
+ private readonly AlgorithmIdentifier mAlgorithm;
+ private readonly DerBitString mPublicKey;
- public OriginatorPublicKey(
+ public OriginatorPublicKey(
AlgorithmIdentifier algorithm,
byte[] publicKey)
{
- this.algorithm = algorithm;
- this.publicKey = new DerBitString(publicKey);
+ this.mAlgorithm = algorithm;
+ this.mPublicKey = new DerBitString(publicKey);
}
+ [Obsolete("Use 'GetInstance' instead")]
public OriginatorPublicKey(
Asn1Sequence seq)
{
- algorithm = AlgorithmIdentifier.GetInstance(seq[0]);
- publicKey = (DerBitString) seq[1];
+ this.mAlgorithm = AlgorithmIdentifier.GetInstance(seq[0]);
+ this.mPublicKey = DerBitString.GetInstance(seq[1]);
}
/**
@@ -55,19 +56,19 @@ namespace Org.BouncyCastle.Asn1.Cms
return (OriginatorPublicKey)obj;
if (obj is Asn1Sequence)
- return new OriginatorPublicKey((Asn1Sequence) obj);
+ return new OriginatorPublicKey(Asn1Sequence.GetInstance(obj));
- throw new ArgumentException("Invalid OriginatorPublicKey: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid OriginatorPublicKey: " + Platform.GetTypeName(obj));
}
public AlgorithmIdentifier Algorithm
{
- get { return algorithm; }
+ get { return mAlgorithm; }
}
public DerBitString PublicKey
{
- get { return publicKey; }
+ get { return mPublicKey; }
}
/**
@@ -81,7 +82,7 @@ namespace Org.BouncyCastle.Asn1.Cms
*/
public override Asn1Object ToAsn1Object()
{
- return new DerSequence(algorithm, publicKey);
+ return new DerSequence(mAlgorithm, mPublicKey);
}
}
}
diff --git a/crypto/src/asn1/cms/OtherKeyAttribute.cs b/crypto/src/asn1/cms/OtherKeyAttribute.cs
index 271059175..285c88154 100644
--- a/crypto/src/asn1/cms/OtherKeyAttribute.cs
+++ b/crypto/src/asn1/cms/OtherKeyAttribute.cs
@@ -1,6 +1,6 @@
using System;
-using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -25,7 +25,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new OtherKeyAttribute((Asn1Sequence) obj);
- throw new ArgumentException("unknown object in factory: " + obj.GetType().Name, "obj");
+ throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(obj), "obj");
}
public OtherKeyAttribute(
diff --git a/crypto/src/asn1/cms/PasswordRecipientInfo.cs b/crypto/src/asn1/cms/PasswordRecipientInfo.cs
index 800b57951..7f275fde7 100644
--- a/crypto/src/asn1/cms/PasswordRecipientInfo.cs
+++ b/crypto/src/asn1/cms/PasswordRecipientInfo.cs
@@ -1,7 +1,7 @@
using System;
-using Org.BouncyCastle.Asn1;
using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -82,7 +82,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new PasswordRecipientInfo((Asn1Sequence) obj);
- throw new ArgumentException("Invalid PasswordRecipientInfo: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid PasswordRecipientInfo: " + Platform.GetTypeName(obj));
}
public DerInteger Version
diff --git a/crypto/src/asn1/cms/RecipientEncryptedKey.cs b/crypto/src/asn1/cms/RecipientEncryptedKey.cs
index 5ba25a742..1afba4ab1 100644
--- a/crypto/src/asn1/cms/RecipientEncryptedKey.cs
+++ b/crypto/src/asn1/cms/RecipientEncryptedKey.cs
@@ -1,5 +1,7 @@
using System;
+using Org.BouncyCastle.Utilities;
+
namespace Org.BouncyCastle.Asn1.Cms
{
public class RecipientEncryptedKey
@@ -50,7 +52,7 @@ namespace Org.BouncyCastle.Asn1.Cms
return new RecipientEncryptedKey((Asn1Sequence) obj);
}
- throw new ArgumentException("Invalid RecipientEncryptedKey: " + obj.GetType().FullName, "obj");
+ throw new ArgumentException("Invalid RecipientEncryptedKey: " + Platform.GetTypeName(obj), "obj");
}
public RecipientEncryptedKey(
diff --git a/crypto/src/asn1/cms/RecipientIdentifier.cs b/crypto/src/asn1/cms/RecipientIdentifier.cs
index 4982bc16a..f29fa8d7c 100644
--- a/crypto/src/asn1/cms/RecipientIdentifier.cs
+++ b/crypto/src/asn1/cms/RecipientIdentifier.cs
@@ -1,6 +1,6 @@
using System;
-using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -49,7 +49,7 @@ namespace Org.BouncyCastle.Asn1.Cms
return new RecipientIdentifier((Asn1Object) o);
throw new ArgumentException(
- "Illegal object in RecipientIdentifier: " + o.GetType().Name);
+ "Illegal object in RecipientIdentifier: " + Platform.GetTypeName(o));
}
public bool IsTagged
diff --git a/crypto/src/asn1/cms/RecipientInfo.cs b/crypto/src/asn1/cms/RecipientInfo.cs
index daaf5a5e4..c03ad907f 100644
--- a/crypto/src/asn1/cms/RecipientInfo.cs
+++ b/crypto/src/asn1/cms/RecipientInfo.cs
@@ -1,6 +1,6 @@
using System;
-using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -57,7 +57,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (o is Asn1TaggedObject)
return new RecipientInfo((Asn1TaggedObject) o);
- throw new ArgumentException("unknown object in factory: " + o.GetType().Name);
+ throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(o));
}
public DerInteger Version
diff --git a/crypto/src/asn1/cms/RecipientKeyIdentifier.cs b/crypto/src/asn1/cms/RecipientKeyIdentifier.cs
index f3e45644b..995ddab51 100644
--- a/crypto/src/asn1/cms/RecipientKeyIdentifier.cs
+++ b/crypto/src/asn1/cms/RecipientKeyIdentifier.cs
@@ -1,6 +1,6 @@
using System;
-using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -97,7 +97,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new RecipientKeyIdentifier((Asn1Sequence) obj);
- throw new ArgumentException("Invalid RecipientKeyIdentifier: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid RecipientKeyIdentifier: " + Platform.GetTypeName(obj));
}
public Asn1OctetString SubjectKeyIdentifier
diff --git a/crypto/src/asn1/cms/SignedData.cs b/crypto/src/asn1/cms/SignedData.cs
index 6cea79a49..957b81cd8 100644
--- a/crypto/src/asn1/cms/SignedData.cs
+++ b/crypto/src/asn1/cms/SignedData.cs
@@ -1,7 +1,7 @@
using System;
using System.Collections;
-using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -34,7 +34,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new SignedData((Asn1Sequence) obj);
- throw new ArgumentException("Unknown object in factory: " + obj.GetType().FullName, "obj");
+ throw new ArgumentException("Unknown object in factory: " + Platform.GetTypeName(obj), "obj");
}
public SignedData(
diff --git a/crypto/src/asn1/cms/SignedDataParser.cs b/crypto/src/asn1/cms/SignedDataParser.cs
index 341309263..cd07f4057 100644
--- a/crypto/src/asn1/cms/SignedDataParser.cs
+++ b/crypto/src/asn1/cms/SignedDataParser.cs
@@ -1,6 +1,8 @@
using System;
using System.IO;
+using Org.BouncyCastle.Utilities;
+
namespace Org.BouncyCastle.Asn1.Cms
{
/**
@@ -32,7 +34,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (o is Asn1SequenceParser)
return new SignedDataParser((Asn1SequenceParser)o);
- throw new IOException("unknown object encountered: " + o.GetType().Name);
+ throw new IOException("unknown object encountered: " + Platform.GetTypeName(o));
}
public SignedDataParser(
diff --git a/crypto/src/asn1/cms/SignerIdentifier.cs b/crypto/src/asn1/cms/SignerIdentifier.cs
index 5742cee75..195ab741f 100644
--- a/crypto/src/asn1/cms/SignerIdentifier.cs
+++ b/crypto/src/asn1/cms/SignerIdentifier.cs
@@ -1,6 +1,6 @@
using System;
-using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -49,7 +49,7 @@ namespace Org.BouncyCastle.Asn1.Cms
return new SignerIdentifier((Asn1Object) o);
throw new ArgumentException(
- "Illegal object in SignerIdentifier: " + o.GetType().Name);
+ "Illegal object in SignerIdentifier: " + Platform.GetTypeName(o));
}
public bool IsTagged
diff --git a/crypto/src/asn1/cms/SignerInfo.cs b/crypto/src/asn1/cms/SignerInfo.cs
index a4e893d96..b6bd319b0 100644
--- a/crypto/src/asn1/cms/SignerInfo.cs
+++ b/crypto/src/asn1/cms/SignerInfo.cs
@@ -1,8 +1,8 @@
using System;
using System.Collections;
-using Org.BouncyCastle.Asn1;
using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Utilities;
namespace Org.BouncyCastle.Asn1.Cms
{
@@ -26,7 +26,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is Asn1Sequence)
return new SignerInfo((Asn1Sequence) obj);
- throw new ArgumentException("Unknown object in factory: " + obj.GetType().FullName, "obj");
+ throw new ArgumentException("Unknown object in factory: " + Platform.GetTypeName(obj), "obj");
}
public SignerInfo(
diff --git a/crypto/src/asn1/cms/Time.cs b/crypto/src/asn1/cms/Time.cs
index e5730245e..52fb4f937 100644
--- a/crypto/src/asn1/cms/Time.cs
+++ b/crypto/src/asn1/cms/Time.cs
@@ -1,6 +1,8 @@
using System;
using System.Globalization;
+using Org.BouncyCastle.Utilities;
+
namespace Org.BouncyCastle.Asn1.Cms
{
public class Time
@@ -58,7 +60,7 @@ namespace Org.BouncyCastle.Asn1.Cms
if (obj is DerGeneralizedTime)
return new Time((DerGeneralizedTime)obj);
- throw new ArgumentException("unknown object in factory: " + obj.GetType().Name, "obj");
+ throw new ArgumentException("unknown object in factory: " + Platform.GetTypeName(obj), "obj");
}
public string TimeString
diff --git a/crypto/src/asn1/cms/ecc/MQVuserKeyingMaterial.cs b/crypto/src/asn1/cms/ecc/MQVuserKeyingMaterial.cs
index 53c5c706b..dc4ac1a4a 100644
--- a/crypto/src/asn1/cms/ecc/MQVuserKeyingMaterial.cs
+++ b/crypto/src/asn1/cms/ecc/MQVuserKeyingMaterial.cs
@@ -1,5 +1,7 @@
using System;
+using Org.BouncyCastle.Utilities;
+
namespace Org.BouncyCastle.Asn1.Cms.Ecc
{
public class MQVuserKeyingMaterial
@@ -67,7 +69,7 @@ namespace Org.BouncyCastle.Asn1.Cms.Ecc
return new MQVuserKeyingMaterial((Asn1Sequence)obj);
}
- throw new ArgumentException("Invalid MQVuserKeyingMaterial: " + obj.GetType().Name);
+ throw new ArgumentException("Invalid MQVuserKeyingMaterial: " + Platform.GetTypeName(obj));
}
public OriginatorPublicKey EphemeralPublicKey
|
