update patches for 16.1.7

This commit is contained in:
Ylarod
2023-11-20 18:46:39 +08:00
parent 33b7ab91af
commit 1a61c79dbb
10 changed files with 34 additions and 36 deletions

View File

@@ -1,4 +1,4 @@
From 2ee45f8d8bd12ae7bb58bc9d792241dd10e52c9d Mon Sep 17 00:00:00 2001 From 6819aa2d3f2a6bbde8d31566b3dff6dd085776fc Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Tue, 18 Jul 2023 15:51:29 +0800 Date: Tue, 18 Jul 2023 15:51:29 +0800
Subject: [PATCH 01/10] Florida: string_frida_rpc Subject: [PATCH 01/10] Florida: string_frida_rpc
@@ -54,5 +54,5 @@ index 3695ba8c..664bd19c 100644
var request_id_value = rpc_message.get_element (1); var request_id_value = rpc_message.get_element (1);
-- --
2.34.1 2.39.3 (Apple Git-145)

View File

@@ -1,4 +1,4 @@
From 9c54a36d6cf608cbe24c9771b4a4f2b3774bebd0 Mon Sep 17 00:00:00 2001 From 3abc151103db6b7ac3c971a5dfc5f90299d3932f Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Tue, 18 Jul 2023 15:52:56 +0800 Date: Tue, 18 Jul 2023 15:52:56 +0800
Subject: [PATCH 02/10] Florida: re_frida_server Subject: [PATCH 02/10] Florida: re_frida_server
@@ -8,7 +8,7 @@ Subject: [PATCH 02/10] Florida: re_frida_server
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/server/server.vala b/server/server.vala diff --git a/server/server.vala b/server/server.vala
index f96c7ca5..dc6ff452 100644 index 525c145e..f7547819 100644
--- a/server/server.vala --- a/server/server.vala
+++ b/server/server.vala +++ b/server/server.vala
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@@ -29,5 +29,5 @@ index f96c7ca5..dc6ff452 100644
#if DARWIN #if DARWIN
-- --
2.34.1 2.39.3 (Apple Git-145)

View File

@@ -1,4 +1,4 @@
From c809d93142d30299ab33aa3b125fc8096e280d6c Mon Sep 17 00:00:00 2001 From 1505aff0b6c01c5e0faa4a6b56bbb04a78068b89 Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Tue, 18 Jul 2023 15:57:19 +0800 Date: Tue, 18 Jul 2023 15:57:19 +0800
Subject: [PATCH 03/10] Florida: frida_agent_so Subject: [PATCH 03/10] Florida: frida_agent_so
@@ -29,5 +29,5 @@ index 50470ac8..64245792 100644
AgentMode.INSTANCED, AgentMode.INSTANCED,
tempdir); tempdir);
-- --
2.34.1 2.39.3 (Apple Git-145)

View File

