Update one method for DRY

David Benko · David Benko · commit 42e0b9c198c4 · 2014-05-21T07:10:57.000-04:00
diff --git a/ObjectiveTLS/ObjectiveTLS.m b/ObjectiveTLS/ObjectiveTLS.m
@@ -292,13 +292,8 @@ - (NSData *)aesDecryptData:(NSData *)data rsaEncryptedKey:(NSData *)key iv:(NSDa
 }
 
 - (NSString *)aesStringDecryptData:(NSData *)data rsaEncryptedKey:(NSData *)key iv:(NSData *)iv error:(NSError **)error{
-    NSData *secret = [self RSADecryptData:key];
-    if (secret) {
-        NSData *decryptedData = [self aesDecryptData:data key:secret iv:iv error:error];
-        secret = nil;
-        return [[NSString alloc]initWithData:decryptedData encoding:kStringEncoding];
-    }
-    return nil;
+	NSData *decryptedData = [self aesDecryptData:data rsaEncryptedKey:key iv:iv error:error];
+	return [[NSString alloc]initWithData:decryptedData encoding:kStringEncoding];
 }
 
 #pragma mark - Memory Management

Original file line number	Diff line number	Diff line change
`@@ -292,13 +292,8 @@ - (NSData )aesDecryptData:(NSData )data rsaEncryptedKey:(NSData *)key iv:(NSDa`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`- (NSString )aesStringDecryptData:(NSData )data rsaEncryptedKey:(NSData )key iv:(NSData )iv error:(NSError **)error{`
`295`		`- NSData *secret = [self RSADecryptData:key];`
`296`		`- if (secret) {`
`297`		`- NSData *decryptedData = [self aesDecryptData:data key:secret iv:iv error:error];`
`298`		`- secret = nil;`
`299`		`- return [[NSString alloc]initWithData:decryptedData encoding:kStringEncoding];`
`300`		`- }`
`301`		`- return nil;`
	`295`	`+ NSData *decryptedData = [self aesDecryptData:data rsaEncryptedKey:key iv:iv error:error];`
	`296`	`+ return [[NSString alloc]initWithData:decryptedData encoding:kStringEncoding];`
`302`	`297`	`}`
`303`	`298`
`304`	`299`	`#pragma mark - Memory Management`