diff --git a/MASFoundation/Classes/_private_/categories/NSMutableData+MASASN1Helper.h b/MASFoundation/Classes/_private_/categories/NSMutableData+MASASN1Helper.h index 2ec10b7d..e54109e0 100644 --- a/MASFoundation/Classes/_private_/categories/NSMutableData+MASASN1Helper.h +++ b/MASFoundation/Classes/_private_/categories/NSMutableData+MASASN1Helper.h @@ -58,7 +58,7 @@ @param value NSString of UTF8 string */ -- (void)appendUTF8String:(NSString *)value; +- (void)appendUTF8StringASN1:(NSString *)value; @@ -67,6 +67,6 @@ @param data NSData of Bit string */ -- (void)appendBITString:(NSData *)data; +- (void)appendBITStringASN1:(NSData *)data; @end diff --git a/MASFoundation/Classes/_private_/categories/NSMutableData+MASASN1Helper.m b/MASFoundation/Classes/_private_/categories/NSMutableData+MASASN1Helper.m index 41eef832..97f6f4ef 100644 --- a/MASFoundation/Classes/_private_/categories/NSMutableData+MASASN1Helper.m +++ b/MASFoundation/Classes/_private_/categories/NSMutableData+MASASN1Helper.m @@ -18,7 +18,7 @@ - (void)appendSubjectItem:(uint8_t[])attribute size:(int)size value:(NSString *) { NSMutableData *subjectItem = [[NSMutableData alloc] initWithCapacity:128]; [subjectItem appendBytes:attribute length:size]; - [subjectItem appendUTF8String:value]; + [subjectItem appendUTF8StringASN1:value]; [subjectItem encloseWith:0x30]; // Sequence tag [subjectItem encloseWith:0x31]; // Set tag @@ -68,14 +68,14 @@ + (NSData *)buildPublicKeyForASN1:(NSData *)publicKeyBits [publicKeyASN encloseWith:0x30]; // Sequence tag [publicKeyASN prependByte:0x00]; - [publicKeyData appendBITString:publicKeyASN]; + [publicKeyData appendBITStringASN1:publicKeyASN]; [publicKeyData encloseWith:0x30]; // Sequence tag return publicKeyData; } -- (void)appendUTF8String:(NSString *)value +- (void)appendUTF8StringASN1:(NSString *)value { // // UTF8STRING type @@ -87,7 +87,7 @@ - (void)appendUTF8String:(NSString *)value } -- (void)appendBITString:(NSData *)data +- (void)appendBITStringASN1:(NSData *)data { // // BIT string diff --git a/MASFoundation/Classes/_private_/services/security/MASSecurityService.m b/MASFoundation/Classes/_private_/services/security/MASSecurityService.m index a3121fbd..a48a63a2 100644 --- a/MASFoundation/Classes/_private_/services/security/MASSecurityService.m +++ b/MASFoundation/Classes/_private_/services/security/MASSecurityService.m @@ -188,7 +188,7 @@ - (NSString *)generateCSRWithUsername:(NSString *)userName publicKeyBits:(NSData uint8_t zero = 0; [signdata appendBytes:&zero length:1]; [signdata appendBytes:signature length:signature_len]; - [certificateSigningRequest appendBITString:signdata]; + [certificateSigningRequest appendBITStringASN1:signdata]; [certificateSigningRequest encloseWith:0x30];