diff --git a/crypto/src/asn1/pkcs/PBKDF2Params.cs b/crypto/src/asn1/pkcs/PBKDF2Params.cs
index f629848d8..5d1e9854f 100644
--- a/crypto/src/asn1/pkcs/PBKDF2Params.cs
+++ b/crypto/src/asn1/pkcs/PBKDF2Params.cs
@@ -4,60 +4,70 @@ using Org.BouncyCastle.Math;
namespace Org.BouncyCastle.Asn1.Pkcs
{
- public class Pbkdf2Params
- : Asn1Encodable
- {
+ public class Pbkdf2Params
+ : Asn1Encodable
+ {
private static AlgorithmIdentifier algid_hmacWithSHA1 = new AlgorithmIdentifier(PkcsObjectIdentifiers.IdHmacWithSha1, DerNull.Instance);
- private readonly Asn1OctetString octStr;
- private readonly DerInteger iterationCount;
- private readonly DerInteger keyLength;
+
+ private readonly Asn1OctetString octStr;
+ private readonly DerInteger iterationCount, keyLength;
private readonly AlgorithmIdentifier prf;
- public static Pbkdf2Params GetInstance(
- object obj)
- {
- if (obj == null || obj is Pbkdf2Params)
- return (Pbkdf2Params)obj;
+ public static Pbkdf2Params GetInstance(
+ object obj)
+ {
+ if (obj == null || obj is Pbkdf2Params)
+ return (Pbkdf2Params)obj;
- if (obj is Asn1Sequence)
- return new Pbkdf2Params((Asn1Sequence)obj);
+ if (obj is Asn1Sequence)
+ return new Pbkdf2Params((Asn1Sequence)obj);
- throw new ArgumentException("Unknown object in factory: " + obj.GetType().FullName, "obj");
- }
+ throw new ArgumentException("Unknown object in factory: " + obj.GetType().FullName, "obj");
+ }
- public Pbkdf2Params(
- Asn1Sequence seq)
- {
+ public Pbkdf2Params(
+ Asn1Sequence seq)
+ {
if (seq.Count < 2 || seq.Count > 4)
- throw new ArgumentException("Wrong number of elements in sequence", "seq");
+ throw new ArgumentException("Wrong number of elements in sequence", "seq");
- octStr = (Asn1OctetString)seq[0];
- iterationCount = (DerInteger)seq[1];
+ this.octStr = (Asn1OctetString)seq[0];
+ this.iterationCount = (DerInteger)seq[1];
Asn1Encodable kl = null, d = null;
- if (seq.Count > 3)
- {
+ if (seq.Count > 3)
+ {
kl = seq[2];
d = seq[3];
}
else if (seq.Count > 2)
{
if (seq[2] is DerInteger)
+ {
kl = seq[2];
- else
+ }
+ else
+ {
d = seq[2];
+ }
+ }
+ if (kl != null)
+ {
+ keyLength = (DerInteger)kl;
+ }
+ if (d != null)
+ {
+ prf = AlgorithmIdentifier.GetInstance(d);
}
- if (kl != null) keyLength = (DerInteger)kl;
- if (d != null) prf = AlgorithmIdentifier.GetInstance(d);
- }
-
- public Pbkdf2Params(
- byte[] salt,
- int iterationCount)
- {
- this.octStr = new DerOctetString(salt);
- this.iterationCount = new DerInteger(iterationCount);
- }
+ }
+
+ public Pbkdf2Params(
+ byte[] salt,
+ int iterationCount)
+ {
+ this.octStr = new DerOctetString(salt);
+ this.iterationCount = new DerInteger(iterationCount);
+ }
public Pbkdf2Params(
byte[] salt,
@@ -68,15 +78,15 @@ namespace Org.BouncyCastle.Asn1.Pkcs
this.keyLength = new DerInteger(keyLength);
}
- public Pbkdf2Params(
- byte[] salt,
- int iterationCount,
+ public Pbkdf2Params(
+ byte[] salt,
+ int iterationCount,
int keyLength,
AlgorithmIdentifier prf)
: this(salt, iterationCount, keyLength)
{
this.prf = prf;
- }
+ }
public Pbkdf2Params(
byte[] salt,
@@ -92,24 +102,24 @@ namespace Org.BouncyCastle.Asn1.Pkcs
return octStr.GetOctets();
}
- public BigInteger IterationCount
- {
- get { return iterationCount.Value; }
- }
+ public BigInteger IterationCount
+ {
+ get { return iterationCount.Value; }
+ }
- public BigInteger KeyLength
- {
- get { return keyLength == null ? null : keyLength.Value; }
- }
+ public BigInteger KeyLength
+ {
+ get { return keyLength == null ? null : keyLength.Value; }
+ }
- public bool IsDefaultPrf()
+ public bool IsDefaultPrf
{
- return prf == null || prf.Equals(algid_hmacWithSHA1);
- }
+ get { return prf == null || prf.Equals(algid_hmacWithSHA1); }
+ }
public AlgorithmIdentifier Prf
{
- get { return prf ?? algid_hmacWithSHA1; }
+ get { return prf != null ? prf : algid_hmacWithSHA1; }
}
public override Asn1Object ToAsn1Object()
@@ -117,16 +127,16 @@ namespace Org.BouncyCastle.Asn1.Pkcs
Asn1EncodableVector v = new Asn1EncodableVector(
octStr, iterationCount);
- if (keyLength != null)
- {
- v.Add(keyLength);
- }
- if (!IsDefaultPrf())
+ if (keyLength != null)
+ {
+ v.Add(keyLength);
+ }
+ if (!IsDefaultPrf)
{
v.Add(prf);
}
- return new DerSequence(v);
- }
- }
+ return new DerSequence(v);
+ }
+ }
}
|
