ObjFW  Check-in [d3207b2a3d]

Overview
Comment:OFASN1*: Add -[description]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d3207b2a3de4623db64547687fcba5e79b8daa8815f3858a462ad6d7982b0805
User & Date: js on 2018-10-13 22:58:53
Other Links: manifest | tags
Context
2018-10-13
23:51
Add ASN.1 bit string type check-in: 0d746a1aac user: js tags: trunk
22:58
OFASN1*: Add -[description] check-in: d3207b2a3d user: js tags: trunk
22:43
Add more ASN.1 string types (IA5 and octet string) check-in: 6410235ae3 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/OFASN1Boolean.m from [32df9da0af] to [c9cf50048c].

︙︙
15
16
17
18
19
20
21

22
23
24
25
26
27
28

 * file.
 */

#include "config.h"

#import "OFASN1Boolean.h"
#import "OFData.h"


#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"

@implementation OFASN1Boolean
@synthesize booleanValue = _booleanValue;









>








15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

 * file.
 */

#include "config.h"

#import "OFASN1Boolean.h"
#import "OFData.h"
#import "OFString.h"

#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"

@implementation OFASN1Boolean
@synthesize booleanValue = _booleanValue;
︙︙
55
56
57
58
59
60
61







62

	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}







@end








>
>
>
>
>
>
>


56
57
58
59
60
61
62
63
64
65
66
67
68
69
70

	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

- (OFString *)description
{
	return (_booleanValue
	    ? @"<OFASN1Boolean: true>"
	    : @"<OFASN1Boolean: false>");
}
@end

Modified src/OFASN1IA5String.m from [2c948a64a3] to [25dbe148e7].

︙︙
61
62
63
64
65
66
67






68

	[super dealloc];
}

- (OFString *)stringValue
{
	return [self IA5StringValue];
}






@end








>
>
>
>
>
>


61
62
63
64
65
66
67
68
69
70
71
72
73
74

	[super dealloc];
}

- (OFString *)stringValue
{
	return [self IA5StringValue];
}

- (OFString *)description
{
	return [OFString stringWithFormat: @"<OFASN1IA5String: %@>",
					   _IA5StringValue];
}
@end

Modified src/OFASN1Integer.m from [17624dc32d] to [a8f304767b].

︙︙
15
16
17
18
19
20
21

22
23
24
25
26
27
28

 * file.
 */

#include "config.h"

#import "OFASN1Integer.h"
#import "OFData.h"


#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfRangeException.h"

@implementation OFASN1Integer
@synthesize integerValue = _integerValue;








>








15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

 * file.
 */

#include "config.h"

#import "OFASN1Integer.h"
#import "OFData.h"
#import "OFString.h"

#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfRangeException.h"

@implementation OFASN1Integer
@synthesize integerValue = _integerValue;
︙︙
69
70
71
72
73
74
75






76

	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}






@end








>
>
>
>
>
>


70
71
72
73
74
75
76
77
78
79
80
81
82
83

	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

- (OFString *)description
{
	return [OFString stringWithFormat: @"<OFASN1Integer: %jd>",
					   _integerValue];
}
@end

Modified src/OFASN1Null.m from [94777af6ac] to [f37dc7e287].

︙︙
15
16
17
18
19
20
21

22
23
24
25
26
27
28

 * file.
 */

#include "config.h"

#import "OFASN1Null.h"
#import "OFData.h"


#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"

@implementation OFASN1Null
- (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass
		       tagNumber: (of_asn1_tag_number_t)tagNumber








>








15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

 * file.
 */

#include "config.h"

#import "OFASN1Null.h"
#import "OFData.h"
#import "OFString.h"

#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"

@implementation OFASN1Null
- (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass
		       tagNumber: (of_asn1_tag_number_t)tagNumber
︙︙
44
45
46
47
48
49
50





51

	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}





@end








>
>
>
>
>


45
46
47
48
49
50
51
52
53
54
55
56
57

	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

- (OFString *)description
{
	return @"<OFASN1Null>";
}
@end

Modified src/OFASN1OctetString.m from [7e32247b16] to [899f633e76].

︙︙
15
16
17
18
19
20
21

22
23
24
25
26
27
28

 * file.
 */

#include "config.h"

#import "OFASN1OctetString.h"
#import "OFData.h"


#import "OFInvalidArgumentException.h"

@implementation OFASN1OctetString
- (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass
		       tagNumber: (of_asn1_tag_number_t)tagNumber
		     constructed: (bool)constructed








>








15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

 * file.
 */

#include "config.h"

#import "OFASN1OctetString.h"
#import "OFData.h"
#import "OFString.h"

#import "OFInvalidArgumentException.h"

@implementation OFASN1OctetString
- (instancetype)initWithTagClass: (of_asn1_tag_class_t)tagClass
		       tagNumber: (of_asn1_tag_number_t)tagNumber
		     constructed: (bool)constructed
︙︙
46
47
48
49
50
51
52






53

	return self;
}

- (OFData *)octetStringValue
{
	return _DEREncodedContents;
}






@end








>
>
>
>
>
>


47
48
49
50
51
52
53
54
55
56
57
58
59
60

	return self;
}

- (OFData *)octetStringValue
{
	return _DEREncodedContents;
}

- (OFString *)description
{
	return [OFString stringWithFormat: @"<OFASN1OctetString: %@>",
					   _DEREncodedContents];
}
@end

Modified src/OFASN1UTF8String.m from [6af5a5eda9] to [245e438871].

︙︙
60
61
62
63
64
65
66






67

	[super dealloc];
}

- (OFString *)stringValue
{
	return [self UTF8StringValue];
}






@end








>
>
>
>
>
>


60
61
62
63
64
65
66
67
68
69
70
71
72
73

	[super dealloc];
}

- (OFString *)stringValue
{
	return [self UTF8StringValue];
}

- (OFString *)description
{
	return [OFString stringWithFormat: @"<OFASN1UTF8String: %@>",
					   _UTF8StringValue];
}
@end

Modified src/OFASN1Value.m from [3f613b5ac9] to [32a8246549].

︙︙
15
16
17
18
19
20
21

22
23
24
25
26
27
28

 * file.
 */

#include "config.h"

#import "OFASN1Value.h"
#import "OFData.h"


#import "OFInvalidFormatException.h"

@implementation OFASN1Value
@synthesize tagClass = _tagClass, tagNumber = _tagNumber;
@synthesize constructed = _constructed;
@synthesize DEREncodedContents = _DEREncodedContents;








>








15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

 * 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;
︙︙
111
112
113
114
115
116
117













118

	return hash;
}

- (id)copy
{
	return [self retain];
}













@end








>
>
>
>
>
>
>
>
>
>
>
>
>


112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132

	return hash;
}

- (id)copy
{
	return [self retain];
}

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