Remove duplicate ECC from method name

ameyapat · ameyapat · commit 13c37eb12f43 · 2025-11-14T16:17:32.000-08:00
diff --git a/IdentityCore/src/JWEResponse/MSIDJweResponse+EcdhAesGcm.m b/IdentityCore/src/JWEResponse/MSIDJweResponse+EcdhAesGcm.m
@@ -93,7 +93,7 @@ - (nullable NSDictionary *)decryptJweResponseWithPrivateStk:(nonnull SecKeyRef)p
     }
     
     // 3. Create key from server response
-    SecKeyRef serverKeyRef = [NSData createECCKeyFromEccJsonWebKey:epk error:error];
+    SecKeyRef serverKeyRef = [NSData createKeyFromEccJsonWebKey:epk error:error];
     
     if (!serverKeyRef)
     {
diff --git a/IdentityCore/src/util/NSData+MSIDEccSecKeyRef.h b/IdentityCore/src/util/NSData+MSIDEccSecKeyRef.h
@@ -29,10 +29,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface NSData (MSIDEccSecKeyRef)
 
-+ (nullable SecKeyRef)createECCKeyFromEccJsonWebKey:(NSDictionary *)jsonWebKey
++ (nullable SecKeyRef)createKeyFromEccJsonWebKey:(NSDictionary *)jsonWebKey
                                               error:(NSError *_Nullable*_Nullable)error;
 
-- (nullable SecKeyRef)createECCKeyFromEccJsonWebKey:(NSError *_Nullable*_Nullable)error;
+- (nullable SecKeyRef)createKeyFromEccJsonWebKey:(NSError *_Nullable*_Nullable)error;
 
 @end
 
diff --git a/IdentityCore/src/util/NSData+MSIDEccSecKeyRef.m b/IdentityCore/src/util/NSData+MSIDEccSecKeyRef.m
@@ -28,7 +28,7 @@
 
 @implementation NSData (MSIDEccSecKeyRef)
 
-+ (nullable SecKeyRef)createECCKeyFromEccJsonWebKey:(nonnull NSDictionary *)jsonWebKey
++ (nullable SecKeyRef)createKeyFromEccJsonWebKey:(nonnull NSDictionary *)jsonWebKey
                                               error:(NSError * _Nullable __autoreleasing * _Nullable)error
 {
     if (!jsonWebKey[@"x"] || !jsonWebKey[@"y"])
@@ -46,10 +46,10 @@ + (nullable SecKeyRef)createECCKeyFromEccJsonWebKey:(nonnull NSDictionary *)json
     NSMutableData *keyData = [[NSMutableData alloc] initWithBytes:bytes length:sizeof(bytes)];
     [keyData appendData:[NSData msidDataFromBase64UrlEncodedString:jsonWebKey[@"x"]]];
     [keyData appendData:[NSData msidDataFromBase64UrlEncodedString:jsonWebKey[@"y"]]];
-    return [keyData createECCKeyFromEccJsonWebKey:error];
+    return [keyData createKeyFromEccJsonWebKey:error];
 }
 
-- (nullable SecKeyRef)createECCKeyFromEccJsonWebKey:(NSError * _Nullable __autoreleasing * _Nullable)error
+- (nullable SecKeyRef)createKeyFromEccJsonWebKey:(NSError * _Nullable __autoreleasing * _Nullable)error
 {
     NSDictionary *options = @{(id)kSecAttrKeyType: (id)kSecAttrKeyTypeECSECPrimeRandom,
                               (id)kSecAttrKeyClass: (id)kSecAttrKeyClassPublic,

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ - (nullable NSDictionary *)decryptJweResponseWithPrivateStk:(nonnull SecKeyRef)p`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`// 3. Create key from server response`
`96`		`- SecKeyRef serverKeyRef = [NSData createECCKeyFromEccJsonWebKey:epk error:error];`
	`96`	`+ SecKeyRef serverKeyRef = [NSData createKeyFromEccJsonWebKey:epk error:error];`
`97`	`97`
`98`	`98`	`if (!serverKeyRef)`
`99`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`
`29`	`29`	`@implementation NSData (MSIDEccSecKeyRef)`
`30`	`30`
`31`		`-+ (nullable SecKeyRef)createECCKeyFromEccJsonWebKey:(nonnull NSDictionary *)jsonWebKey`
	`31`	`++ (nullable SecKeyRef)createKeyFromEccJsonWebKey:(nonnull NSDictionary *)jsonWebKey`
`32`	`32`	`error:(NSError * _Nullable __autoreleasing * _Nullable)error`
`33`	`33`	`{`
`34`	`34`	`if (!jsonWebKey[@"x"] \|\| !jsonWebKey[@"y"])`
`@@ -46,10 +46,10 @@ + (nullable SecKeyRef)createECCKeyFromEccJsonWebKey:(nonnull NSDictionary *)json`
`46`	`46`	`NSMutableData *keyData = [[NSMutableData alloc] initWithBytes:bytes length:sizeof(bytes)];`
`47`	`47`	`[keyData appendData:[NSData msidDataFromBase64UrlEncodedString:jsonWebKey[@"x"]]];`
`48`	`48`	`[keyData appendData:[NSData msidDataFromBase64UrlEncodedString:jsonWebKey[@"y"]]];`
`49`		`- return [keyData createECCKeyFromEccJsonWebKey:error];`
	`49`	`+ return [keyData createKeyFromEccJsonWebKey:error];`
`50`	`50`	`}`
`51`	`51`
`52`		`-- (nullable SecKeyRef)createECCKeyFromEccJsonWebKey:(NSError * _Nullable __autoreleasing * _Nullable)error`
	`52`	`+- (nullable SecKeyRef)createKeyFromEccJsonWebKey:(NSError * _Nullable __autoreleasing * _Nullable)error`
`53`	`53`	`{`
`54`	`54`	`NSDictionary *options = @{(id)kSecAttrKeyType: (id)kSecAttrKeyTypeECSECPrimeRandom,`
`55`	`55`	`(id)kSecAttrKeyClass: (id)kSecAttrKeyClassPublic,`