Skip to content

Commit 839e45e

Browse files
authored
Merge pull request #1055 from qilingframework/dev
get ready for 1.4.1
2 parents 94bf7a3 + 3f83303 commit 839e45e

File tree

221 files changed

+20962
-10632
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+20962
-10632
lines changed

.github/workflows/build-ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ jobs:
7878
wget https://github.com/qilingframework/rootfs/archive/refs/heads/master.zip
7979
unzip master.zip && mv rootfs-master rootfs
8080
cd ../qiling
81-
rm -rf engine
82-
wget https://github.com/qilingframework/engine/archive/refs/heads/main.zip
83-
unzip main.zip && mv engine-main engine
8481
cd ../examples/rootfs/x86_linux/kernel && unzip -P infected m0hamed_rootkit.ko.zip
8582
cd ../../../../
8683
pip3 install -e .[evm]

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ test.file
3636
core
3737
*.perf
3838
tests/output.txt
39+
tests/testtest_*
3940

AUTHORS.TXT

Lines changed: 0 additions & 9 deletions
This file was deleted.

CREDITS.TXT

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,20 @@ NGUYEN Anh Quynh <[email protected]>
1414
Core Developers Crew
1515
====================
1616
Earl MARCUS (klks84) [email protected]
17-
DING tianze (D1iv3) <[email protected]>
18-
SUN bowen (w1tcher) <[email protected]>
19-
CHEN huitao (null) <[email protected]>
20-
YU tong (sp1ke) <[email protected]>
2117
WU chenxu (kabeor) <[email protected]>
2218
KONG ziqiao (lazymio) <[email protected]>
2319
YU zheng (dataisland) <[email protected]>
2420
Eli Cohen Nehemia (elicn) <[email protected]>
2521

2622

23+
Legacy Core Developers
24+
======================
25+
DING tianze (D1iv3) <[email protected]>
26+
SUN bowen (w1tcher) <[email protected]>
27+
CHEN huitao (null) <[email protected]>
28+
YU tong (sp1ke) <[email protected]>
29+
30+
2731
Travis, Website and Documentations
2832
==================================
2933
FOO Kevin (chfl4gs) <[email protected]>

ChangeLog

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,33 @@
11
This file details the changelog of Qiling Framework.
22

3+
------------------------------------
4+
[Version 1.4.1]: Nov 15th, 2021
5+
6+
New features:
7+
- Introduced riscv, both 32 and 64 (#980)
8+
- Added U-boot (#1000)
9+
- Abstract calls to native functions (#1013)
10+
11+
Improvements:
12+
- Minor improvements to memory module (#1012)
13+
- Refactored core hooks (#966)
14+
- update ql.os.posix.const_mapping with more os/arch match (#973)
15+
- More update in MCU modules (#971)
16+
- Fix getpeername and getsockname syscalls (#986)
17+
- Qdb improvements (#999)
18+
- QNX improvements (#1054)
19+
20+
Contributors:
21+
- cq674350529
22+
- ucgJhe
23+
- cla7aye15I4nd
24+
- elicn
25+
- xwings
26+
27+
328
------------------------------------
429
[Version 1.4.0]: Oct 20th, 2021
30+
531
- Added MCU Engine
632
- Bug fix for qdb
733
- Bug fix for debugger

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM python:3.8-slim AS builder
33
LABEL maintainer="Kevin Foo <[email protected]>"
44

55
ENV DEBIAN_FRONTEND=noninteractive
6+
ENV AM_I_IN_A_DOCKER_CONTAINER Yes
67

78
RUN apt-get update \
89
&& apt-get -y upgrade \

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
[![Documentation Status](https://readthedocs.org/projects/qilingframework/badge/?version=latest)](https://docs.qiling.io)
12
[![Downloads](https://pepy.tech/badge/qiling)](https://pepy.tech/project/qiling)
23
[![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/qilingframework)
4+
35
---
46

57
<p align="center">
@@ -193,14 +195,11 @@ With binary and GDB debugger enable:
193195
$ ./qltool run -f examples/rootfs/x8664_linux/bin/x8664_hello --gdb 127.0.0.1:9999 --rootfs examples/rootfs/x8664_linux
194196
```
195197

196-
See https://docs.qiling.io/ for more details
197-
198198
With code coverage collection (UEFI only for now):
199199

200200
```
201201
$ ./qltool run -f examples/rootfs/x8664_efi/bin/TcgPlatformSetupPolicy --rootfs examples/rootfs/x8664_efi --coverage-format drcov --coverage-file TcgPlatformSetupPolicy.cov
202202
```
203-
---
204203

205204
With json output (Windows mainly):
206205

examples/evm/evm_Hexagon_overflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414

1515
def example_run_evm():
16-
ql = Qiling(archtype="evm")
1716
contract = '0x606060405266017dfcdece4000600055341561001a57600080fd5b600160a060020a033316600090815260016020526040902066017dfcdece400090556106eb8061004b6000396000f3006060604052600436106100c45763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde0381146100c9578063095ea7b31461015357806318160ddd1461018957806323b872dd146101ae57806327edf097146101d6578063313ce567146101ff578063378dc3dc1461021257806342966c681461022557806370a082311461023b578063771282f61461025a57806395d89b411461026d578063a9059cbb14610280578063dd62ed3e146102a2575b600080fd5b34156100d457600080fd5b6100dc6102c7565b60405160208082528190810183818151815260200191508051906020019080838360005b83811015610118578082015183820152602001610100565b50505050905090810190601f1680156101455780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561015e57600080fd5b610175600160a060020a03600435166024356102fe565b604051901515815260200160405180910390f35b341561019457600080fd5b61019c6103a4565b60405190815260200160405180910390f35b34156101b957600080fd5b610175600160a060020a03600435811690602435166044356103aa565b34156101e157600080fd5b6101e9610422565b60405160ff909116815260200160405180910390f35b341561020a57600080fd5b6101e9610427565b341561021d57600080fd5b61019c61042c565b341561023057600080fd5b610175600435610437565b341561024657600080fd5b61019c600160a060020a03600435166104ea565b341561026557600080fd5b61019c6104fc565b341561027857600080fd5b6100dc610502565b341561028b57600080fd5b610175600160a060020a0360043516602435610539565b34156102ad57600080fd5b61019c600160a060020a036004358116906024351661054f565b60408051908101604052600781527f48657861676f6e00000000000000000000000000000000000000000000000000602082015281565b60008115806103305750600160a060020a03338116600090815260026020908152604080832093871683529290522054155b151561033b57600080fd5b600160a060020a03338116600081815260026020908152604080832094881680845294909152908190208590557f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9259085905190815260200160405180910390a350600192915050565b60005490565b600160a060020a03808416600090815260026020908152604080832033909416835292905290812054829010156103e057600080fd5b600160a060020a038085166000908152600260209081526040808320339094168352929052208054839003905561041884848461056c565b5060019392505050565b600281565b600481565b66017dfcdece400081565b600160a060020a0333166000908152600160205260408120548290101561045d57600080fd5b600160a060020a033316600081815260016020526040808220805486900390558180527fa6eef7e35abe7026729641147f7915573c7e97b47efa546f5f6e3230263bcb4980548601905581548590039091557fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca59084905190815260200160405180910390a2506001919050565b60016020526000908152604090205481565b60005481565b60408051908101604052600381527f4858470000000000000000000000000000000000000000000000000000000000602082015281565b600061054633848461056c565b50600192915050565b600260209081526000928352604080842090915290825290205481565b600160a060020a038216151561058157600080fd5b600160a060020a038316600090815260016020526040902054600282019010156105aa57600080fd5b600160a060020a038216600090815260016020526040902054818101116105d057600080fd5b600160a060020a03808416600081815260016020526040808220805460011990879003810190915593861682528082208054860190558180527fa6eef7e35abe7026729641147f7915573c7e97b47efa546f5f6e3230263bcb4980546002908101909155825490940190915590917fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5915160ff909116815260200160405180910390a281600160a060020a031683600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405190815260200160405180910390a35050505600a165627a7a72305820fbef5b10322242b8659b5de8e24ec1cf5e809831f6f7c08e52112f76daa31aef0029'
17+
ql = Qiling(code=contract, archtype="evm")
1818

1919
user1 = ql.arch.evm.create_account(balance=100*10**18)
2020
user2 = ql.arch.evm.create_account(balance=100*10**18)

examples/evm/evm_debugger.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from qiling import *
1010

1111
if __name__ == '__main__':
12-
ql = Qiling(archtype="evm")
13-
ql.debugger = True
1412
contract = '0x6060604052341561000f57600080fd5b60405160208061031c833981016040528080519060200190919050508060018190556000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555050610299806100836000396000f300606060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806318160ddd1461005c57806370a0823114610085578063a9059cbb146100d2575b600080fd5b341561006757600080fd5b61006f61012c565b6040518082815260200191505060405180910390f35b341561009057600080fd5b6100bc600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610132565b6040518082815260200191505060405180910390f35b34156100dd57600080fd5b610112600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061017a565b604051808215151515815260200191505060405180910390f35b60015481565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b600080826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205403101515156101cb57600080fd5b816000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540392505081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254019250508190555060019050929150505600a165627a7a7230582098f1551a391a3e65b3ce45cfa2b3fa5f91eea9a3e7181a81454e025ea0d7151c0029'
13+
ql = Qiling(code=contract, archtype="evm")
14+
ql.debugger = True
1515

1616
# Add Balance Var to the contract
1717
bal = ql.arch.evm.abi.convert(['uint256'], [20])

0 commit comments

Comments
 (0)