@@ -22,21 +22,21 @@ #import "OFInvalidArgumentException.h" @implementation OFASN1IA5String @synthesize IA5StringValue = _IA5StringValue; -+ (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 { - _IA5StringValue = [stringValue copy]; + _IA5StringValue = [string copy]; } @catch (id e) { [self release]; @throw e; } @@ -47,30 +47,30 @@ tagNumber: (of_asn1_tag_number_t)tagNumber constructed: (bool)constructed DEREncodedContents: (OFData *)DEREncodedContents { void *pool = objc_autoreleasePoolPush(); - OFString *IA5StringValue; + OFString *IA5String; @try { if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL || tagNumber != OF_ASN1_TAG_NUMBER_IA5_STRING || constructed) @throw [OFInvalidArgumentException exception]; if (DEREncodedContents.itemSize != 1) @throw [OFInvalidArgumentException exception]; - IA5StringValue = [OFString + IA5String= [OFString stringWithCString: DEREncodedContents.items encoding: OF_STRING_ENCODING_ASCII length: DEREncodedContents.count]; } @catch (id e) { [self release]; @throw e; } - self = [self initWithStringValue: IA5StringValue]; + self = [self initWithString: IA5String]; objc_autoreleasePoolPop(pool); return self; }