ObjFW  Diff

Differences From Artifact [92cd83c978]:

To Artifact [53a8c373a7]:


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
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







-
+

-
+


-
+




-
+














-
+









-
+







-
+







#import "OFString.h"

#import "OFInvalidArgumentException.h"

@implementation OFASN1UTF8String
@synthesize UTF8StringValue = _UTF8StringValue;

+ (instancetype)stringWithStringValue: (OFString *)stringValue
+ (instancetype)stringWithString: (OFString *)string
{
	return [[[self alloc] initWithStringValue: stringValue] autorelease];
	return [[[self alloc] initWithString: string] autorelease];
}

- (instancetype)initWithStringValue: (OFString *)stringValue
- (instancetype)initWithString: (OFString *)string
{
	self = [super init];

	@try {
		_UTF8StringValue = [stringValue copy];
		_UTF8StringValue = [string copy];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

- (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass
		       tagNumber: (of_asn1_tag_number_t)tagNumber
		     constructed: (bool)constructed
	      DEREncodedContents: (OFData *)DEREncodedContents
{
	void *pool = objc_autoreleasePoolPush();
	OFString *UTF8StringValue;
	OFString *UTF8String;

	@try {
		if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL ||
		    tagNumber != OF_ASN1_TAG_NUMBER_UTF8_STRING || constructed)
			@throw [OFInvalidArgumentException exception];

		if (DEREncodedContents.itemSize != 1)
			@throw [OFInvalidArgumentException exception];

		UTF8StringValue = [OFString
		UTF8String = [OFString
		    stringWithUTF8String: DEREncodedContents.items
				  length: DEREncodedContents.count];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	self = [self initWithStringValue: UTF8StringValue];
	self = [self initWithString: UTF8String];

	objc_autoreleasePoolPop(pool);

	return self;
}

- (instancetype)init