diff --git a/crypto/src/asn1/DerGeneralizedTime.cs b/crypto/src/asn1/DerGeneralizedTime.cs
index 6700b9016..152596678 100644
--- a/crypto/src/asn1/DerGeneralizedTime.cs
+++ b/crypto/src/asn1/DerGeneralizedTime.cs
@@ -267,7 +267,7 @@ namespace Org.BouncyCastle.Asn1
{
try
{
- style = (DateTimeStyles)Enum.Parse(typeof(DateTimeStyles), "AssumeUniversal");
+ style = (DateTimeStyles)Enums.GetEnumValue(typeof(DateTimeStyles), "AssumeUniversal");
}
catch (Exception)
{
diff --git a/crypto/src/asn1/cmp/CertResponse.cs b/crypto/src/asn1/cmp/CertResponse.cs
index 246b8ce70..80813b8b7 100644
--- a/crypto/src/asn1/cmp/CertResponse.cs
+++ b/crypto/src/asn1/cmp/CertResponse.cs
@@ -107,8 +107,7 @@ namespace Org.BouncyCastle.Asn1.Cmp
public override Asn1Object ToAsn1Object()
{
Asn1EncodableVector v = new Asn1EncodableVector(certReqId, status);
- v.AddOptional(certifiedKeyPair);
- v.AddOptional(rspInfo);
+ v.AddOptional(certifiedKeyPair, rspInfo);
return new DerSequence(v);
}
}
diff --git a/crypto/src/asn1/cmp/ErrorMsgContent.cs b/crypto/src/asn1/cmp/ErrorMsgContent.cs
index f4dc584ea..2d6353b65 100644
--- a/crypto/src/asn1/cmp/ErrorMsgContent.cs
+++ b/crypto/src/asn1/cmp/ErrorMsgContent.cs
@@ -86,8 +86,7 @@ namespace Org.BouncyCastle.Asn1.Cmp
public override Asn1Object ToAsn1Object()
{
Asn1EncodableVector v = new Asn1EncodableVector(pkiStatusInfo);
- v.AddOptional(errorCode);
- v.AddOptional(errorDetails);
+ v.AddOptional(errorCode, errorDetails);
return new DerSequence(v);
}
}
diff --git a/crypto/src/asn1/crmf/CertReqMsg.cs b/crypto/src/asn1/crmf/CertReqMsg.cs
index 2ca319a57..20fd4179a 100644
--- a/crypto/src/asn1/crmf/CertReqMsg.cs
+++ b/crypto/src/asn1/crmf/CertReqMsg.cs
@@ -98,8 +98,7 @@ namespace Org.BouncyCastle.Asn1.Crmf
public override Asn1Object ToAsn1Object()
{
Asn1EncodableVector v = new Asn1EncodableVector(certReq);
- v.AddOptional(popo);
- v.AddOptional(regInfo);
+ v.AddOptional(popo, regInfo);
return new DerSequence(v);
}
}
diff --git a/crypto/src/asn1/util/FilterStream.cs b/crypto/src/asn1/util/FilterStream.cs
index 79aa883d0..0c38c5b6e 100644
--- a/crypto/src/asn1/util/FilterStream.cs
+++ b/crypto/src/asn1/util/FilterStream.cs
@@ -47,6 +47,7 @@ namespace Org.BouncyCastle.Asn1.Utilities
public override void Close()
{
Platform.Dispose(s);
+ base.Close();
}
#endif
public override void Flush()
diff --git a/crypto/src/asn1/x509/AlgorithmIdentifier.cs b/crypto/src/asn1/x509/AlgorithmIdentifier.cs
index c6f4af5bf..00e7ad8bc 100644
--- a/crypto/src/asn1/x509/AlgorithmIdentifier.cs
+++ b/crypto/src/asn1/x509/AlgorithmIdentifier.cs
@@ -5,9 +5,8 @@ namespace Org.BouncyCastle.Asn1.X509
public class AlgorithmIdentifier
: Asn1Encodable
{
- private readonly DerObjectIdentifier objectID;
+ private readonly DerObjectIdentifier algorithm;
private readonly Asn1Encodable parameters;
- private readonly bool parametersDefined;
public static AlgorithmIdentifier GetInstance(
Asn1TaggedObject obj,
@@ -19,39 +18,32 @@ namespace Org.BouncyCastle.Asn1.X509
public static AlgorithmIdentifier GetInstance(
object obj)
{
- if (obj == null || obj is AlgorithmIdentifier)
- return (AlgorithmIdentifier) obj;
-
- // TODO: delete
- if (obj is DerObjectIdentifier)
- return new AlgorithmIdentifier((DerObjectIdentifier) obj);
-
- // TODO: delete
- if (obj is string)
- return new AlgorithmIdentifier((string) obj);
-
+ if (obj == null)
+ return null;
+ if (obj is AlgorithmIdentifier)
+ return (AlgorithmIdentifier)obj;
return new AlgorithmIdentifier(Asn1Sequence.GetInstance(obj));
}
public AlgorithmIdentifier(
- DerObjectIdentifier objectID)
+ DerObjectIdentifier algorithm)
{
- this.objectID = objectID;
+ this.algorithm = algorithm;
}
+ [Obsolete("Use version taking a DerObjectIdentifier")]
public AlgorithmIdentifier(
- string objectID)
+ string algorithm)
{
- this.objectID = new DerObjectIdentifier(objectID);
+ this.algorithm = new DerObjectIdentifier(algorithm);
}
public AlgorithmIdentifier(
- DerObjectIdentifier objectID,
+ DerObjectIdentifier algorithm,
Asn1Encodable parameters)
{
- this.objectID = objectID;
+ this.algorithm = algorithm;
this.parameters = parameters;
- this.parametersDefined = true;
}
internal AlgorithmIdentifier(
@@ -60,13 +52,8 @@ namespace Org.BouncyCastle.Asn1.X509
if (seq.Count < 1 || seq.Count > 2)
throw new ArgumentException("Bad sequence size: " + seq.Count);
- this.objectID = DerObjectIdentifier.GetInstance(seq[0]);
- this.parametersDefined = (seq.Count == 2);
-
- if (parametersDefined)
- {
- this.parameters = seq[1];
- }
+ this.algorithm = DerObjectIdentifier.GetInstance(seq[0]);
+ this.parameters = seq.Count < 2 ? null : seq[1];
}
/// <summary>
@@ -74,18 +61,19 @@ namespace Org.BouncyCastle.Asn1.X509
/// </summary>
public virtual DerObjectIdentifier Algorithm
{
- get { return objectID; }
+ get { return algorithm; }
}
+ [Obsolete("Use 'Algorithm' property instead")]
public virtual DerObjectIdentifier ObjectID
{
- get { return objectID; }
+ get { return algorithm; }
}
/// <summary>
/// Return the parameters structure in the Parameters entry of this identifier.
/// </summary>
- public Asn1Encodable Parameters
+ public virtual Asn1Encodable Parameters
{
get { return parameters; }
}
@@ -100,20 +88,8 @@ namespace Org.BouncyCastle.Asn1.X509
*/
public override Asn1Object ToAsn1Object()
{
- Asn1EncodableVector v = new Asn1EncodableVector(objectID);
-
- if (parametersDefined)
- {
- if (parameters != null)
- {
- v.Add(parameters);
- }
- else
- {
- v.Add(DerNull.Instance);
- }
- }
-
+ Asn1EncodableVector v = new Asn1EncodableVector(algorithm);
+ v.AddOptional(parameters);
return new DerSequence(v);
}
}
|