@@ -1,4 +1,4 @@
From 1099700c48f5cf48f76792b929d5916be4a98e04 Mon Sep 17 00:00:00 2001 From 36f933383018c359a04d5772806d88ba686f4067 Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Tue, 18 Jul 2023 16:02:50 +0800 Date: Tue, 18 Jul 2023 16:02:50 +0800
Subject: [PATCH 04/10] Florida: symbol_frida_agent_main Subject: [PATCH 04/10] Florida: symbol_frida_agent_main
@@ -7,14 +7,14 @@ Subject: [PATCH 04/10] Florida: symbol_frida_agent_main
src/agent-container.vala | 2 +- src/agent-container.vala | 2 +-
src/anti-anti-frida.py | 27 +++++++++++++++++++++++++++ src/anti-anti-frida.py | 27 +++++++++++++++++++++++++++
src/darwin/darwin-host-session.vala | 2 +- src/darwin/darwin-host-session.vala | 2 +-
src/embed-agent.sh | 10 ++++++++++ src/embed-agent.sh | 8 ++++++++
src/freebsd/freebsd-host-session.vala | 2 +- src/freebsd/freebsd-host-session.vala | 2 +-
src/linux/linux-host-session.vala | 2 +- src/linux/linux-host-session.vala | 2 +-
src/qnx/qnx-host-session.vala | 2 +- src/qnx/qnx-host-session.vala | 2 +-
src/windows/windows-host-session.vala | 2 +- src/windows/windows-host-session.vala | 2 +-
tests/test-agent.vala | 2 +- tests/test-agent.vala | 2 +-
tests/test-injector.vala | 2 +- tests/test-injector.vala | 2 +-
10 files changed, 45 insertions(+), 8 deletions(-) 10 files changed, 43 insertions(+), 8 deletions(-)
create mode 100644 src/anti-anti-frida.py create mode 100644 src/anti-anti-frida.py
diff --git a/src/agent-container.vala b/src/agent-container.vala diff --git a/src/agent-container.vala b/src/agent-container.vala
@@ -65,10 +65,10 @@ index 00000000..a203189f
+ binary.write(input_file) + binary.write(input_file)
\ No newline at end of file \ No newline at end of file
diff --git a/src/darwin/darwin-host-session.vala b/src/darwin/darwin-host-session.vala diff --git a/src/darwin/darwin-host-session.vala b/src/darwin/darwin-host-session.vala
index 06e7065b..d215b75a 100644 index ab9b2900..4369922d 100644
--- a/src/darwin/darwin-host-session.vala --- a/src/darwin/darwin-host-session.vala
+++ b/src/darwin/darwin-host-session.vala +++ b/src/darwin/darwin-host-session.vala
@@ -354,7 +354,7 @@ namespace Frida { @@ -381,7 +381,7 @@ namespace Frida {
private async uint inject_agent (uint pid, string agent_parameters, Cancellable? cancellable) throws Error, IOError { private async uint inject_agent (uint pid, string agent_parameters, Cancellable? cancellable) throws Error, IOError {
uint id; uint id;
@@ -78,30 +78,28 @@ index 06e7065b..d215b75a 100644
id = yield fruitjector.inject_library_resource (pid, agent, entrypoint, agent_parameters, cancellable); id = yield fruitjector.inject_library_resource (pid, agent, entrypoint, agent_parameters, cancellable);
#else #else
diff --git a/src/embed-agent.sh b/src/embed-agent.sh diff --git a/src/embed-agent.sh b/src/embed-agent.sh
index 6119b5e1..7eede250 100755 index 6a3bf9ed..e6a69e41 100755
--- a/src/embed-agent.sh --- a/src/embed-agent.sh
+++ b/src/embed-agent.sh +++ b/src/embed-agent.sh
@@ -10,6 +10,7 @@ resource_compiler=$7 @@ -12,6 +12,7 @@ lipo=$9
resource_config=$8 agent_dbghelp_prefix=${10}
lipo=$9 agent_symsrv_prefix=${11}
+custom_script="$output_dir/../../../../frida-core/src/anti-anti-frida.py" +custom_script="$output_dir/../../../../frida-core/src/anti-anti-frida.py"
priv_dir="$output_dir/frida-agent@emb" priv_dir="$output_dir/frida-agent@emb"
mkdir -p "$priv_dir" mkdir -p "$priv_dir"
@@ -22,6 +23,11 @@ collect_generic_agent () @@ -41,6 +42,9 @@ collect_unix_agent ()
else else
touch "$embedded_agent" touch "$embedded_agent"
fi fi
+
+ if [ -f "$custom_script" ]; then + if [ -f "$custom_script" ]; then
+ python3 "$custom_script" "$embedded_agent" + python3 "$custom_script" "$embedded_agent"
+ fi + fi
+ embedded_assets+=("$embedded_agent")
embedded_agents+=("$embedded_agent")
} }
@@ -54,6 +60,10 @@ case $host_os in @@ -81,6 +85,10 @@ case $host_os in
exit 1 exit 1
fi fi
@@ -191,5 +189,5 @@ index f4a321c4..448bddf3 100644
printerr ("\nFAIL: %s\n\n", e.message); printerr ("\nFAIL: %s\n\n", e.message);
assert_not_reached (); assert_not_reached ();
-- --
2.34.1 2.39.3 (Apple Git-145)

View File

@@ -1,4 +1,4 @@
From 90702fd82b7adbed8f712cf7b9dcb4f7d7f89b30 Mon Sep 17 00:00:00 2001 From a3a873849788a117c799d7901b907b458a4ff44f Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Tue, 18 Jul 2023 16:03:47 +0800 Date: Tue, 18 Jul 2023 16:03:47 +0800
Subject: [PATCH 05/10] Florida: thread_gum_js_loop Subject: [PATCH 05/10] Florida: thread_gum_js_loop
@@ -25,5 +25,5 @@ index a203189f..7a3f6474 100644
+ os.system(f"sed -b -i s/gum-js-loop/{random_name}/g {input_file}") + os.system(f"sed -b -i s/gum-js-loop/{random_name}/g {input_file}")
\ No newline at end of file \ No newline at end of file
-- --
2.34.1 2.39.3 (Apple Git-145)

View File

@@ -1,4 +1,4 @@
From 93a07e8014d3c4971239ad6831aa5d526042a106 Mon Sep 17 00:00:00 2001 From 2ab3dafa1d0fc152757427b6f4e923daf0bd169b Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Tue, 18 Jul 2023 16:04:15 +0800 Date: Tue, 18 Jul 2023 16:04:15 +0800
Subject: [PATCH 06/10] Florida: thread_gmain Subject: [PATCH 06/10] Florida: thread_gmain
@@ -25,5 +25,5 @@ index 7a3f6474..b4b8dca6 100644
+ os.system(f"sed -b -i s/gmain/{random_name}/g {input_file}") + os.system(f"sed -b -i s/gmain/{random_name}/g {input_file}")
\ No newline at end of file \ No newline at end of file
-- --
2.34.1 2.39.3 (Apple Git-145)

View File

@@ -1,4 +1,4 @@
From 217f97faabba058b53b6abb0827b74b0787beaa7 Mon Sep 17 00:00:00 2001 From 0561228bc0dde4dd62af2feceff1a09e9d38f9cd Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Tue, 18 Jul 2023 16:04:55 +0800 Date: Tue, 18 Jul 2023 16:04:55 +0800
Subject: [PATCH 07/10] Florida: protocol_unexpected_command Subject: [PATCH 07/10] Florida: protocol_unexpected_command
@@ -21,5 +21,5 @@ index 0ed2edeb..9de04b54 100644
default: default:
var length = parse_length (command_or_length); var length = parse_length (command_or_length);
-- --
2.34.1 2.39.3 (Apple Git-145)

View File

@@ -1,4 +1,4 @@
From 3f427a1ee93de50ca0dcdf825cbeeefd61f14ccc Mon Sep 17 00:00:00 2001 From f0cea5f7ffac814fc1aed478247c1f8b8190c180 Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Tue, 18 Jul 2023 19:55:59 +0800 Date: Tue, 18 Jul 2023 19:55:59 +0800
Subject: [PATCH 08/10] Florida: update python script Subject: [PATCH 08/10] Florida: update python script
@@ -92,5 +92,5 @@ index b4b8dca6..d1ce5f62 100644
+ log_color(f"[*] Patch Finish") + log_color(f"[*] Patch Finish")
\ No newline at end of file \ No newline at end of file
-- --
2.34.1 2.39.3 (Apple Git-145)

View File

@@ -1,4 +1,4 @@
From f7e11d47f9f3060733ac3dd418718366631c5bcb Mon Sep 17 00:00:00 2001 From 4b88bae0ba2d67a8ac2b1ffbd2d2216e879c3813 Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Thu, 20 Jul 2023 10:01:20 +0800 Date: Thu, 20 Jul 2023 10:01:20 +0800
Subject: [PATCH 09/10] Florida: pool-frida Subject: [PATCH 09/10] Florida: pool-frida
@@ -21,5 +21,5 @@ index 13429703..43cc8167 100644
if (runtime == FRIDA_RUNTIME_OTHER) if (runtime == FRIDA_RUNTIME_OTHER)
{ {
-- --
2.34.1 2.39.3 (Apple Git-145)

View File

@@ -1,4 +1,4 @@
From 149e9c7bfde38629f43874395c21ec6dac6320fd Mon Sep 17 00:00:00 2001 From 7758c68170a1294d8af09de6d50184195ffa0035 Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Fri, 1 Sep 2023 12:51:06 +0800 Date: Fri, 1 Sep 2023 12:51:06 +0800
Subject: [PATCH 10/10] Florida: memfd-name-jit-cache Subject: [PATCH 10/10] Florida: memfd-name-jit-cache
@@ -8,10 +8,10 @@ Subject: [PATCH 10/10] Florida: memfd-name-jit-cache
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/linux/frida-helper-backend.vala b/src/linux/frida-helper-backend.vala diff --git a/src/linux/frida-helper-backend.vala b/src/linux/frida-helper-backend.vala
index 57a27dcd..5951da92 100644 index 61f8307b..0121b1b4 100644
--- a/src/linux/frida-helper-backend.vala --- a/src/linux/frida-helper-backend.vala
+++ b/src/linux/frida-helper-backend.vala +++ b/src/linux/frida-helper-backend.vala
@@ -3180,7 +3180,7 @@ namespace Frida { @@ -3184,7 +3184,7 @@ namespace Frida {
} }
private int memfd_create (string name, uint flags) { private int memfd_create (string name, uint flags) {
@@ -21,5 +21,5 @@ index 57a27dcd..5951da92 100644
} }
-- --
2.34.1 2.39.3 (Apple Git-145)