diff --git a/CHANGELOG.md b/CHANGELOG.md index ac3ba707..13f72602 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ ### Breaking Changes -### New Rules (12) +### New Rules (20) - persistence/scheduled-tasks/schedule-task-via-at joren485 - data-manipulation/prng/generate-random-numbers-via-rtlgenrandom william.ballenthin@mandiant.com @@ -20,6 +20,14 @@ - nursery/get-http-request-uri william.ballenthin@mandiant.com - nursery/create-zip-archive-in-dotnet michael.hunhoff@mandiant.com - nursery/extract-zip-archive-in-dotnet anushka.virgaonkar@mandiant.com michael.hunhoff@mandiant.com +- data-manipulation/encryption/tea/decrypt-data-using-tea william.ballenthin@mandiant.com raymond.leong@mandiant.com +- data-manipulation/encryption/tea/encrypt-data-using-tea william.ballenthin@mandiant.com raymond.leong@mandiant.com +- data-manipulation/encryption/xtea/encrypt-data-using-xtea raymond.leong@mandiant.com +- data-manipulation/encryption/xxtea/encrypt-data-using-xxtea raymond.leong@mandiant.com +- nursery/hash-data-using-ripemd128 raymond.leong@mandiant.com +- nursery/hash-data-using-ripemd256 raymond.leong@mandiant.com +- nursery/hash-data-using-ripemd320 raymond.leong@mandiant.com +- nursery/set-web-proxy-in-dotnet michael.hunhoff@mandiant.com - ### Bug Fixes diff --git a/README.md b/README.md index cdf94867..6e5db2ac 100644 --- a/README.md +++ b/README.md @@ -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-781-blue.svg)](https://github.com/mandiant/capa-rules) +[![Number of rules](https://img.shields.io/badge/rules-787-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) diff --git a/rules b/rules index 5351554f..83103555 160000 --- a/rules +++ b/rules @@ -1 +1 @@ -Subproject commit 5351554ff9a1b379161682054847125e15cc5efb +Subproject commit 83103555285ea92d4b215118a9eec3ab94cb0343 diff --git a/scripts/profile-memory.py b/scripts/profile-memory.py index 684197dd..e5bc6515 100644 --- a/scripts/profile-memory.py +++ b/scripts/profile-memory.py @@ -59,9 +59,9 @@ def main(): gc.collect() process = psutil.Process(os.getpid()) - print(f" duration: {t1 - t0:.02f}s") - print(f" rss: {process.memory_info().rss / 1024 / 1024:.1f} MiB") - print(f" vms: {process.memory_info().vms / 1024 / 1024:.1f} MiB") + print(f" duration: {(t1-t0):.2f}") + print(f" rss: {(process.memory_info().rss / 1024 / 1024):.1f} MiB") + print(f" vms: {(process.memory_info().vms / 1024 / 1024):.1f} MiB") print("done.") gc.collect() diff --git a/setup.py b/setup.py index 3c5a4277..45deb3f2 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ requirements = [ "pyelftools==0.29", "dnfile==0.13.0", "dncil==1.0.2", - "pydantic==1.10.5", + "pydantic==1.10.6", ] # this sets __version__ @@ -89,7 +89,7 @@ setuptools.setup( "types_requests==2.28.1", ], "build": [ - "pyinstaller==5.8.0", + "pyinstaller==5.9.0", ], }, zip_safe=False, diff --git a/tests/fixtures.py b/tests/fixtures.py index 74f2b4bf..5602f096 100644 --- a/tests/fixtures.py +++ b/tests/fixtures.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_engine.py b/tests/test_engine.py index 89c3b739..09560257 100644 --- a/tests/test_engine.py +++ b/tests/test_engine.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_fmt.py b/tests/test_fmt.py index 1f37886c..96101dfb 100644 --- a/tests/test_fmt.py +++ b/tests/test_fmt.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_freeze.py b/tests/test_freeze.py index 664afd44..2c5f1920 100644 --- a/tests/test_freeze.py +++ b/tests/test_freeze.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_helpers.py b/tests/test_helpers.py index eab1efa4..90b689b3 100644 --- a/tests/test_helpers.py +++ b/tests/test_helpers.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_main.py b/tests/test_main.py index e5b7cd08..d515c104 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_match.py b/tests/test_match.py index 510db98f..fc3583f7 100644 --- a/tests/test_match.py +++ b/tests/test_match.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_optimizer.py b/tests/test_optimizer.py index 69a79bd6..d07ba330 100644 --- a/tests/test_optimizer.py +++ b/tests/test_optimizer.py @@ -1,4 +1,4 @@ -# Copyright (C) 2021 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2021 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_os_detection.py b/tests/test_os_detection.py index 82e592a7..bdc89686 100644 --- a/tests/test_os_detection.py +++ b/tests/test_os_detection.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2022 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2022 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_pefile_features.py b/tests/test_pefile_features.py index 2e1afc7b..e0b735e8 100644 --- a/tests/test_pefile_features.py +++ b/tests/test_pefile_features.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_result_document.py b/tests/test_result_document.py index b98fadff..8172c601 100644 --- a/tests/test_result_document.py +++ b/tests/test_result_document.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_rule_cache.py b/tests/test_rule_cache.py index fb11e5e7..b52e2577 100644 --- a/tests/test_rule_cache.py +++ b/tests/test_rule_cache.py @@ -1,4 +1,4 @@ -# Copyright (C) 2023 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2023 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_rules.py b/tests/test_rules.py index fe154c39..29db2a2f 100644 --- a/tests/test_rules.py +++ b/tests/test_rules.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_rules_insn_scope.py b/tests/test_rules_insn_scope.py index 27d07489..481b3cd9 100644 --- a/tests/test_rules_insn_scope.py +++ b/tests/test_rules_insn_scope.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2022 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_scripts.py b/tests/test_scripts.py index 3df4a77d..f48a6f99 100644 --- a/tests/test_scripts.py +++ b/tests/test_scripts.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt diff --git a/tests/test_viv_features.py b/tests/test_viv_features.py index fa8bfda3..fcf49c84 100644 --- a/tests/test_viv_features.py +++ b/tests/test_viv_features.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 FireEye, Inc. All Rights Reserved. +# Copyright (C) 2020 Mandiant, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: [package root]/LICENSE.txt