diff options
Diffstat (limited to 'crypto/src/asn1/DerNumericString.cs')
| -rw-r--r-- | crypto/src/asn1/DerNumericString.cs | 177 |
1 files changed, 113 insertions, 64 deletions
diff --git a/crypto/src/asn1/DerNumericString.cs b/crypto/src/asn1/DerNumericString.cs index bec0c3a52..693ff7d6e 100644 --- a/crypto/src/asn1/DerNumericString.cs +++ b/crypto/src/asn1/DerNumericString.cs @@ -1,5 +1,5 @@ using System; -using System.Text; +using System.IO; using Org.BouncyCastle.Utilities; @@ -11,66 +11,70 @@ namespace Org.BouncyCastle.Asn1 public class DerNumericString : DerStringBase { - private readonly string str; + internal class Meta : Asn1UniversalType + { + internal static readonly Asn1UniversalType Instance = new Meta(); + + private Meta() : base(typeof(DerNumericString), Asn1Tags.NumericString) {} + + internal override Asn1Object FromImplicitPrimitive(DerOctetString octetString) + { + return CreatePrimitive(octetString.GetOctets()); + } + } /** - * return a Numeric string from the passed in object + * return a numeric string from the passed in object * * @exception ArgumentException if the object cannot be converted. */ - public static DerNumericString GetInstance( - object obj) + public static DerNumericString GetInstance(object obj) { if (obj == null || obj is DerNumericString) { return (DerNumericString)obj; } + else if (obj is IAsn1Convertible) + { + Asn1Object asn1Object = ((IAsn1Convertible)obj).ToAsn1Object(); + if (asn1Object is DerNumericString) + return (DerNumericString)asn1Object; + } + else if (obj is byte[]) + { + try + { + return (DerNumericString)Meta.Instance.FromByteArray((byte[])obj); + } + catch (IOException e) + { + throw new ArgumentException("failed to construct numeric string from byte[]: " + e.Message); + } + } throw new ArgumentException("illegal object in GetInstance: " + Platform.GetTypeName(obj)); } /** - * return an Numeric string from a tagged object. + * return a numeric string from a tagged object. * - * @param obj the tagged object holding the object we want - * @param explicitly true if the object is meant to be explicitly - * tagged false otherwise. - * @exception ArgumentException if the tagged object cannot - * be converted. + * @param taggedObject the tagged object holding the object we want + * @param declaredExplicit true if the object is meant to be explicitly tagged false otherwise. + * @exception ArgumentException if the tagged object cannot be converted. */ - public static DerNumericString GetInstance( - Asn1TaggedObject obj, - bool isExplicit) + public static DerNumericString GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit) { - Asn1Object o = obj.GetObject(); - - if (isExplicit || o is DerNumericString) - { - return GetInstance(o); - } - - return new DerNumericString(Asn1OctetString.GetInstance(o).GetOctets()); + return (DerNumericString)Meta.Instance.GetContextInstance(taggedObject, declaredExplicit); } - /** - * basic constructor - with bytes. - */ - public DerNumericString( - byte[] str) - : this(Strings.FromAsciiByteArray(str), false) - { - } + private readonly byte[] m_contents; - /** - * basic constructor - without validation.. - */ - public DerNumericString( - string str) - : this(str, false) - { - } + public DerNumericString(string str) + : this(str, false) + { + } - /** + /** * Constructor with optional validation. * * @param string the base string to wrap. @@ -78,57 +82,68 @@ namespace Org.BouncyCastle.Asn1 * @throws ArgumentException if validate is true and the string * contains characters that should not be in a NumericString. */ - public DerNumericString( - string str, - bool validate) - { - if (str == null) - throw new ArgumentNullException("str"); - if (validate && !IsNumericString(str)) - throw new ArgumentException("string contains illegal characters", "str"); + public DerNumericString(string str, bool validate) + { + if (str == null) + throw new ArgumentNullException("str"); + if (validate && !IsNumericString(str)) + throw new ArgumentException("string contains illegal characters", "str"); + + m_contents = Strings.ToAsciiByteArray(str); + } - this.str = str; + public DerNumericString(byte[] contents) + : this(contents, true) + { } - public override string GetString() + internal DerNumericString(byte[] contents, bool clone) + { + if (null == contents) + throw new ArgumentNullException("contents"); + + m_contents = clone ? Arrays.Clone(contents) : contents; + } + + public override string GetString() { - return str; + return Strings.FromAsciiByteArray(m_contents); } public byte[] GetOctets() { - return Strings.ToAsciiByteArray(str); + return Arrays.Clone(m_contents); } internal override IAsn1Encoding GetEncoding(int encoding) { - return new PrimitiveEncoding(Asn1Tags.Universal, Asn1Tags.NumericString, GetOctets()); + return new PrimitiveEncoding(Asn1Tags.Universal, Asn1Tags.NumericString, m_contents); } internal override IAsn1Encoding GetEncodingImplicit(int encoding, int tagClass, int tagNo) { - return new PrimitiveEncoding(tagClass, tagNo, GetOctets()); + return new PrimitiveEncoding(tagClass, tagNo, m_contents); } - protected override bool Asn1Equals( - Asn1Object asn1Object) + protected override bool Asn1Equals(Asn1Object asn1Object) { - DerNumericString other = asn1Object as DerNumericString; - - if (other == null) - return false; + DerNumericString that = asn1Object as DerNumericString; + return null != that + && Arrays.AreEqual(this.m_contents, that.m_contents); + } - return this.str.Equals(other.str); + protected override int Asn1GetHashCode() + { + return Arrays.GetHashCode(m_contents); } - /** + /** * Return true if the string can be represented as a NumericString ('0'..'9', ' ') * * @param str string to validate. * @return true if numeric, fale otherwise. */ - public static bool IsNumericString( - string str) + public static bool IsNumericString(string str) { foreach (char ch in str) { @@ -138,5 +153,39 @@ namespace Org.BouncyCastle.Asn1 return true; } - } + + internal static bool IsNumericString(byte[] contents) + { + for (int i = 0; i < contents.Length; ++i) + { + switch (contents[i]) + { + case 0x20: + case 0x30: + case 0x31: + case 0x32: + case 0x33: + case 0x34: + case 0x35: + case 0x36: + case 0x37: + case 0x38: + case 0x39: + break; + default: + return false; + } + } + + return true; + } + + internal static DerNumericString CreatePrimitive(byte[] contents) + { + // TODO Validation - sort out exception types + //if (!IsNumericString(contents)) + + return new DerNumericString(contents, false); + } + } } |