Changes In Branch asn1 Excluding Merge-Ins
This is equivalent to a diff from 4eea22291b to 1779d5b5a7
2024-02-18
| ||
22:03 | Use __mingw_aligned_* instead of _aligned_* check-in: 7965aac7d5 user: js tags: trunk | |
21:07 | Merge trunk into branch "asn1" Leaf check-in: 1779d5b5a7 user: js tags: asn1 | |
20:34 | A few minor improvements check-in: 4eea22291b user: js tags: trunk | |
20:05 | Migrate all tests to ObjFWTest check-in: fa3cda71d5 user: js tags: trunk | |
2024-02-11
| ||
23:56 | Migrate OFASN1DERRepresentationTests to ObjFWTest check-in: 5bc1402377 user: js tags: asn1 | |
Modified src/Makefile from [cca3d2063b] to [f68b2dbc03].
1 2 3 4 5 6 7 8 9 10 11 12 13 | include ../extra.mk SUBDIRS = ${RUNTIME} exceptions encodings forwarding SUBDIRS_AFTER = ${BRIDGE} ${TLS} test DISTCLEAN = Info.plist objfw-defs.h SHARED_LIB = ${OBJFW_SHARED_LIB} STATIC_LIB = ${OBJFW_STATIC_LIB} FRAMEWORK = ${OBJFW_FRAMEWORK} LIB_MAJOR = ${OBJFW_LIB_MAJOR} LIB_MINOR = ${OBJFW_LIB_MINOR} LIB_PATCH = ${OBJFW_LIB_PATCH} | > > > > > > > > | > | 1 2 3 4 5 6 7 8 9 10 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 37 | include ../extra.mk SUBDIRS = ${RUNTIME} exceptions encodings forwarding SUBDIRS_AFTER = ${BRIDGE} ${TLS} test DISTCLEAN = Info.plist objfw-defs.h SHARED_LIB = ${OBJFW_SHARED_LIB} STATIC_LIB = ${OBJFW_STATIC_LIB} FRAMEWORK = ${OBJFW_FRAMEWORK} LIB_MAJOR = ${OBJFW_LIB_MAJOR} LIB_MINOR = ${OBJFW_LIB_MINOR} LIB_PATCH = ${OBJFW_LIB_PATCH} SRCS = OFASN1BitString.m \ OFASN1Enumerated.m \ OFASN1IA5String.m \ OFASN1NumericString.m \ OFASN1ObjectIdentifier.m \ OFASN1OctetString.m \ OFASN1PrintableString.m \ OFASN1Value.m \ OFApplication.m \ OFArray.m \ OFBlock.m \ OFCharacterSet.m \ OFColor.m \ OFConstantString.m \ OFCountedSet.m \ OFData.m \ OFData+ASN1DERParsing.m \ OFData+CryptographicHashing.m \ OFData+MessagePackParsing.m \ OFDate.m \ OFDictionary.m \ OFEnumerator.m \ OFFileManager.m \ OFGZIPStream.m \ |
︙ | ︙ | |||
170 171 172 173 174 175 176 177 178 179 180 181 182 183 | INCLUDES_ATOMIC = OFAtomic.h \ platform/GCC4/OFAtomic.h \ platform/GCC4.7/OFAtomic.h \ platform/PowerPC/OFAtomic.h \ platform/macOS/OFAtomic.h \ platform/x86/OFAtomic.h INCLUDES := ${SRCS:.m=.h} \ OFArchiveEntry.h \ OFCollection.h \ OFCryptographicHash.h \ OFJSONRepresentation.h \ OFKernelEventObserver.h \ OFKeyValueCoding.h \ OFLocking.h \ | > | 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | INCLUDES_ATOMIC = OFAtomic.h \ platform/GCC4/OFAtomic.h \ platform/GCC4.7/OFAtomic.h \ platform/PowerPC/OFAtomic.h \ platform/macOS/OFAtomic.h \ platform/x86/OFAtomic.h INCLUDES := ${SRCS:.m=.h} \ OFASN1DERRepresentation.h \ OFArchiveEntry.h \ OFCollection.h \ OFCryptographicHash.h \ OFJSONRepresentation.h \ OFKernelEventObserver.h \ OFKeyValueCoding.h \ OFLocking.h \ |
︙ | ︙ |
Added src/OFASN1BitString.h version [c4957e9037].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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 "OFObject.h" #import "OFASN1DERRepresentation.h" #import "OFASN1Value.h" OF_ASSUME_NONNULL_BEGIN @class OFData; /** * @brief An ASN.1 BitString. */ OF_SUBCLASSING_RESTRICTED @interface OFASN1BitString: OFObject <OFASN1DERRepresentation> { OFData *_bitStringValue; size_t _bitStringLength; } /** * @brief The BitString value. */ @property (readonly, nonatomic) OFData *bitStringValue; /** * @brief The length of the BitString in bits. */ @property (readonly, nonatomic) size_t bitStringLength; /** * @brief Creates an ASN.1 BitString with the specified BitString value and * length. * * @param bitString The value of the BitString * @param length The length of the BitString in bits * @return A new, autoreleased OFASN1BitString */ + (instancetype)bitStringWithBitString: (OFData *)bitString length: (size_t)length; - (instancetype)init OF_UNAVAILABLE; /** * @brief Initializes an already allocated ASN.1 BitString with the specified * BitString value and length. * * @param bitString The value of the BitString * @param length The length of the BitString in bits * @return An initialized OFASN1BitString */ - (instancetype)initWithBitString: (OFData *)bitString length: (size_t)length OF_DESIGNATED_INITIALIZER; /** * @brief Initializes an already allocated ASN.1 BitString with the specified * arguments. * * @param tagClass The tag class of the value's type * @param tagNumber The tag number of the value's type * @param constructed Whether the value if of a constructed type * @param DEREncodedContents The DER-encoded contents octets of the value. * @return An initialized OFASN1BitString */ - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents; @end OF_ASSUME_NONNULL_END |
Added src/OFASN1BitString.m version [1107525b69].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "OFASN1BitString.h" #import "OFData.h" #import "OFString.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOutOfRangeException.h" @implementation OFASN1BitString @synthesize bitStringValue = _bitStringValue; @synthesize bitStringLength = _bitStringLength; + (instancetype)bitStringWithBitString: (OFData *)bitString length: (size_t)length { return [[[self alloc] initWithBitString: bitString length: length] autorelease]; } - (instancetype)initWithBitString: (OFData *)bitString length: (size_t)length { self = [super init]; @try { if (bitString.count * bitString.itemSize != OFRoundUpToPowerOf2(8, length) / 8) @throw [OFInvalidFormatException exception]; _bitStringValue = [bitString copy]; _bitStringLength = length; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { void *pool = objc_autoreleasePoolPush(); OFData *bitString; size_t length; @try { unsigned char unusedBits; size_t count = DEREncodedContents.count; if (tagClass != OFASN1TagClassUniversal || tagNumber != OFASN1TagNumberBitString || constructed) @throw [OFInvalidArgumentException exception]; if (DEREncodedContents.itemSize != 1 || count == 0) @throw [OFInvalidFormatException exception]; unusedBits = *(unsigned char *)[DEREncodedContents itemAtIndex: 0]; if (unusedBits > 7) @throw [OFInvalidFormatException exception]; /* * Can't have any bits of the last byte unused if we have no * byte. */ if (count == 1 && unusedBits != 0) @throw [OFInvalidFormatException exception]; if (SIZE_MAX / 8 < count - 1) @throw [OFOutOfRangeException exception]; length = (count - 1) * 8; bitString = [DEREncodedContents subdataWithRange: OFMakeRange(1, count - 1)]; if (unusedBits != 0) length -= unusedBits; } @catch (id e) { [self release]; @throw e; } self = [self initWithBitString: bitString length: length]; objc_autoreleasePoolPop(pool); return self; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (void)dealloc { [_bitStringValue release]; [super dealloc]; } - (OFData *)ASN1DERRepresentation { size_t bitStringValueCount = _bitStringValue.count; size_t roundedUpLength = OFRoundUpToPowerOf2(8, _bitStringLength); unsigned char unusedBits = roundedUpLength - _bitStringLength; unsigned char header[] = { OFASN1TagNumberBitString, bitStringValueCount + 1, unusedBits }; OFMutableData *data; if (bitStringValueCount + 1 > UINT8_MAX || bitStringValueCount != roundedUpLength / 8) @throw [OFInvalidFormatException exception]; data = [OFMutableData dataWithCapacity: sizeof(header) + bitStringValueCount]; [data addItems: header count: sizeof(header)]; [data addItems: _bitStringValue.items count: bitStringValueCount]; [data makeImmutable]; return data; } - (bool)isEqual: (id)object { OFASN1BitString *bitString; if (object == self) return true; if (![object isKindOfClass: [OFASN1BitString class]]) return false; bitString = object; if (![bitString->_bitStringValue isEqual: _bitStringValue]) return false; if (bitString->_bitStringLength != _bitStringLength) return false; return true; } - (unsigned long)hash { return _bitStringValue.hash + (unsigned long)_bitStringLength; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1BitString: %@ (%zu bits)>", _bitStringValue, _bitStringLength]; } @end |
Added src/OFASN1DERRepresentation.h version [52466d1131].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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 "OFObject.h" OF_ASSUME_NONNULL_BEGIN @class OFData; /** * @protocol OFASN1DERRepresentation \ * OFASN1DERRepresentation.h ObjFW/OFASN1DERRepresentation.h * * @brief A protocol implemented by classes that support encoding to ASN.1 DER * representation. */ @protocol OFASN1DERRepresentation /** * @brief The object in ASN.1 DER representation. */ @property (readonly, nonatomic) OFData *ASN1DERRepresentation; @end OF_ASSUME_NONNULL_END |
Added src/OFASN1Enumerated.h version [b126a2f323].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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 "OFObject.h" #import "OFASN1Value.h" OF_ASSUME_NONNULL_BEGIN /** * @brief An ASN.1 Enumerated. */ OF_SUBCLASSING_RESTRICTED @interface OFASN1Enumerated: OFObject { long long _longLongValue; } /** * @brief The integer value. */ @property (readonly, nonatomic) long long longLongValue; /** * @brief Creates an ASN.1 Enumerated with the specified integer value. * * @param value The `long long` value of the Enumerated * @return A new, autoreleased OFASN1Enumerated */ + (instancetype)enumeratedWithLongLong: (long long)value; - (instancetype)init OF_UNAVAILABLE; /** * @brief Initializes an already allocated ASN.1 Enumerated with the specified * integer value. * * @param value The `long long` value of the Enumerated * @return An initialized OFASN1Enumerated */ - (instancetype)initWithLongLong: (long long)value OF_DESIGNATED_INITIALIZER; /** * @brief Initializes an already allocated ASN.1 Enumerated with the specified * arguments. * * @param tagClass The tag class of the value's type * @param tagNumber The tag number of the value's type * @param constructed Whether the value if of a constructed type * @param DEREncodedContents The DER-encoded contents octets of the value. * @return An initialized OFASN1Enumerated */ - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents; @end OF_ASSUME_NONNULL_END |
Added src/OFASN1Enumerated.m version [4528aa182f].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "OFASN1Enumerated.h" #import "OFData.h" #import "OFString.h" #import "OFInvalidArgumentException.h" extern long long OFASN1DERIntegerParse(const unsigned char *buffer, size_t length); @implementation OFASN1Enumerated @synthesize longLongValue = _longLongValue; + (instancetype)enumeratedWithLongLong: (long long)value { return [[[self alloc] initWithLongLong: value] autorelease]; } - (instancetype)initWithLongLong: (long long)value { self = [super init]; _longLongValue = value; return self; } - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { long long value; @try { if (tagClass != OFASN1TagClassUniversal || tagNumber != OFASN1TagNumberEnumerated || constructed) @throw [OFInvalidArgumentException exception]; if (DEREncodedContents.itemSize != 1) @throw [OFInvalidArgumentException exception]; value = OFASN1DERIntegerParse( DEREncodedContents.items, DEREncodedContents.count); } @catch (id e) { [self release]; @throw e; } return [self initWithLongLong: value]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (bool)isEqual: (id)object { OFASN1Enumerated *enumerated; if (object == self) return true; if (![object isKindOfClass: [OFASN1Enumerated class]]) return false; enumerated = object; if (enumerated->_longLongValue != _longLongValue) return false; return true; } - (unsigned long)hash { return (unsigned long)_longLongValue; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1Enumerated: %lld>", _longLongValue]; } @end |
Added src/OFASN1IA5String.h version [66930c1931].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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 "OFObject.h" #import "OFASN1Value.h" OF_ASSUME_NONNULL_BEGIN @class OFString; /** * @brief An ASN.1 IA5String. */ OF_SUBCLASSING_RESTRICTED @interface OFASN1IA5String: OFObject { OFString *_IA5StringValue; } /** * @brief The IA5String value. */ @property (readonly, nonatomic) OFString *IA5StringValue; /** * @brief The string value. */ @property (readonly, nonatomic) OFString *stringValue; /** * @brief Creates an IA5String with the specified string value. * * @param string The string value of the IA5String * @return A new, autoreleased OFASN1IA5String */ + (instancetype)stringWithString: (OFString *)string; - (instancetype)init OF_UNAVAILABLE; /** * @brief Initializes an already allocated IA5String with the specified string * value. * * @param string The string value of the IA5String * @return An initialized OFASN1IA5String */ - (instancetype)initWithString: (OFString *)string OF_DESIGNATED_INITIALIZER; /** * @brief Initializes an already allocated ASN.1 IA5String with the specified * arguments. * * @param tagClass The tag class of the value's type * @param tagNumber The tag number of the value's type * @param constructed Whether the value if of a constructed type * @param DEREncodedContents The DER-encoded contents octets of the value. * @return An initialized OFASN1IA5String */ - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents; @end OF_ASSUME_NONNULL_END |
Added src/OFASN1IA5String.m version [970b68594c].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "OFASN1IA5String.h" #import "OFData.h" #import "OFString.h" #import "OFInvalidArgumentException.h" @implementation OFASN1IA5String @synthesize IA5StringValue = _IA5StringValue; + (instancetype)stringWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } - (instancetype)initWithString: (OFString *)string { self = [super init]; @try { _IA5StringValue = [string copy]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { void *pool = objc_autoreleasePoolPush(); OFString *IA5String; @try { if (tagClass != OFASN1TagClassUniversal || tagNumber != OFASN1TagNumberIA5String || constructed) @throw [OFInvalidArgumentException exception]; if (DEREncodedContents.itemSize != 1) @throw [OFInvalidArgumentException exception]; IA5String= [OFString stringWithCString: DEREncodedContents.items encoding: OFStringEncodingASCII length: DEREncodedContents.count]; } @catch (id e) { [self release]; @throw e; } self = [self initWithString: IA5String]; objc_autoreleasePoolPop(pool); return self; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (void)dealloc { [_IA5StringValue release]; [super dealloc]; } - (OFString *)stringValue { return self.IA5StringValue; } - (bool)isEqual: (id)object { OFASN1IA5String *IA5String; if (object == self) return true; if (![object isKindOfClass: [OFASN1IA5String class]]) return false; IA5String = object; if (![IA5String->_IA5StringValue isEqual: _IA5StringValue]) return false; return true; } - (unsigned long)hash { return _IA5StringValue.hash; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1IA5String: %@>", _IA5StringValue]; } @end |
Added src/OFASN1NumericString.h version [7abcb9227d].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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 "OFObject.h" #import "OFASN1Value.h" OF_ASSUME_NONNULL_BEGIN @class OFString; /** * @brief An ASN.1 NumericString. */ OF_SUBCLASSING_RESTRICTED @interface OFASN1NumericString: OFObject { OFString *_numericStringValue; } /** * @brief The NumericString value. */ @property (readonly, nonatomic) OFString *numericStringValue; /** * @brief The string value. */ @property (readonly, nonatomic) OFString *stringValue; /** * @brief Creates an NumericString with the specified string value. * * @param string The string value of the NumericString * @return A new, autoreleased OFASN1NumericString */ + (instancetype)stringWithString: (OFString *)string; - (instancetype)init OF_UNAVAILABLE; /** * @brief Initializes an already allocated NumericString with the specified * string value. * * @param string The string value of the NumericString * @return An initialized OFASN1NumericString */ - (instancetype)initWithString: (OFString *)string OF_DESIGNATED_INITIALIZER; /** * @brief Initializes an already allocated ASN.1 NumericString with the * specified arguments. * * @param tagClass The tag class of the value's type * @param tagNumber The tag number of the value's type * @param constructed Whether the value if of a constructed type * @param DEREncodedContents The DER-encoded contents octets of the value. * @return An initialized ASN.1 NumericString */ - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents; @end OF_ASSUME_NONNULL_END |
Added src/OFASN1NumericString.m version [9bb6ec3e55].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "OFASN1NumericString.h" #import "OFData.h" #import "OFString.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" @implementation OFASN1NumericString @synthesize numericStringValue = _numericStringValue; + (instancetype)stringWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } - (instancetype)initWithString: (OFString *)string { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); const char *cString = string.UTF8String; size_t length = string.UTF8StringLength; for (size_t i = 0; i < length; i++) if (!OFASCIIIsDigit(cString[i]) && cString[i] != ' ') @throw [OFInvalidEncodingException exception]; _numericStringValue = [string copy]; objc_autoreleasePoolPop(pool); } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { void *pool = objc_autoreleasePoolPush(); OFString *numericString; @try { if (tagClass != OFASN1TagClassUniversal || tagNumber != OFASN1TagNumberNumericString || constructed) @throw [OFInvalidArgumentException exception]; if (DEREncodedContents.itemSize != 1) @throw [OFInvalidArgumentException exception]; numericString = [OFString stringWithCString: DEREncodedContents.items encoding: OFStringEncodingASCII length: DEREncodedContents.count]; } @catch (id e) { [self release]; @throw e; } self = [self initWithString: numericString]; objc_autoreleasePoolPop(pool); return self; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (void)dealloc { [_numericStringValue release]; [super dealloc]; } - (OFString *)stringValue { return self.numericStringValue; } - (bool)isEqual: (id)object { OFASN1NumericString *numericString; if (object == self) return true; if (![object isKindOfClass: [OFASN1NumericString class]]) return false; numericString = object; if (![numericString->_numericStringValue isEqual: _numericStringValue]) return false; return true; } - (unsigned long)hash { return _numericStringValue.hash; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1NumericString: %@>", _numericStringValue]; } @end |
Added src/OFASN1ObjectIdentifier.h version [7ee39cae98].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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 "OFObject.h" #import "OFASN1Value.h" OF_ASSUME_NONNULL_BEGIN @class OFArray OF_GENERIC(ObjetType); @class OFNumber; /** * @brief An ASN.1 ObjectIdentifier. */ OF_SUBCLASSING_RESTRICTED @interface OFASN1ObjectIdentifier: OFObject { OFArray OF_GENERIC(OFNumber *) *_subidentifiers; } /** * @brief The subidentifiers of the ObjectIdentifier. */ @property (readonly, nonatomic) OFArray OF_GENERIC(OFNumber *) *subidentifiers; /** * @brief Creates an ASN.1 ObjectIdentifier with the specified subidentifiers. * * @param subidentifiers The subidentifiers of the ASN.1 ObjectIdentifier * @return A new, autoreleased OFASN1ObjectIdentifier */ + (instancetype)objectIdentifierWithSubidentifiers: (OFArray OF_GENERIC(OFNumber *) *)subidentifiers; - (instancetype)init OF_UNAVAILABLE; /** * @brief Initializes an already allocated ASN.1 ObjectIdentifier with the * specified subidentifiers. * * @param subidentifiers The subidentifiers of the ASN.1 ObjectIdentifier * @return An initialized OFASN1ObjectIdentifier */ - (instancetype)initWithSubidentifiers: (OFArray OF_GENERIC(OFNumber *) *)subidentifiers OF_DESIGNATED_INITIALIZER; /** * @brief Initializes an already allocated ASN.1 ObjectIdentifier with the * specified arguments. * * @param tagClass The tag class of the value's type * @param tagNumber The tag number of the value's type * @param constructed Whether the value if of a constructed type * @param DEREncodedContents The DER-encoded contents octets of the value. * @return An initialized OFASN1ObjectIdentifier */ - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents; @end OF_ASSUME_NONNULL_END |
Added src/OFASN1ObjectIdentifier.m version [3be9eea106].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "OFASN1ObjectIdentifier.h" #import "OFArray.h" #import "OFData.h" #import "OFNumber.h" #import "OFString.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOutOfRangeException.h" @implementation OFASN1ObjectIdentifier @synthesize subidentifiers = _subidentifiers; + (instancetype)objectIdentifierWithSubidentifiers: (OFArray OF_GENERIC(OFNumber *) *)subidentifiers { return [[[self alloc] initWithSubidentifiers: subidentifiers] autorelease]; } - (instancetype)initWithSubidentifiers: (OFArray OF_GENERIC(OFNumber *) *)subidentifiers { self = [super init]; @try { if (subidentifiers.count < 1) @throw [OFInvalidFormatException exception]; switch ([[subidentifiers objectAtIndex: 0] longLongValue]) { case 0: case 1: case 2: break; default: @throw [OFInvalidFormatException exception]; } _subidentifiers = [subidentifiers copy]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { void *pool = objc_autoreleasePoolPush(); OFMutableArray OF_GENERIC(OFNumber *) *subidentifiers; @try { const unsigned char *items = DEREncodedContents.items; size_t count = DEREncodedContents.count; unsigned long long value = 0; uint_fast8_t bits = 0; if (tagClass != OFASN1TagClassUniversal || tagNumber != OFASN1TagNumberObjectIdentifier || constructed) @throw [OFInvalidArgumentException exception]; if (DEREncodedContents.itemSize != 1 || count == 0) @throw [OFInvalidArgumentException exception]; subidentifiers = [OFMutableArray array]; for (size_t i = 0; i < count; i++) { if (bits == 0 && items[i] == 0x80) @throw [OFInvalidFormatException exception]; value = (value << 7) | (items[i] & 0x7F); bits += 7; if (bits > sizeof(unsigned long long) * 8) @throw [OFOutOfRangeException exception]; if (items[i] & 0x80) continue; if (subidentifiers.count == 0) { if (value < 40) [subidentifiers addObject: [OFNumber numberWithInt: 0]]; else if (value < 80) { [subidentifiers addObject: [OFNumber numberWithInt: 1]]; value -= 40; } else { [subidentifiers addObject: [OFNumber numberWithInt: 2]]; value -= 80; } } [subidentifiers addObject: [OFNumber numberWithUnsignedLongLong: value]]; value = 0; bits = 0; } if (items[count - 1] & 0x80) @throw [OFInvalidFormatException exception]; [subidentifiers makeImmutable]; } @catch (id e) { [self release]; @throw e; } self = [self initWithSubidentifiers: subidentifiers]; objc_autoreleasePoolPop(pool); return self; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (void)dealloc { [_subidentifiers release]; [super dealloc]; } - (bool)isEqual: (id)object { OFASN1ObjectIdentifier *objectIdentifier; if (object == self) return true; if (![object isKindOfClass: [OFASN1ObjectIdentifier class]]) return false; objectIdentifier = object; if (![objectIdentifier->_subidentifiers isEqual: _subidentifiers]) return false; return true; } - (unsigned long)hash { return _subidentifiers.hash; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1ObjectIdentifier: %@>", [_subidentifiers componentsJoinedByString: @"."]]; } @end |
Added src/OFASN1OctetString.h version [1707a79a57].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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 "OFObject.h" #import "OFASN1Value.h" OF_ASSUME_NONNULL_BEGIN @class OFData; /** * @brief An ASN.1 OctetString. */ OF_SUBCLASSING_RESTRICTED @interface OFASN1OctetString: OFObject { OFData *_octetStringValue; } /** * @brief The OctetString value. */ @property (readonly, nonatomic) OFData *octetStringValue; /** * @brief Creates an OctetString with the specified value. * * @param octetString The OctetString value * @return A new, autoreleased OFASN1OctetString */ + (instancetype)octetStringWithOctetString: (OFData *)octetString; - (instancetype)init OF_UNAVAILABLE; /** * @brief Initializes an already allocated OctetString with the specified * value. * * @param octetString The OctetString value * @return An initialized OFASN1OctetString */ - (instancetype)initWithOctetString: (OFData *)octetString OF_DESIGNATED_INITIALIZER; /** * @brief Initializes an already allocated ASN.1 OctetString with the specified * arguments. * * @param tagClass The tag class of the value's type * @param tagNumber The tag number of the value's type * @param constructed Whether the value if of a constructed type * @param DEREncodedContents The DER-encoded contents octets of the value. * @return An initialized ASN.1 OctetString */ - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents; @end OF_ASSUME_NONNULL_END |
Added src/OFASN1OctetString.m version [d3dd764a8d].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "OFASN1OctetString.h" #import "OFData.h" #import "OFString.h" #import "OFInvalidArgumentException.h" @implementation OFASN1OctetString @synthesize octetStringValue = _octetStringValue; + (instancetype)octetStringWithOctetString: (OFData *)octetString { return [[[self alloc] initWithOctetString: octetString] autorelease]; } - (instancetype)initWithOctetString: (OFData *)octetString { self = [super init]; @try { _octetStringValue = [octetString copy]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { @try { if (tagClass != OFASN1TagClassUniversal || tagNumber != OFASN1TagNumberOctetString || constructed) @throw [OFInvalidArgumentException exception]; if (DEREncodedContents.itemSize != 1) @throw [OFInvalidArgumentException exception]; } @catch (id e) { [self release]; @throw e; } return [self initWithOctetString: DEREncodedContents]; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (void)dealloc { [_octetStringValue release]; [super dealloc]; } - (bool)isEqual: (id)object { OFASN1OctetString *octetString; if (object == self) return true; if (![object isKindOfClass: [OFASN1OctetString class]]) return false; octetString = object; if (![octetString->_octetStringValue isEqual: _octetStringValue]) return false; return true; } - (unsigned long)hash { return _octetStringValue.hash; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1OctetString: %@>", _octetStringValue]; } @end |
Added src/OFASN1PrintableString.h version [4206aa8983].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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 "OFObject.h" #import "OFASN1Value.h" OF_ASSUME_NONNULL_BEGIN @class OFString; /** * @brief An ASN.1 PrintableString. */ OF_SUBCLASSING_RESTRICTED @interface OFASN1PrintableString: OFObject { OFString *_printableStringValue; } /** * @brief The PrintableString value. */ @property (readonly, nonatomic) OFString *printableStringValue; /** * @brief The string value. */ @property (readonly, nonatomic) OFString *stringValue; /** * @brief Creates a PrintableString with the specified string value. * * @param string The string value of the PrintableString * @return A new, autoreleased OFASN1PrintableString */ + (instancetype)stringWithString: (OFString *)string; - (instancetype)init OF_UNAVAILABLE; /** * @brief Initializes an already allocated PrintableString with the specified * string value. * * @param string The string value of the PrintableString * @return An initialized OFASN1PrintableString */ - (instancetype)initWithString: (OFString *)string OF_DESIGNATED_INITIALIZER; /** * @brief Initializes an already allocated ASN.1 PrintableString with the * specified arguments. * * @param tagClass The tag class of the value's type * @param tagNumber The tag number of the value's type * @param constructed Whether the value if of a constructed type * @param DEREncodedContents The DER-encoded contents octets of the value. * @return An initialized OFASN1PrintableString */ - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents; @end OF_ASSUME_NONNULL_END |
Added src/OFASN1PrintableString.m version [a209e00a41].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "OFASN1PrintableString.h" #import "OFData.h" #import "OFString.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" @implementation OFASN1PrintableString @synthesize printableStringValue = _printableStringValue; + (instancetype)stringWithString: (OFString *)string { return [[[self alloc] initWithString: string] autorelease]; } - (instancetype)initWithString: (OFString *)string { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); const char *cString = string.UTF8String; size_t length = string.UTF8StringLength; for (size_t i = 0; i < length; i++) { if (OFASCIIIsAlnum(cString[i])) continue; switch (cString[i]) { case ' ': case '\'': case '(': case ')': case '+': case ',': case '-': case '.': case '/': case ':': case '=': case '?': continue; default: @throw [OFInvalidEncodingException exception]; } } _printableStringValue = [string copy]; objc_autoreleasePoolPop(pool); } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { void *pool = objc_autoreleasePoolPush(); OFString *printableString; @try { if (tagClass != OFASN1TagClassUniversal || tagNumber != OFASN1TagNumberPrintableString || constructed) @throw [OFInvalidArgumentException exception]; if (DEREncodedContents.itemSize != 1) @throw [OFInvalidArgumentException exception]; printableString = [OFString stringWithCString: DEREncodedContents.items encoding: OFStringEncodingASCII length: DEREncodedContents.count]; } @catch (id e) { [self release]; @throw e; } self = [self initWithString: printableString]; objc_autoreleasePoolPop(pool); return self; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (void)dealloc { [_printableStringValue release]; [super dealloc]; } - (OFString *)stringValue { return self.printableStringValue; } - (bool)isEqual: (id)object { OFASN1PrintableString *printableString; if (object == self) return true; if (![object isKindOfClass: [OFASN1PrintableString class]]) return false; printableString = object; if (![printableString->_printableStringValue isEqual: _printableStringValue]) return false; return true; } - (unsigned long)hash { return _printableStringValue.hash; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1PrintableString: %@>", _printableStringValue]; } @end |
Added src/OFASN1Value.h version [9157bbe2be].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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 "OFObject.h" OF_ASSUME_NONNULL_BEGIN /** @file */ @class OFData; /** * @brief ASN.1 tag class. */ typedef enum { /** Universal */ OFASN1TagClassUniversal = 0x0, /** Application */ OFASN1TagClassApplication = 0x1, /** Context specific */ OFASN1TagClassContextSpecific = 0x2, /** Private */ OFASN1TagClassPrivate = 0x3 } OFASN1TagClass; /** * @brief ASN.1 tag number. */ typedef enum { /** Boolean */ OFASN1TagNumberBoolean = 0x01, /** Integer */ OFASN1TagNumberInteger = 0x02, /** Bit string */ OFASN1TagNumberBitString = 0x03, /** Octet string */ OFASN1TagNumberOctetString = 0x04, /** Null */ OFASN1TagNumberNull = 0x05, /** Object Identifier */ OFASN1TagNumberObjectIdentifier = 0x06, /** Enumerated */ OFASN1TagNumberEnumerated = 0x0A, /** UTF-8 string */ OFASN1TagNumberUTF8String = 0x0C, /** Sequence */ OFASN1TagNumberSequence = 0x10, /** Set */ OFASN1TagNumberSet = 0x11, /** NumericString */ OFASN1TagNumberNumericString = 0x12, /** PrintableString */ OFASN1TagNumberPrintableString = 0x13, /** IA5String */ OFASN1TagNumberIA5String = 0x16 } OFASN1TagNumber; /** * @brief A class representing an ASN.1 value. */ OF_SUBCLASSING_RESTRICTED @interface OFASN1Value: OFObject { OFASN1TagClass _tagClass; OFASN1TagNumber _tagNumber; bool _constructed; OFData *_DEREncodedContents; } /** * @brief The tag class of the value's type. */ @property (readonly, nonatomic) OFASN1TagClass tagClass; /** * @brief The tag number of the value's type. */ @property (readonly, nonatomic) OFASN1TagNumber tagNumber; /** * @brief Whether the value if of a constructed type. */ @property (readonly, nonatomic, getter=isConstructed) bool constructed; /** * @brief The DER-encoded contents octets of the value. */ @property (readonly, nonatomic) OFData *DEREncodedContents; /** * @brief Creates a new ASN.1 value with the specified arguments. * * @param tagClass The tag class of the value's type * @param tagNumber The tag number of the value's type * @param constructed Whether the value if of a constructed type * @param DEREncodedContents The DER-encoded contents octets of the value. * @return A new ASN.1 value */ + (instancetype)valueWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents; - (instancetype)init OF_UNAVAILABLE; /** * @brief Initializes an already allocated ASN.1 value with the specified * arguments. * * @param tagClass The tag class of the value's type * @param tagNumber The tag number of the value's type * @param constructed Whether the value if of a constructed type * @param DEREncodedContents The DER-encoded contents octets of the value. * @return An initialized ASN.1 value */ - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents OF_DESIGNATED_INITIALIZER; @end OF_ASSUME_NONNULL_END |
Added src/OFASN1Value.m version [0b3a3e16ec].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "OFASN1Value.h" #import "OFData.h" #import "OFString.h" #import "OFInvalidFormatException.h" @implementation OFASN1Value @synthesize tagClass = _tagClass, tagNumber = _tagNumber; @synthesize constructed = _constructed; @synthesize DEREncodedContents = _DEREncodedContents; + (instancetype)valueWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { return [[[self alloc] initWithTagClass: tagClass tagNumber: tagNumber constructed: constructed DEREncodedContents: DEREncodedContents] autorelease]; } - (instancetype)initWithTagClass: (OFASN1TagClass)tagClass tagNumber: (OFASN1TagNumber)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { self = [super init]; @try { if (DEREncodedContents.itemSize != 1) @throw [OFInvalidFormatException exception]; _tagClass = tagClass; _tagNumber = tagNumber; _constructed = constructed; _DEREncodedContents = [DEREncodedContents copy]; } @catch (id e) { [self release]; @throw e; } return self; } - (instancetype)init { OF_INVALID_INIT_METHOD } - (void)dealloc { [_DEREncodedContents release]; [super dealloc]; } - (bool)isEqual: (id)object { OFASN1Value *value; if (object == self) return true; if (![object isKindOfClass: [OFASN1Value class]]) return false; value = object; if (value->_tagClass != _tagClass) return false; if (value->_tagNumber != _tagNumber) return false; if (value->_constructed != _constructed) return false; if (![value->_DEREncodedContents isEqual: _DEREncodedContents]) return false; return true; } - (unsigned long)hash { unsigned long hash; OFHashInit(&hash); OFHashAddByte(&hash, _tagClass & 0xFF); OFHashAddByte(&hash, _tagNumber & 0xFF); OFHashAddByte(&hash, _constructed); OFHashAddHash(&hash, _DEREncodedContents.hash); OFHashFinalize(&hash); return hash; } - (OFString *)description { return [OFString stringWithFormat: @"<OFASN1Value:\n" @"\tTag class = %x\n" @"\tTag number = %x\n" @"\tConstructed = %u\n" @"\tDER-encoded contents = %@\n" @">", _tagClass, _tagNumber, _constructed, _DEREncodedContents.description]; } @end |
Added src/OFData+ASN1DERParsing.h version [ccb2c495e5].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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 "OFData.h" #import "OFASN1Value.h" OF_ASSUME_NONNULL_BEGIN #ifdef __cplusplus extern "C" { #endif extern int _OFData_ASN1DERParsing_reference; #ifdef __cplusplus } #endif @interface OFData (ASN1DERParsing) /** * @brief The data interpreted as ASN.1 in DER representation and parsed as an * object. * * This is either an OFArray (for a sequence), an OFSet (for a set) or an * OFASN1Value. */ @property (readonly, nonatomic) id objectByParsingASN1DER; /** * @brief Parses the ASN.1 DER representation and returns it as an object. * * This is either an OFArray (for a sequence), an OFSet (for a set) or an * OFASN1Value. * * @param depthLimit The maximum depth the parser should accept (defaults to 32 * if not specified, 0 means no limit (insecure!)) * @return The ASN.1 DER representation as an object */ - (id)objectByParsingASN1DERWithDepthLimit: (size_t)depthLimit; @end OF_ASSUME_NONNULL_END |
Added src/OFData+ASN1DERParsing.m version [865120805f].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "OFData+ASN1DERParsing.h" #import "OFASN1BitString.h" #import "OFASN1Enumerated.h" #import "OFASN1IA5String.h" #import "OFASN1NumericString.h" #import "OFASN1ObjectIdentifier.h" #import "OFASN1OctetString.h" #import "OFASN1PrintableString.h" #import "OFASN1Value.h" #import "OFArray.h" #import "OFNull.h" #import "OFNumber.h" #import "OFSet.h" #import "OFString.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOutOfRangeException.h" #import "OFTruncatedDataException.h" enum { tagConstructedMask = 0x20 }; int _OFData_ASN1DERParsing_reference; static size_t parseObject(OFData *self, id *object, size_t depthLimit); long long OFASN1DERIntegerParse(const unsigned char *buffer, size_t length) { unsigned long long value = 0; /* TODO: Support for big numbers */ if (length > sizeof(unsigned long long) && (length != sizeof(unsigned long long) + 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 = ~0ull; while (length--) value = (value << 8) | *buffer++; return value; } static OFArray * parseSequence(OFData *contents, size_t depthLimit) { OFMutableArray *ret = [OFMutableArray array]; size_t count = contents.count; if (depthLimit == 0) @throw [OFOutOfRangeException exception]; while (count > 0) { id object; size_t objectLength; objectLength = parseObject(contents, &object, depthLimit); count -= objectLength; contents = [contents subdataWithRange: OFMakeRange(objectLength, count)]; [ret addObject: object]; } [ret makeImmutable]; return ret; } static OFSet * parseSet(OFData *contents, size_t depthLimit) { OFMutableSet *ret = [OFMutableSet set]; size_t count = contents.count; OFData *previousObjectData = nil; if (depthLimit == 0) @throw [OFOutOfRangeException exception]; while (count > 0) { id object; size_t objectLength; OFData *objectData; objectLength = parseObject(contents, &object, depthLimit); objectData = [contents subdataWithRange: OFMakeRange(0, objectLength)]; if (previousObjectData != nil && [objectData compare: previousObjectData] != OFOrderedDescending) @throw [OFInvalidFormatException exception]; count -= objectLength; contents = [contents subdataWithRange: OFMakeRange(objectLength, count)]; [ret addObject: object]; previousObjectData = objectData; } [ret makeImmutable]; return ret; } static size_t parseObject(OFData *self, id *object, size_t depthLimit) { const unsigned char *items = self.items; size_t count = self.count; unsigned char tag; size_t contentsLength, bytesConsumed = 0; Class valueClass; OFData *contents; if (count < 2) @throw [OFTruncatedDataException exception]; tag = *items++; contentsLength = *items++; bytesConsumed += 2; if (contentsLength > 127) { uint_fast8_t lengthLength = contentsLength & 0x7F; if (lengthLength > sizeof(size_t)) @throw [OFOutOfRangeException exception]; if (count - bytesConsumed < lengthLength) @throw [OFTruncatedDataException exception]; if (lengthLength == 0 || (lengthLength == 1 && items[0] < 0x80) || (lengthLength >= 2 && items[0] == 0)) @throw [OFInvalidFormatException exception]; contentsLength = 0; for (uint_fast8_t i = 0; i < lengthLength; i++) contentsLength = (contentsLength << 8) | *items++; bytesConsumed += lengthLength; if (contentsLength <= 127) @throw [OFInvalidFormatException exception]; } if (count - bytesConsumed < contentsLength) @throw [OFTruncatedDataException exception]; contents = [self subdataWithRange: OFMakeRange(bytesConsumed, contentsLength)]; bytesConsumed += contentsLength; switch (tag & ~tagConstructedMask) { case OFASN1TagNumberBoolean:; unsigned char boolValue; if (tag & tagConstructedMask) @throw [OFInvalidFormatException exception]; if (contents.count != 1) @throw [OFInvalidFormatException exception]; boolValue = *(unsigned char *)[contents itemAtIndex: 0]; if (boolValue != 0 && boolValue != 0xFF) @throw [OFInvalidFormatException exception]; *object = [OFNumber numberWithBool: boolValue]; return bytesConsumed; case OFASN1TagNumberInteger: if (tag & tagConstructedMask) @throw [OFInvalidFormatException exception]; *object = [OFNumber numberWithLongLong: OFASN1DERIntegerParse(contents.items, contents.count)]; return bytesConsumed; case OFASN1TagNumberBitString: valueClass = [OFASN1BitString class]; break; case OFASN1TagNumberOctetString: valueClass = [OFASN1OctetString class]; break; case OFASN1TagNumberNull: if (tag & tagConstructedMask) @throw [OFInvalidFormatException exception]; if (contents.count != 0) @throw [OFInvalidFormatException exception]; *object = [OFNull null]; return bytesConsumed; case OFASN1TagNumberObjectIdentifier: valueClass = [OFASN1ObjectIdentifier class]; break; case OFASN1TagNumberEnumerated: valueClass = [OFASN1Enumerated class]; break; case OFASN1TagNumberUTF8String: if (tag & tagConstructedMask) @throw [OFInvalidFormatException exception]; *object = [OFString stringWithUTF8String: contents.items length: contents.count]; return bytesConsumed; case OFASN1TagNumberSequence: if (!(tag & tagConstructedMask)) @throw [OFInvalidFormatException exception]; *object = parseSequence(contents, depthLimit - 1); return bytesConsumed; case OFASN1TagNumberSet: if (!(tag & tagConstructedMask)) @throw [OFInvalidFormatException exception]; *object = parseSet(contents, depthLimit - 1); return bytesConsumed; case OFASN1TagNumberNumericString: valueClass = [OFASN1NumericString class]; break; case OFASN1TagNumberPrintableString: valueClass = [OFASN1PrintableString class]; break; case OFASN1TagNumberIA5String: valueClass = [OFASN1IA5String class]; break; default: valueClass = [OFASN1Value class]; break; } *object = [[[valueClass alloc] initWithTagClass: tag >> 6 tagNumber: tag & 0x1F constructed: tag & tagConstructedMask DEREncodedContents: contents] autorelease]; return bytesConsumed; } @implementation OFData (ASN1DERParsing) - (id)objectByParsingASN1DER { return [self objectByParsingASN1DERWithDepthLimit: 32]; } - (id)objectByParsingASN1DERWithDepthLimit: (size_t)depthLimit { void *pool = objc_autoreleasePoolPush(); id object; if (self.itemSize != 1) @throw [OFInvalidArgumentException exception]; if (parseObject(self, &object, depthLimit) != self.count) @throw [OFInvalidFormatException exception]; [object retain]; objc_autoreleasePoolPop(pool); return [object autorelease]; } @end |
Modified src/OFData.h from [91b48d3506] to [9788e734e3].
︙ | ︙ | |||
371 372 373 374 375 376 377 378 379 | */ - (void)writeToIRI: (OFIRI *)IRI; @end OF_ASSUME_NONNULL_END #import "OFMutableData.h" #import "OFData+CryptographicHashing.h" #import "OFData+MessagePackParsing.h" | > | 371 372 373 374 375 376 377 378 379 380 | */ - (void)writeToIRI: (OFIRI *)IRI; @end OF_ASSUME_NONNULL_END #import "OFMutableData.h" #import "OFData+ASN1DERParsing.h" #import "OFData+CryptographicHashing.h" #import "OFData+MessagePackParsing.h" |
Modified src/OFData.m from [236ab0e955] to [dc16e1e87f].
︙ | ︙ | |||
49 50 51 52 53 54 55 56 57 58 59 60 61 62 | @interface OFPlaceholderData: OFString @end /* References for static linking */ void _references_to_categories_of_OFData(void) { _OFData_CryptographicHashing_reference = 1; _OFData_MessagePackParsing_reference = 1; } @implementation OFPlaceholderData - (instancetype)init { | > | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | @interface OFPlaceholderData: OFString @end /* References for static linking */ void _references_to_categories_of_OFData(void) { _OFData_ASN1DERParsing_reference = 1; _OFData_CryptographicHashing_reference = 1; _OFData_MessagePackParsing_reference = 1; } @implementation OFPlaceholderData - (instancetype)init { |
︙ | ︙ |
Modified src/OFNull.h from [1e5ebcce0e] to [ed5233e238].
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * 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 "OFObject.h" #import "OFJSONRepresentation.h" #import "OFMessagePackRepresentation.h" OF_ASSUME_NONNULL_BEGIN /** * @class OFNull OFNull.h ObjFW/OFNull.h * * @brief A class for representing null values in collections. */ OF_SUBCLASSING_RESTRICTED @interface OFNull: OFObject <OFCopying, OFJSONRepresentation, | > | | 10 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 37 38 39 | * 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 "OFObject.h" #import "OFASN1DERRepresentation.h" #import "OFJSONRepresentation.h" #import "OFMessagePackRepresentation.h" OF_ASSUME_NONNULL_BEGIN /** * @class OFNull OFNull.h ObjFW/OFNull.h * * @brief A class for representing null values in collections. */ OF_SUBCLASSING_RESTRICTED @interface OFNull: OFObject <OFCopying, OFJSONRepresentation, OFMessagePackRepresentation, OFASN1DERRepresentation> /** * @brief Returns an OFNull singleton. * * @return An OFNull singleton */ + (OFNull *)null; @end OF_ASSUME_NONNULL_END |
Modified src/OFNull.m from [83c5ccc85f] to [bd50904874].
︙ | ︙ | |||
69 70 71 72 73 74 75 76 77 78 | } - (OFData *)messagePackRepresentation { uint8_t type = 0xC0; return [OFData dataWithItems: &type count: 1]; } OF_SINGLETON_METHODS @end | > > > > > > | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | } - (OFData *)messagePackRepresentation { uint8_t type = 0xC0; return [OFData dataWithItems: &type count: 1]; } - (OFData *)ASN1DERRepresentation { const unsigned char bytes[] = { OFASN1TagNumberNull, 0 }; return [OFData dataWithItems: bytes count: sizeof(bytes)]; } OF_SINGLETON_METHODS @end |
Modified src/OFNumber.h from [e8b2d0d74a] to [bed7e6a8c1].
︙ | ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | #include "objfw-defs.h" #ifdef OF_HAVE_SYS_TYPES_H # include <sys/types.h> #endif #import "OFJSONRepresentation.h" #import "OFMessagePackRepresentation.h" #import "OFValue.h" OF_ASSUME_NONNULL_BEGIN /** @file */ /** * @class OFNumber OFNumber.h ObjFW/OFNumber.h * * @brief Provides a way to store a number in an object. */ | > | | | 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 | #include "objfw-defs.h" #ifdef OF_HAVE_SYS_TYPES_H # include <sys/types.h> #endif #import "OFASN1DERRepresentation.h" #import "OFJSONRepresentation.h" #import "OFMessagePackRepresentation.h" #import "OFValue.h" OF_ASSUME_NONNULL_BEGIN /** @file */ /** * @class OFNumber OFNumber.h ObjFW/OFNumber.h * * @brief Provides a way to store a number in an object. */ @interface OFNumber: OFValue <OFComparing, OFASN1DERRepresentation, OFJSONRepresentation, OFMessagePackRepresentation> /** * @brief The OFNumber as a `bool`. */ @property (readonly, nonatomic) bool boolValue; /** * @brief The OFNumber as a `signed char`. |
︙ | ︙ |
Modified src/OFNumber.m from [e5b90c57f3] to [f54894ca09].
︙ | ︙ | |||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #import "OFConcreteNumber.h" #import "OFData.h" #import "OFString.h" #import "OFTaggedPointerNumber.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOutOfRangeException.h" @interface OFNumber () - (OFString *) of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options depth: (size_t)depth; @end | > | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | #import "OFConcreteNumber.h" #import "OFData.h" #import "OFString.h" #import "OFTaggedPointerNumber.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFNotImplementedException.h" #import "OFOutOfRangeException.h" @interface OFNumber () - (OFString *) of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options depth: (size_t)depth; @end |
︙ | ︙ | |||
706 707 708 709 710 711 712 713 714 715 716 717 718 719 | return [OFString stringWithFormat: @"%lld", self.longLongValue]; if (isUnsigned(self)) return [OFString stringWithFormat: @"%llu", self.unsignedLongLongValue]; @throw [OFInvalidFormatException exception]; } - (OFString *)JSONRepresentation { return [self of_JSONRepresentationWithOptions: 0 depth: 0]; } - (OFString *)JSONRepresentationWithOptions: | > > > > > > > > > > > > > > > | 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 | return [OFString stringWithFormat: @"%lld", self.longLongValue]; if (isUnsigned(self)) return [OFString stringWithFormat: @"%llu", self.unsignedLongLongValue]; @throw [OFInvalidFormatException exception]; } - (OFData *)ASN1DERRepresentation { if (self.objCType[0] == 'B' && self.objCType[1] == '\0') { char buffer[] = { OFASN1TagNumberBoolean, 1, (self.boolValue ? 0xFF : 0x00) }; return [OFData dataWithItems: buffer count: sizeof(buffer)]; } else @throw [OFNotImplementedException exceptionWithSelector: _cmd object: self]; } - (OFString *)JSONRepresentation { return [self of_JSONRepresentationWithOptions: 0 depth: 0]; } - (OFString *)JSONRepresentationWithOptions: |
︙ | ︙ |
Modified src/ObjFW.h from [62977e609b] to [28127cd4cc].
︙ | ︙ | |||
139 140 141 142 143 144 145 146 147 148 149 150 151 152 | #import "OFRunLoop.h" #import "OFMatrix4x4.h" #ifdef OF_WINDOWS # import "OFWindowsRegistryKey.h" #endif #import "OFAllocFailedException.h" #import "OFAlreadyOpenException.h" #import "OFException.h" #import "OFChangeCurrentDirectoryFailedException.h" #import "OFChecksumMismatchException.h" #import "OFCopyItemFailedException.h" | > > > > > > > > > | 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 | #import "OFRunLoop.h" #import "OFMatrix4x4.h" #ifdef OF_WINDOWS # import "OFWindowsRegistryKey.h" #endif #import "OFASN1BitString.h" #import "OFASN1Enumerated.h" #import "OFASN1IA5String.h" #import "OFASN1NumericString.h" #import "OFASN1ObjectIdentifier.h" #import "OFASN1OctetString.h" #import "OFASN1PrintableString.h" #import "OFASN1Value.h" #import "OFAllocFailedException.h" #import "OFAlreadyOpenException.h" #import "OFException.h" #import "OFChangeCurrentDirectoryFailedException.h" #import "OFChecksumMismatchException.h" #import "OFCopyItemFailedException.h" |
︙ | ︙ |
Modified tests/Makefile from [bd751ecf4e] to [cfd6eda8c6].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | testfile_bin.m \ testfile_ini.m DISTCLEAN = Info.plist PROG_NOINST = tests${PROG_SUFFIX} STATIC_LIB_NOINST = ${TESTS_STATIC_LIB} SRCS = ForwardingTests.m \ OFArrayTests.m \ ${OF_BLOCK_TESTS_M} \ OFCharacterSetTests.m \ OFColorTests.m \ OFConcreteArrayTests.m \ OFConcreteDictionaryTests.m \ OFConcreteMutableArrayTests.m \ | > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | testfile_bin.m \ testfile_ini.m DISTCLEAN = Info.plist PROG_NOINST = tests${PROG_SUFFIX} STATIC_LIB_NOINST = ${TESTS_STATIC_LIB} SRCS = ForwardingTests.m \ OFASN1DERParsingTests.m \ OFASN1DERRepresentationTests.m \ OFArrayTests.m \ ${OF_BLOCK_TESTS_M} \ OFCharacterSetTests.m \ OFColorTests.m \ OFConcreteArrayTests.m \ OFConcreteDictionaryTests.m \ OFConcreteMutableArrayTests.m \ |
︙ | ︙ |
Added tests/OFASN1DERParsingTests.m version [6b1da7829e].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "ObjFW.h" #import "ObjFWTest.h" @interface OFASN1DERParsingTests: OTTestCase @end @implementation OFASN1DERParsingTests - (void)testBoolean { OTAssertFalse( [[[OFData dataWithItems: "\x01\x01\x00" count: 3] objectByParsingASN1DER] boolValue]); OTAssertTrue( [[[OFData dataWithItems: "\x01\x01\xFF" count: 3] objectByParsingASN1DER] boolValue]); } - (void)testInvalidBooleanFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x01\x01\x01" count: 3] objectByParsingASN1DER], OFInvalidFormatException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x01\x02\x00\x00" count: 4] objectByParsingASN1DER], OFInvalidFormatException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x01\x00" count: 2] objectByParsingASN1DER], OFInvalidFormatException); } - (void)testTruncatedBooleanFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x01\x01" count: 2] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testInteger { OTAssertEqual([[[OFData dataWithItems: "\x02\x00" count: 2] objectByParsingASN1DER] longLongValue], 0); OTAssertEqual([[[OFData dataWithItems: "\x02\x01\x01" count: 3] objectByParsingASN1DER] longLongValue], 1); OTAssertEqual([[[OFData dataWithItems: "\x02\x02\x01\x04" count: 4] objectByParsingASN1DER] longLongValue], 260); OTAssertEqual([[[OFData dataWithItems: "\x02\x01\xFF" count: 3] objectByParsingASN1DER] longLongValue], -1); OTAssertEqual([[[OFData dataWithItems: "\x02\x03\xFF\x00\x00" count: 5] objectByParsingASN1DER] longLongValue], -65536); OTAssertEqual((unsigned long long)[[[OFData dataWithItems: "\x02\x09\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" count: 11] objectByParsingASN1DER] longLongValue], ULLONG_MAX); } - (void)testInvalidIntegerFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x02\x02\x00\x00" count: 4] objectByParsingASN1DER], OFInvalidFormatException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x02\x02\x00\x7F" count: 4] objectByParsingASN1DER], OFInvalidFormatException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x02\x02\xFF\x80" count: 4] objectByParsingASN1DER], OFInvalidFormatException); } - (void)testOutOfRangeIntegerFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x02\x09\x01" "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" count: 11] objectByParsingASN1DER], OFOutOfRangeException); } - (void)testTruncatedIntegerFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x02\x02\x00" count: 3] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testBitString { OFASN1BitString *bitString; bitString = [[OFData dataWithItems: "\x03\x01\x00" count: 3] objectByParsingASN1DER]; OTAssertEqualObjects(bitString.bitStringValue, [OFData data]); OTAssertEqual(bitString.bitStringLength, 0); bitString = [[OFData dataWithItems: "\x03\x0D\x01Hello World\x80" count: 15] objectByParsingASN1DER]; OTAssertEqualObjects(bitString.bitStringValue, [OFData dataWithItems: "Hello World\x80" count: 12]); OTAssertEqual(bitString.bitStringLength, 95); bitString = [[OFData dataWithItems: "\x03\x81\x80\x00xxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxx" count: 131] objectByParsingASN1DER]; OTAssertEqualObjects(bitString.bitStringValue, [OFData dataWithItems: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" count: 127]); OTAssertEqual(bitString.bitStringLength, 127 * 8); } - (void)testInvalidBitStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x03\x00" count: 2] objectByParsingASN1DER], OFInvalidFormatException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x03\x01\x01" count: 3] objectByParsingASN1DER], OFInvalidFormatException); } - (void)testOutOfRangeBitStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x03\x89" "\x01\x01\x01\x01\x01\x01\x01\x01\x01" count: 11] objectByParsingASN1DER], OFOutOfRangeException); } - (void)testTruncatedBitStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x03\x01" count: 2] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testOctetString { OTAssertEqualObjects([[[OFData dataWithItems: "\x04\x0CHello World!" count: 14] objectByParsingASN1DER] octetStringValue], [OFData dataWithItems: "Hello World!" count: 12]); OTAssertEqualObjects( [[[OFData dataWithItems: "\x04\x81\x80xxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxx" count: 131] objectByParsingASN1DER] octetStringValue], [OFData dataWithItems: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" count: 128]); } - (void)testOutOfRangeOctetStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x04\x89" "\x01\x01\x01\x01\x01\x01\x01\x01\x01" count: 11] objectByParsingASN1DER], OFOutOfRangeException); } - (void)testTruncatedOctetStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x04\x01" count: 2] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testNull { OTAssertEqualObjects([[OFData dataWithItems: "\x05\x00" count: 2] objectByParsingASN1DER], [OFNull null]); } - (void)testInvalidNullFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x05\x01\x00" count: 3] objectByParsingASN1DER], OFInvalidFormatException); } - (void)testObjectIdentifier { OFArray *array; array = [[[OFData dataWithItems: "\x06\x01\x27" count: 3] objectByParsingASN1DER] subidentifiers]; OTAssertEqual(array.count, 2); OTAssertEqual([[array objectAtIndex: 0] unsignedLongLongValue], 0); OTAssertEqual([[array objectAtIndex: 1] unsignedLongLongValue], 39); array = [[[OFData dataWithItems: "\x06\x01\x4F" count: 3] objectByParsingASN1DER] subidentifiers]; OTAssertEqual(array.count, 2); OTAssertEqual([[array objectAtIndex: 0] unsignedLongLongValue], 1); OTAssertEqual([[array objectAtIndex: 1] unsignedLongLongValue], 39); array = [[[OFData dataWithItems: "\x06\x02\x88\x37" count: 4] objectByParsingASN1DER] subidentifiers]; OTAssertEqual(array.count, 2); OTAssertEqual([[array objectAtIndex: 0] unsignedLongLongValue], 2); OTAssertEqual([[array objectAtIndex: 1] unsignedLongLongValue], 999); array = [[[OFData dataWithItems: "\x06\x09\x2A\x86\x48\x86\xF7\x0D\x01\x01\x0B" count: 11] objectByParsingASN1DER] subidentifiers]; OTAssertEqual(array.count, 7); OTAssertEqual([[array objectAtIndex: 0] unsignedLongLongValue], 1); OTAssertEqual([[array objectAtIndex: 1] unsignedLongLongValue], 2); OTAssertEqual([[array objectAtIndex: 2] unsignedLongLongValue], 840); OTAssertEqual([[array objectAtIndex: 3] unsignedLongLongValue], 113549); OTAssertEqual([[array objectAtIndex: 4] unsignedLongLongValue], 1); OTAssertEqual([[array objectAtIndex: 5] unsignedLongLongValue], 1); OTAssertEqual([[array objectAtIndex: 6] unsignedLongLongValue], 11); } - (void)testInvalidObjectIdentifierFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x06\x01\x81" count: 3] objectByParsingASN1DER], OFInvalidFormatException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x06\x02\x80\x01" count: 4] objectByParsingASN1DER], OFInvalidFormatException); } - (void)testOutOfRangeObjectIdentifier { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x06\x0A\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" "\xFF\x7F" count: 12] objectByParsingASN1DER], OFOutOfRangeException); } - (void)testTruncatedObjectIdentifierFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x06\x02\x00" count: 3] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testEnumerated { OTAssertEqual([[[OFData dataWithItems: "\x0A\x00" count: 2] objectByParsingASN1DER] longLongValue], 0); OTAssertEqual([[[OFData dataWithItems: "\x0A\x01\x01" count: 3] objectByParsingASN1DER] longLongValue], 1); OTAssertEqual([[[OFData dataWithItems: "\x0A\x02\x01\x04" count: 4] objectByParsingASN1DER] longLongValue], 260); OTAssertEqual([[[OFData dataWithItems: "\x0A\x01\xFF" count: 3] objectByParsingASN1DER] longLongValue], -1); OTAssertEqual([[[OFData dataWithItems: "\x0A\x03\xFF\x00\x00" count: 5] objectByParsingASN1DER] longLongValue], -65536); OTAssertEqual((unsigned long long)[[[OFData dataWithItems: "\x0A\x09\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" count: 11] objectByParsingASN1DER] longLongValue], ULLONG_MAX); } - (void)testInvalidEnumeratedFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x0A\x02\x00\x00" count: 4] objectByParsingASN1DER], OFInvalidFormatException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x0A\x02\x00\x7F" count: 4] objectByParsingASN1DER], OFInvalidFormatException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x0A\x02\xFF\x80" count: 4] objectByParsingASN1DER], OFInvalidFormatException); } - (void)testOutOfRangeEnumeratedFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x0A\x09\x01" "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" count: 11] objectByParsingASN1DER], OFOutOfRangeException); } - (void)testTruncatedEnumeratedFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x0A\x02\x00" count: 3] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testUTF8String { OTAssertEqualObjects( [[OFData dataWithItems: "\x0C\x0EHällo Wörld!" count: 16] objectByParsingASN1DER], @"Hällo Wörld!"); OTAssertEqualObjects( [[OFData dataWithItems: "\x0C\x81\x80xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxx" count: 131] objectByParsingASN1DER], @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); } - (void)testOutOfRangeUTF8StringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x0C\x89" "\x01\x01\x01\x01\x01\x01\x01\x01\x01" count: 11] objectByParsingASN1DER], OFOutOfRangeException); } - (void)testTruncatedUTF8StringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x0C\x01" count: 2] objectByParsingASN1DER], OFTruncatedDataException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x0C\x83\x01\x01" count: 4] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testInvalidUTF8StringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x0C\x81\x7F" count: 3] objectByParsingASN1DER], OFInvalidFormatException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x0C\x82\x00\x80xxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxx" count: 132] objectByParsingASN1DER], OFInvalidFormatException); } - (void)testSequence { OFArray *array; array = [[OFData dataWithItems: "\x30\x00" count: 2] objectByParsingASN1DER]; OTAssertTrue([array isKindOfClass: [OFArray class]]); OTAssertEqual(array.count, 0); array = [[OFData dataWithItems: "\x30\x09\x02\x01\x7B\x0C\x04Test" count: 11] objectByParsingASN1DER]; OTAssertTrue([array isKindOfClass: [OFArray class]]); OTAssertEqual(array.count, 2); OTAssertEqual([[array objectAtIndex: 0] longLongValue], 123); OTAssertEqualObjects([array objectAtIndex: 1], @"Test"); } - (void)testTruncatedSequenceFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x30\x01" count: 2] objectByParsingASN1DER], OFTruncatedDataException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x30\x04\x02\x01\x01\x00\x00" count: 7] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testSet { OFSet *set; set = [[OFData dataWithItems: "\x31\x00" count: 2] objectByParsingASN1DER]; OTAssertTrue([set isKindOfClass: [OFSet class]]); OTAssertEqual(set.count, 0); set = [[OFData dataWithItems: "\x31\x09\x02\x01\x7B\x0C\x04Test" count: 11] objectByParsingASN1DER]; OTAssertTrue([set isKindOfClass: [OFSet class]]); OTAssertEqual(set.count, 2); OTAssertEqualObjects(set, ([OFSet setWithObjects: [OFNumber numberWithLongLong: 123], @"Test", nil])); } - (void)testInvalidSetFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x31\x06\x02\x01\x02\x02\x01\x01" count: 8] objectByParsingASN1DER], OFInvalidFormatException); } - (void)testTruncatedSetFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x31\x01" count: 2] objectByParsingASN1DER], OFTruncatedDataException); OTAssertThrowsSpecific( [[OFData dataWithItems: "\x31\x04\x02\x01\x01\x00\x00" count: 7] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testNumericString { OTAssertEqualObjects([[[OFData dataWithItems: "\x12\x0B" "12345 67890" count: 13] objectByParsingASN1DER] numericStringValue], @"12345 67890"); OTAssertEqualObjects([[[OFData dataWithItems: "\x12\x81\x80" "000000000000000000000000000000000000" "000000000000000000000000000000000000000000000000000" "00000000000000000000000000000000000000000" count: 131] objectByParsingASN1DER] numericStringValue], @"00000000000000000000000000000000000000000000000000000000000000000" @"000000000000000000000000000000000000000000000000000000000000000"); } - (void)testInvalidNumericStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x12\x02." count: 4] objectByParsingASN1DER], OFInvalidEncodingException); } - (void)testOutOfRangeNumericStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x12\x89" "\x01\x01\x01\x01\x01\x01\x01\x01\x01" count: 11] objectByParsingASN1DER], OFOutOfRangeException); } - (void)testTruncatedNumericStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x12\x01" count: 2] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testPrintableString { OTAssertEqualObjects([[[OFData dataWithItems: "\x13\x0CHello World." count: 14] objectByParsingASN1DER] printableStringValue], @"Hello World."); OTAssertEqualObjects([[[OFData dataWithItems: "\x13\x81\x80 '()+,-./:=?abcdefghijklmnopqrstuvwxyzA" "BCDEFGHIJKLMNOPQRSTUVWXYZ '()+,-./:=?abcdefghijklmn" "opqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" count: 131] objectByParsingASN1DER] printableStringValue], @" '()+,-./:=?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ " @"'()+,-./:=?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); } - (void)testInvalidPrintableStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x13\x02;" count: 4] objectByParsingASN1DER], OFInvalidEncodingException); } - (void)testOutOfRangePrintableStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x13\x89" "\x01\x01\x01\x01\x01\x01\x01\x01\x01" count: 11] objectByParsingASN1DER], OFOutOfRangeException); } - (void)testTruncatedPrintableStringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x13\x01" count: 2] objectByParsingASN1DER], OFTruncatedDataException); } - (void)testIA5String { OTAssertEqualObjects([[[OFData dataWithItems: "\x16\x0CHello World!" count: 14] objectByParsingASN1DER] IA5StringValue], @"Hello World!"); OTAssertEqualObjects([[[OFData dataWithItems: "\x16\x81\x80xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" count: 131] objectByParsingASN1DER] IA5StringValue], @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); } - (void)testInvalidIA5StringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x16\x02ä" count: 4] objectByParsingASN1DER], OFInvalidEncodingException); } - (void)testOutOfRangeIA5StringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x16\x89" "\x01\x01\x01\x01\x01\x01\x01\x01\x01" count: 11] objectByParsingASN1DER], OFOutOfRangeException); } - (void)testTruncatedIA5StringFails { OTAssertThrowsSpecific( [[OFData dataWithItems: "\x16\x01" count: 2] objectByParsingASN1DER], OFTruncatedDataException); } @end |
Added tests/OFASN1DERRepresentationTests.m version [43484abb98].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 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 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 | /* * Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * 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. */ #include "config.h" #import "ObjFW.h" #import "ObjFWTest.h" @interface OFASN1DERRepresentationTests: OTTestCase @end @implementation OFASN1DERRepresentationTests - (void)testBitString { OFData *data; data = [OFData dataWithItems: "\xFF\x00\xF8" count: 3]; OTAssertEqualObjects([[OFASN1BitString bitStringWithBitString: data length: 21] ASN1DERRepresentation], [OFData dataWithItems: "\x03\x04\x03\xFF\x00\xF8" count: 6]); data = [OFData dataWithItems: "abcdefäöü" count: 12]; OTAssertEqualObjects([[OFASN1BitString bitStringWithBitString: data length: 12 * 8] ASN1DERRepresentation], [OFData dataWithItems: "\x03\x0D\x00" "abcdefäöü" count: 15]); OTAssertEqualObjects([[OFASN1BitString bitStringWithBitString: [OFData data] length: 0] ASN1DERRepresentation], [OFData dataWithItems: "\x03\x01\x00" count: 3]); } - (void)testInteger { OTAssertEqualObjects( [[OFNumber numberWithBool: false] ASN1DERRepresentation], [OFData dataWithItems: "\x01\x01\x00" count: 3]); OTAssertEqualObjects( [[OFNumber numberWithBool: true] ASN1DERRepresentation], [OFData dataWithItems: "\x01\x01\xFF" count: 3]); } - (void)testNull { OTAssertEqualObjects([[OFNull null] ASN1DERRepresentation], [OFData dataWithItems: "\x05\x00" count: 2]); } @end |