From 9c9cc1de759d7a7ce1b2c86d17086d57d537cbfe Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Tue, 30 Jan 2024 17:25:42 +0800 Subject: [PATCH] =?UTF-8?q?TSG-18972=20TFE=E9=80=82=E9=85=8DPXY=5FINTERCEP?= =?UTF-8?q?T=5FCOMPILE=E5=AD=97=E6=AE=B5decryption=20->=20decryption=5Fpro?= =?UTF-8?q?file=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/intercept_policy.cpp | 2 +- resource/pangu/doh.json | 6 +++--- resource/pangu/pangu_http.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/intercept_policy.cpp b/common/src/intercept_policy.cpp index 4745c50..47c9607 100644 --- a/common/src/intercept_policy.cpp +++ b/common/src/intercept_policy.cpp @@ -129,7 +129,7 @@ static void intercept_param_new_cb(const char *table_name, int table_id, const c } } - item = cJSON_GetObjectItem(json, "decryption"); + item = cJSON_GetObjectItem(json, "decryption_profile"); if (item) { if (item->type == cJSON_Number) diff --git a/resource/pangu/doh.json b/resource/pangu/doh.json index 1a4b4c7..a0870c9 100644 --- a/resource/pangu/doh.json +++ b/resource/pangu/doh.json @@ -161,9 +161,9 @@ { "table_name": "PXY_INTERCEPT_COMPILE", "table_content": [ - "0\t0\t2\t1\t1\t{}\t{\"protocol\":\"SSL\",\"keyring\":765,\"decryption\":0},\"traffic_mirror\":{\"enable\":0}}\t1\t2", - "656\t0\t2\t1\t1\t{}\t{\"protocol\":\"SSL\",\"keyring\":1,\"decryption\":0},\"traffic_mirror\":{\"enable\":0}}\t1\t2", - "49\t0\t2\t1\t1\t{}\t{\"protocol\":\"SSL\",\"keyring\":1,\"decryption\":0},\"traffic_mirror\":{\"enable\":0}}\t1\t2" + "0\t0\t2\t1\t1\t{}\t{\"protocol\":\"SSL\",\"keyring\":765,\"decryption_profile\":0},\"traffic_mirror\":{\"enable\":0}}\t1\t2", + "656\t0\t2\t1\t1\t{}\t{\"protocol\":\"SSL\",\"keyring\":1,\"decryption_profile\":0},\"traffic_mirror\":{\"enable\":0}}\t1\t2", + "49\t0\t2\t1\t1\t{}\t{\"protocol\":\"SSL\",\"keyring\":1,\"decryption_profile\":0},\"traffic_mirror\":{\"enable\":0}}\t1\t2" ] } ] diff --git a/resource/pangu/pangu_http.json b/resource/pangu/pangu_http.json index ea680e5..663344b 100644 --- a/resource/pangu/pangu_http.json +++ b/resource/pangu/pangu_http.json @@ -255,8 +255,8 @@ { "table_name": "PXY_INTERCEPT_COMPILE", "table_content": [ - "0\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"protocol\":\"SSL\",\"keyring_for_trusted\":765,\"keyring_for_untrusted\":10,\"decryption\":0,\"tcp_option_profile\":1,\"traffic_mirror\":{\"enable\":0}}\t1\t1\t2", - "255119\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"protocol\":\"SSL\",\"keyring_for_trusted\":1,\"keyring_for_untrusted\":10,\"decryption\":0,\"tcp_option_profile\":1,\"traffic_mirror\":{\"enable\":1,\"mirror_profile\":1234}}\t1\t1\t2" + "0\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"protocol\":\"SSL\",\"keyring_for_trusted\":765,\"keyring_for_untrusted\":10,\"decryption_profile\":0,\"tcp_option_profile\":1,\"traffic_mirror\":{\"enable\":0}}\t1\t1\t2", + "255119\t0\t2\t1\t1\t{}\t{\"vsys_id\":1,\"protocol\":\"SSL\",\"keyring_for_trusted\":1,\"keyring_for_untrusted\":10,\"decryption_profile\":0,\"tcp_option_profile\":1,\"traffic_mirror\":{\"enable\":1,\"mirror_profile\":1234}}\t1\t1\t2" ] }, {