Update to work with OFString changes
This commit is contained in:
parent
22ce8a2a8c
commit
bb74e6cfd8
2 changed files with 46 additions and 3 deletions
|
@ -67,5 +67,8 @@
|
||||||
- (OFString*)X509_stringFromASN1String: (ASN1_STRING*)str;
|
- (OFString*)X509_stringFromASN1String: (ASN1_STRING*)str;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface X509OID: OFString {}
|
@interface X509OID: OFObject <OFCopying>
|
||||||
|
{
|
||||||
|
OFString *string;
|
||||||
|
}
|
||||||
@end
|
@end
|
||||||
|
|
|
@ -398,7 +398,8 @@
|
||||||
toSize: bufferLength];
|
toSize: bufferLength];
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = [X509OID stringWithUTF8String: buffer];
|
ret = [[[X509OID alloc]
|
||||||
|
initWithUTF8String: buffer] autorelease];
|
||||||
} @finally {
|
} @finally {
|
||||||
[self freeMemory: buffer];
|
[self freeMemory: buffer];
|
||||||
}
|
}
|
||||||
|
@ -425,10 +426,49 @@
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@implementation X509OID
|
@implementation X509OID
|
||||||
|
- initWithUTF8String: (const char*) str
|
||||||
|
{
|
||||||
|
self = [self init];
|
||||||
|
|
||||||
|
@try {
|
||||||
|
string = [[OFString alloc] initWithUTF8String: str];
|
||||||
|
} @catch (id e) {
|
||||||
|
[self release];
|
||||||
|
@throw e;
|
||||||
|
}
|
||||||
|
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)dealloc
|
||||||
|
{
|
||||||
|
[string release];
|
||||||
|
[super dealloc];
|
||||||
|
}
|
||||||
|
|
||||||
- (OFString*)description
|
- (OFString*)description
|
||||||
{
|
{
|
||||||
char tmp[1024];
|
char tmp[1024];
|
||||||
OBJ_obj2txt(tmp, sizeof(tmp), OBJ_txt2obj(s->cString, 1), 0);
|
OBJ_obj2txt(tmp, sizeof(tmp), OBJ_txt2obj([string UTF8String], 1), 0);
|
||||||
return [OFString stringWithUTF8String: tmp];
|
return [OFString stringWithUTF8String: tmp];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (BOOL)isEqual: (id)object
|
||||||
|
{
|
||||||
|
if (([object isKindOfClass: [OFString class]]) ||
|
||||||
|
([object isKindOfClass: [X509OID class]]))
|
||||||
|
return [object isEqual: string];
|
||||||
|
|
||||||
|
return NO;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (uint32_t)hash
|
||||||
|
{
|
||||||
|
return [string hash];
|
||||||
|
}
|
||||||
|
|
||||||
|
- copy
|
||||||
|
{
|
||||||
|
return [self retain];
|
||||||
|
}
|
||||||
@end
|
@end
|
||||||
|
|
Reference in a new issue