Differences From Artifact [0dfe0413cd]:
- File src/OFASN1NumericString.m — part of check-in [a4e479b8de] at 2018-10-14 05:09:23 on branch trunk — Add ASN.1 NumericString and PrintableString types (user: js, size: 2186) [annotate] [blame] [check-ins using]
To Artifact [e15f600266]:
- File
src/OFASN1NumericString.m
— part of check-in
[b1944fd052]
at
2018-10-27 13:01:38
on branch trunk
— Do not subclass OFASN1Value
The reason for this is that OFASN1Value requires an initializer for DER
encoding, however, it might be beneficial to create an ASN.1 type
without providing DER encoding for it. (user: js, size: 2530) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 | #import "OFString.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" @implementation OFASN1NumericString @synthesize numericStringValue = _numericStringValue; - (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass tagNumber: (of_asn1_tag_number_t)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { | > > > > > | < < < | | | | | > > > | | > > > > > > > > > > > > > > > > > > > > | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | #import "OFString.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" @implementation OFASN1NumericString @synthesize numericStringValue = _numericStringValue; - (instancetype)init { OF_INVALID_INIT_METHOD } - (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass tagNumber: (of_asn1_tag_number_t)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { self = [super init]; @try { const unsigned char *items = [DEREncodedContents items]; size_t count = [DEREncodedContents count]; if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL || tagNumber != OF_ASN1_TAG_NUMBER_NUMERIC_STRING || constructed) @throw [OFInvalidArgumentException exception]; if ([DEREncodedContents itemSize] != 1) @throw [OFInvalidArgumentException exception]; for (size_t i = 0; i < count; i++) if (!of_ascii_isdigit(items[i]) && items[i] != ' ') @throw [OFInvalidEncodingException exception]; _numericStringValue = [[OFString alloc] initWithCString: [DEREncodedContents items] encoding: OF_STRING_ENCODING_ASCII length: [DEREncodedContents count]]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_numericStringValue release]; [super dealloc]; } - (OFString *)stringValue { return [self numericStringValue]; } - (bool)isEqual: (id)object { OFASN1NumericString *numericString; if (![object isKindOfClass: [OFASN1NumericString class]]) return false; numericString = object; if (![numericString->_numericStringValue isEqual: _numericStringValue]) return false; return true; } - (uint32_t)hash { return [_numericStringValue hash]; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1NumericString: %@>", _numericStringValue]; } @end |