Refactor CommonDigest Hooks

Updates #2.

testapp/CryptoTester.m

@@ -43,15 +43,6 @@ + (void) testCommonDigest {
     CC_MD5_Final(dataOut, &ctx);
 
     CC_MD5(testData, 16, dataOut);
-
-    CC_SHA512_CTX ctx2;
-    unsigned char dataOut2[CC_SHA512_DIGEST_LENGTH];
-
-    CC_SHA512_Init(&ctx2);
-    CC_SHA512_Update(&ctx2, testData, 16);
-    CC_SHA512_Final(dataOut2, &ctx2);
-
-    CC_SHA512(testData, 16, dataOut2);
 }
 
 

tracer/CallStackInspector.h

@@ -8,6 +8,7 @@
 // We don't want to hook internal calls, only what the App is directly calling.
 // So we use this to figure out who called the function we're hooking.
 + (BOOL) wasDirectlyCalledByApp;
++ (BOOL) wasCalledByAppAtIndex:(NSUInteger)index;
 
 
 @end

tracer/CallStackInspector.m

@@ -4,19 +4,24 @@
 @implementation CallStackInspector
 
 
-+ (BOOL) wasDirectlyCalledByApp {
+
++ (BOOL) wasCalledByAppAtIndex:(NSUInteger)index {
     //NSLog(@"%@",[NSThread callStackSymbols]);
     NSString *appProcessName = [[NSProcessInfo processInfo] processName];
     NSArray *callStack = [NSThread callStackSymbols];
 
     // Not ideal: Check if the app's process name is close enough in the call stack
-    NSRange caller2 = [[callStack objectAtIndex:2] rangeOfString: appProcessName];
+    NSRange callerAtIndex = [[callStack objectAtIndex:index] rangeOfString: appProcessName];
 
-    if ((caller2.location == NSNotFound)) {
+    if ((callerAtIndex.location == NSNotFound)) {
         return false;
     }
     return true;
 }
 
++ (BOOL) wasDirectlyCalledByApp {
+	return [self wasCalledByAppAtIndex:2];
+}
+
 
 @end

tracer/Makefile

@@ -3,7 +3,7 @@
 include theos/makefiles/common.mk
 
 TWEAK_NAME = introspy
-introspy_FILES = Tweak.xmi CallTracer.m hooks/CC_MD5Hooks.m hooks/CC_SHAHooks.m hooks/KeychainHooks.m hooks/DelegateProxies.m PlistObjectConverter.m hooks/CCKeyDerivationPBKDFHooks.m CallStackInspector.m SQLiteStorage.m hooks/SecurityHooks.m hooks/CCCryptorHooks.m hooks/CCHmacHooks.m
+introspy_FILES = Tweak.xmi CallTracer.m hooks/CommonDigestHooks.m hooks/KeychainHooks.m hooks/DelegateProxies.m PlistObjectConverter.m hooks/CCKeyDerivationPBKDFHooks.m CallStackInspector.m SQLiteStorage.m hooks/SecurityHooks.m hooks/CCCryptorHooks.m hooks/CCHmacHooks.m
 introspy_LIBRARIES = sqlite3 
 
 introspy_FRAMEWORKS = UIKit, Foundation, Security

tracer/Tweak.xmi

@@ -15,8 +15,7 @@ static NSString *preferenceFilePath = @"/private/var/mobile/Library/Preferences/
 #import "hooks/CCCryptorHooks.h"
 #import "hooks/CCHmacHooks.h"
 #import "hooks/CCKeyDerivationPBKDFHooks.h"
-#import "hooks/CC_MD5Hooks.h"
-#import "hooks/CC_SHAHooks.h"
+#import "hooks/CommonDigestHooks.h"
 
 
 
@@ -127,8 +126,7 @@ static void traceURISchemes() {
             [CCCryptorHooks enableHooks];
             [CCHmacHooks enableHooks];
             [CCKeyDerivationPBKDFHooks enableHooks];
-            [CC_MD5Hooks enableHooks];
-            [CC_SHAHooks enableHooks];
+            [CommonDigestHooks enableHooks];
         }
         if (getBoolFromPreferences(preferences, @"SecurityHooks")) {
             [SecurityHooks enableHooks];