removed old copy past issue

fkie-cad · Nov 21, 2022 · 4688b21 · 4688b21
1 parent c0d9c1b
commit 4688b21
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/agent/android/openssl_boringssl_android.ts b/agent/android/openssl_boringssl_android.ts
@@ -17,7 +17,7 @@ export class OpenSSL_BoringSSL_Android extends OpenSSL_BoringSSL {
 
     install_tls_keys_callback_hook (){
 
-        OpenSSL_BoringSSL.SSL_CTX_set_keylog_callback = ObjC.available ? new NativeFunction(this.addresses["SSL_CTX_set_info_callback"], "void", ["pointer", "pointer"]) : new NativeFunction(this.addresses["SSL_CTX_set_keylog_callback"], "void", ["pointer", "pointer"])    
+        OpenSSL_BoringSSL.SSL_CTX_set_keylog_callback = new NativeFunction(this.addresses["SSL_CTX_set_keylog_callback"], "void", ["pointer", "pointer"])  
 
         Interceptor.attach(this.addresses["SSL_new"],
         {

diff --git a/create_standalone_release/friTap_release_template.py b/create_standalone_release/friTap_release_template.py
@@ -100,7 +100,7 @@ def temp_fifo():
         print(f'Failed to create FIFO: {e}')
 
 
-def ssl_log(app, pcap_name=None, verbose=False, spawn=False, keylog=False, enable_spawn_gating=False, mobile=False, live=False, environment_file=None, debug_mode=False,full_capture=False, socket_trace=False, host=False, offsets=None, debug_output=False):
+def ssl_log(app, pcap_name=None, verbose=False, spawn=False, keylog=False, enable_spawn_gating=False, mobile=False, live=False, environment_file=None, debug_mode=False,full_capture=False, socket_trace=False, host=False, offsets=None, debug_output=False, experimental=False):
     global debug
     debug = debug_mode
 
@@ -220,6 +220,7 @@ def instrument(process):
             if offsets_data is not None:
                 print(offsets_data)
                 script_string = script_string.replace('"{OFFSETS}"', offsets_data)
+                script_string = script_string.replace('"{EXPERIMENTAL}"', "true" if (experimental) else "false")
 
             script = process.create_script(script_string, runtime=runtime)
 
@@ -380,6 +381,8 @@ def main():
                       help="executable/app whose SSL calls to log")
     args.add_argument("--offsets", required=False, metavar="<offsets.json>",
                       help="Provide custom offsets for all hooked functions inside a JSON file or a json string containing all offsets. For more details see our example json (offsets_example.json)")
+    args.add_argument("--experimental", required=False,
+                      help="Activates all existing experimental feature (see documentation for more information)")
     parsed = parser.parse_args()
 
     if parsed.full_capture and parsed.pcap is None:
@@ -389,9 +392,10 @@ def main():
     try:
         print("Start logging")
         ssl_log(parsed.exec, parsed.pcap, parsed.verbose,
-                parsed.spawn, parsed.keylog, parsed.enable_spawn_gating, parsed.mobile, parsed.live, parsed.environment, parsed.debug, parsed.full_capture, parsed.socket_tracing, parsed.host, parsed.offsets, parsed.debugoutput)
+                parsed.spawn, parsed.keylog, parsed.enable_spawn_gating, parsed.mobile, parsed.live, parsed.environment, parsed.debug, parsed.full_capture, parsed.socket_tracing, parsed.host, parsed.offsets, parsed.debugoutput,parsed.experimental)
 
     except Exception as ar:
+        print("[-] Uknown error:")
         print(ar)
 
     finally:

diff --git a/friTap/__init__.py b/friTap/__init__.py
@@ -2,5 +2,5 @@
 # -*- coding: utf-8 -*-
 
 __author__ = "Daniel Baier, Francois Egner, Max Ufer"
-__version__ = "1.0.7.4"
+__version__ = "1.0.8.0"
 debug = False # are we running in debug mode?