Overview
Comment: | Remove intermediate OFASN1IntegerOrEnumerated |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
52b963d843558230b2c1c30d405b8237 |
User & Date: | js on 2018-10-16 00:07:21 |
Other Links: | manifest | tags |
Context
2018-10-20
| ||
17:48 | threading_pthread.m: More fault tolerant init check-in: cdd30dfb53 user: js tags: trunk | |
2018-10-16
| ||
00:07 | Remove intermediate OFASN1IntegerOrEnumerated check-in: 52b963d843 user: js tags: trunk | |
2018-10-14
| ||
22:41 | Add ASN.1 Object Identifier type check-in: cfed9215e4 user: js tags: trunk | |
Changes
Modified src/Makefile from [57e9628c1d] to [3928b87dc8].
︙ | ︙ | |||
11 12 13 14 15 16 17 | LIB_MINOR = ${OBJFW_LIB_MINOR} SRCS = OFASN1BitString.m \ OFASN1Boolean.m \ OFASN1Enumerated.m \ OFASN1IA5String.m \ OFASN1Integer.m \ | < | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | LIB_MINOR = ${OBJFW_LIB_MINOR} SRCS = OFASN1BitString.m \ OFASN1Boolean.m \ OFASN1Enumerated.m \ OFASN1IA5String.m \ OFASN1Integer.m \ OFASN1Null.m \ OFASN1NumericString.m \ OFASN1ObjectIdentifier.m \ OFASN1OctetString.m \ OFASN1PrintableString.m \ OFASN1UTF8String.m \ OFASN1Value.m \ |
︙ | ︙ |
Modified src/OFASN1Enumerated.h from [6ee3df3e22] to [cc45518bc1].
︙ | ︙ | |||
11 12 13 14 15 16 17 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | | | > > > > > > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFASN1Value.h" OF_ASSUME_NONNULL_BEGIN /*! * @brief An ASN.1 enumerated. */ @interface OFASN1Enumerated: OFASN1Value { intmax_t _integerValue; } /*! * @brief The integer value. */ @property (readonly, nonatomic) intmax_t integerValue; @end OF_ASSUME_NONNULL_END |
Modified src/OFASN1Enumerated.m from [9a712dbc4e] to [e8fb04db87].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 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 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "OFASN1Enumerated.h" #import "OFInvalidArgumentException.h" @implementation OFASN1Enumerated - (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass tagNumber: (of_asn1_tag_number_t)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { self = [super initWithTagClass: tagClass tagNumber: tagNumber constructed: constructed DEREncodedContents: DEREncodedContents]; @try { if (_tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL || _tagNumber != OF_ASN1_TAG_NUMBER_ENUMERATED || _constructed) @throw [OFInvalidArgumentException exception]; } @catch (id e) { [self release]; @throw e; } return self; } @end | > > > > > > > > > > > > > > > > | 14 15 16 17 18 19 20 21 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 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "OFASN1Enumerated.h" #import "OFData.h" #import "OFString.h" #import "OFInvalidArgumentException.h" extern intmax_t of_asn1_integer_parse(const unsigned char *buffer, size_t length); @implementation OFASN1Enumerated @synthesize integerValue = _integerValue; - (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass tagNumber: (of_asn1_tag_number_t)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { self = [super initWithTagClass: tagClass tagNumber: tagNumber constructed: constructed DEREncodedContents: DEREncodedContents]; @try { if (_tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL || _tagNumber != OF_ASN1_TAG_NUMBER_ENUMERATED || _constructed) @throw [OFInvalidArgumentException exception]; _integerValue = of_asn1_integer_parse( [_DEREncodedContents items], [_DEREncodedContents count]); } @catch (id e) { [self release]; @throw e; } return self; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1Enumerated: %jd>", _integerValue]; } @end |
Modified src/OFASN1Integer.h from [d5e2ddfa45] to [076cb23965].
︙ | ︙ | |||
11 12 13 14 15 16 17 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | | | > > > > > > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFASN1Value.h" OF_ASSUME_NONNULL_BEGIN /*! * @brief An ASN.1 integer. */ @interface OFASN1Integer: OFASN1Value { intmax_t _integerValue; } /*! * @brief The integer value. */ @property (readonly, nonatomic) intmax_t integerValue; @end OF_ASSUME_NONNULL_END |
Modified src/OFASN1Integer.m from [1b01f748ab] to [77da974eb5].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 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 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "OFASN1Integer.h" #import "OFInvalidArgumentException.h" @implementation OFASN1Integer - (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass tagNumber: (of_asn1_tag_number_t)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { self = [super initWithTagClass: tagClass tagNumber: tagNumber constructed: constructed DEREncodedContents: DEREncodedContents]; @try { if (_tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL || _tagNumber != OF_ASN1_TAG_NUMBER_INTEGER || _constructed) @throw [OFInvalidArgumentException exception]; } @catch (id e) { [self release]; @throw e; } return self; } @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 14 15 16 17 18 19 20 21 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 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "OFASN1Integer.h" #import "OFData.h" #import "OFString.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOutOfRangeException.h" intmax_t of_asn1_integer_parse(const unsigned char *buffer, size_t length) { uintmax_t value = 0; /* TODO: Support for big numbers */ if (length > sizeof(uintmax_t) && (length != sizeof(uintmax_t) + 1 || buffer[0] != 0)) @throw [OFOutOfRangeException exception]; if (length >= 2 && ((buffer[0] == 0 && !(buffer[1] & 0x80)) || (buffer[0] == 0xFF && buffer[1] & 0x80))) @throw [OFInvalidFormatException exception]; if (length >= 1 && buffer[0] & 0x80) value = ~(uintmax_t)0; while (length--) value = (value << 8) | *buffer++; return value; } @implementation OFASN1Integer @synthesize integerValue = _integerValue; - (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass tagNumber: (of_asn1_tag_number_t)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { self = [super initWithTagClass: tagClass tagNumber: tagNumber constructed: constructed DEREncodedContents: DEREncodedContents]; @try { if (_tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL || _tagNumber != OF_ASN1_TAG_NUMBER_INTEGER || _constructed) @throw [OFInvalidArgumentException exception]; _integerValue = of_asn1_integer_parse( [_DEREncodedContents items], [_DEREncodedContents count]); } @catch (id e) { [self release]; @throw e; } return self; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1Integer: %jd>", _integerValue]; } @end |
Deleted src/OFASN1IntegerOrEnumerated.h version [f245a30316].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted src/OFASN1IntegerOrEnumerated.m version [178f381321].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |