Skip to content

Commit

Permalink
Merge branch 'mandiant:master' into Aayush-Goel-04/Issue#322
Browse files Browse the repository at this point in the history
  • Loading branch information
Aayush-Goel-04 authored Oct 16, 2023
2 parents db32d90 + 77de088 commit 412d296
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/pyinstaller/pyinstaller.spec
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ exe = EXE(
name="capa",
icon="logo.ico",
debug=False,
strip=None,
strip=False,
upx=True,
console=True,
)
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

### Breaking Changes

### New Rules (13)
### New Rules (16)

- nursery/get-ntoskrnl-base-address @mr-tz
- host-interaction/network/connectivity/set-tcp-connection-state @johnk3r
Expand All @@ -26,6 +26,9 @@
- nursery/set-thread-name-on-linux [email protected]
- load-code/dotnet/load-windows-common-language-runtime [email protected] [email protected] [email protected]
- nursery/log-keystrokes-via-input-method-manager @mr-tz
- nursery/encrypt-data-using-rc4-via-systemfunction032 [email protected]
- nursery/add-value-to-global-atom-table @mr-tz
- nursery/enumerate-processes-that-use-resource @Ana06
-

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/flare-capa)](https://pypi.org/project/flare-capa)
[![Last release](https://img.shields.io/github/v/release/mandiant/capa)](https://github.com/mandiant/capa/releases)
[![Number of rules](https://img.shields.io/badge/rules-843-blue.svg)](https://github.com/mandiant/capa-rules)
[![Number of rules](https://img.shields.io/badge/rules-846-blue.svg)](https://github.com/mandiant/capa-rules)
[![CI status](https://github.com/mandiant/capa/workflows/CI/badge.svg)](https://github.com/mandiant/capa/actions?query=workflow%3ACI+event%3Apush+branch%3Amaster)
[![Downloads](https://img.shields.io/github/downloads/mandiant/capa/total)](https://github.com/mandiant/capa/releases)
[![License](https://img.shields.io/badge/license-Apache--2.0-green.svg)](LICENSE.txt)
Expand Down
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies = [
"tabulate==0.9.0",
"colorama==0.4.6",
"termcolor==2.3.0",
"wcwidth==0.2.6",
"wcwidth==0.2.8",
"ida-settings==2.1.0",
"viv-utils[flirt]==0.7.9",
"halo==0.0.31",
Expand All @@ -46,7 +46,7 @@ dependencies = [
"vivisect==1.1.1",
"pefile==2023.2.7",
"pyelftools==0.30",
"dnfile==0.13.0",
"dnfile==0.14.1",
"dncil==1.0.2",
"pydantic==2.1.1",
"protobuf==4.23.4",
Expand All @@ -67,7 +67,7 @@ dev = [
"pytest-instafail==0.5.0",
"pytest-cov==4.1.0",
"flake8==6.1.0",
"flake8-bugbear==23.7.10",
"flake8-bugbear==23.9.16",
"flake8-encodings==0.5.0.post1",
"flake8-comprehensions==3.14.0",
"flake8-logging-format==0.9.0",
Expand All @@ -78,7 +78,7 @@ dev = [
"flake8-use-pathlib==0.3.0",
"flake8-copyright==0.2.4",
"ruff==0.0.291",
"black==23.7.0",
"black==23.9.1",
"isort==5.11.4",
"mypy==1.5.1",
"psutil==5.9.2",
Expand All @@ -96,7 +96,7 @@ dev = [
"types-protobuf==4.23.0.3",
]
build = [
"pyinstaller==5.10.1",
"pyinstaller==6.0.0",
"setuptools==68.0.0",
"build==1.0.3"
]
Expand Down
2 changes: 1 addition & 1 deletion tests/data

0 comments on commit 412d296

Please sign in to comment.