Skip to content

Commit

Permalink
Merge pull request #759 from BC-SECURITY/release/5.11.6
Browse files Browse the repository at this point in the history
v5.11.6 into main
  • Loading branch information
vinnybod authored Nov 8, 2024
2 parents ee6526b + 4e21e78 commit 1ff9de8
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
# To save CI time, only run these tests when the install script or deps changed
- name: Get changed files using defaults
id: changed-files
uses: tj-actions/changed-files@v44.5.5
uses: tj-actions/changed-files@v45.0.3
- name: Build images
if: contains(steps.changed-files.outputs.modified_files, 'setup/install.sh') || contains(steps.changed-files.outputs.modified_files, 'poetry.lock')
run: docker compose -f .github/install_tests/docker-compose-install-tests.yml build --parallel ${{ join(matrix.images, ' ') }}
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [5.11.6] - 2024-11-08

- Fixed extra character in nanodump.x64.o
- Fixed bof tasking for IronPython agent

## [5.11.5] - 2024-09-22

- Updated Starkiller to v2.8.2
Expand Down Expand Up @@ -934,7 +939,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated shellcoderdi to newest version (@Cx01N)
- Added a Nim launcher (@Hubbl3)

[Unreleased]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.11.5...HEAD
[Unreleased]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.11.6...HEAD

[5.11.6]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.11.5...v5.11.6

[5.11.5]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v5.11.4...v5.11.5

Expand Down
2 changes: 1 addition & 1 deletion empire/server/common/empire.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

from . import agents, credentials, listeners, stagers

VERSION = "5.11.5 BC Security Fork"
VERSION = "5.11.6 BC Security Fork"

log = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion empire/server/core/module_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def execute_module( # noqa: PLR0913 PLR0912 PLR0915
else:
task_command = "TASK_POWERSHELL_CMD_WAIT"

elif agent.language == "ironpython" and module.language == "csharp":
elif agent.language == "ironpython" and module.language in ("csharp", "bof"):
task_command = "TASK_CSHARP"

return {"command": task_command, "data": module_data}, None
Expand Down
2 changes: 1 addition & 1 deletion empire/server/modules/bof/nanodump.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ options:
format: i
bof:
x86: bof/nanodump/nanodump.x86.o
x64: bof/nanodump/nanodump.x64.oo
x64: bof/nanodump/nanodump.x64.o
entry_point: ''
script_path: ''
script_end: ''
Expand Down
6 changes: 3 additions & 3 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "empire-bc-security-fork"
version = "5.11.5"
version = "5.11.6"
description = ""
authors = ["BC Security <[email protected]>"]
readme = "README.md"
Expand Down Expand Up @@ -48,7 +48,7 @@ pyvnc = {git = "https://github.com/BC-SECURITY/pyVNC.git"}
python-socketio = {extras = ["client"], version = "^5.11.1"}
Flask = "^3.0.2"
pysecretsocks = {git = "https://github.com/BC-SECURITY/PySecretSOCKS.git", rev = "da5be0e"}
donut-shellcode = { version = "^1.0.2", markers = "platform_machine == 'x86_64' or platform_machine == 'amd64'" }
donut-shellcode = { version = "^1.1", markers = "platform_machine == 'x86_64' or platform_machine == 'amd64'" }
python-obfuscator = "^0.0.2"
pyinstaller = "^6.4.0"
md2pdf = {git = "https://github.com/bc-security/md2pdf", rev = "48d5a46"}
Expand Down

0 comments on commit 1ff9de8

Please sign in to comment.