Skip to content

Commit 7133515

Browse files
committed
Merge remote-tracking branch 'zinwang/switch_to_shuriken_core' into switch_to_shuriken_core
2 parents a6845cf + 3b32709 commit 7133515

File tree

7 files changed

+344
-360
lines changed

7 files changed

+344
-360
lines changed

.github/workflows/kali-package.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From kalilinux/kali-rolling:latest
22

33
RUN apt-get update -y && apt-get install --no-install-recommends -y \
4-
git python3 python3-pip debhelper \
4+
git python3 python3-pip debhelper cmake\
55
dh-virtualenv build-essential devscripts equivs \
66
&& apt-get clean \
77
&& rm -rf /var/lib/apt/lists/*

.github/workflows/pytest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262

6363
- name: Install Shuriken-Analyzer
6464
run: |
65-
pip install git+https://github.com/Fare9/Shuriken-Analyzer.git@80443a369b6f0db6f3fd523fd0c0c4efcd64e2d5#subdirectory=shuriken/bindings/Python/
65+
pip install git+https://github.com/Fare9/Shuriken-Analyzer.git@c6087e5cd6308c6df82c8c44239d231bcdfde59e#subdirectory=shuriken/bindings/Python/
6666
6767
- name: Install Quark-Engine
6868
run: pip install .

.github/workflows/smoke_test.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,9 @@ jobs:
4242
# Install click <= 8.1.7 for CLI supports
4343
python -m pip install "click<=8.1.7"
4444
45-
- name: Install Shuriken-Analyzer for Linux
45+
- name: Install Shuriken-Analyzer
4646
run: |
47-
pip install git+https://github.com/Fare9/Shuriken-Analyzer.git@80443a369b6f0db6f3fd523fd0c0c4efcd64e2d5#subdirectory=shuriken/bindings/Python/
48-
if: matrix.os == 'ubuntu-latest'
49-
50-
- name: Install Shuriken-Analyzer for MacOS
51-
run: |
52-
pip install git+https://github.com/Fare9/Shuriken-Analyzer.git@80443a369b6f0db6f3fd523fd0c0c4efcd64e2d5#subdirectory=shuriken/bindings/Python/
53-
if: matrix.os == 'macos-13'
54-
55-
- name: Install Shuriken-Analyzer for Windows
56-
run: |
57-
git clone https://github.com/Fare9/Shuriken-Analyzer.git
58-
cd Shuriken-Analyzer
59-
cmake -S . -B build/ -DCMAKE_BUILD_TYPE=Release -DGITHUB_ACTION=ON -DDEX_TESTS=ON
60-
cmake --build build/ --config Release
61-
cmake --install build/ --config Release --prefix "C:/Program Files (x86)/Shuriken"
62-
cd -
63-
if: matrix.os == 'windows-latest'
47+
pip install git+https://github.com/Fare9/Shuriken-Analyzer.git@c6087e5cd6308c6df82c8c44239d231bcdfde59e#subdirectory=shuriken/bindings/Python/
6448
6549
- name: Install MacPorts
6650
uses: melusina-org/setup-macports@v1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM python:3.10-slim
33
COPY . /app
44
WORKDIR /app
55

6-
RUN apt-get update && apt-get install --no-install-recommends -y git graphviz \
6+
RUN apt-get update && apt-get install --no-install-recommends -y git graphviz cmake\
77
&& apt-get clean \
88
&& rm -rf /var/lib/apt/lists/*
99

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ frida-tools = "<=12.3.0"
2424
objection = "<=1.11.0"
2525
frida = "<=15.2.2"
2626
r2pipe = "==1.8.0"
27-
shurikenanalyzer = {ref = "80443a369b6f0db6f3fd523fd0c0c4efcd64e2d5", git = "https://github.com/Fare9/Shuriken-Analyzer.git", subdirectory = "shuriken/bindings/Python/"}
27+
shurikenanalyzer = {ref = "c6087e5cd6308c6df82c8c44239d231bcdfde59e", git = "https://github.com/Fare9/Shuriken-Analyzer.git", subdirectory = "shuriken/bindings/Python/"}
2828
quark-engine = {file = ".", editable = true}
2929

3030
[requires]

Pipfile.lock

Lines changed: 337 additions & 337 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"rzpipe",
1717
"click",
1818
"r2pipe==1.8.0",
19-
"ShurikenAnalyzer @ git+https://github.com/Fare9/Shuriken-Analyzer.git@80443a369b6f0db6f3fd523fd0c0c4efcd64e2d5#subdirectory=shuriken/bindings/Python/"
19+
"ShurikenAnalyzer @ git+https://github.com/Fare9/Shuriken-Analyzer.git@c6087e5cd6308c6df82c8c44239d231bcdfde59e#subdirectory=shuriken/bindings/Python/"
2020
]
2121

2222
quarkAgentRequirements = [

0 commit comments

Comments
 (0)