Merge branch 'master' of github.com:fireeye/capa into fix-130

CHANGELOG.md

@@ -9,9 +9,16 @@
 
 ### Breaking Changes
 
-### New Rules (1)
+### New Rules (8)
 
 - nursery/resolve-function-by-fnv-1a-hash still@teamt5.org
+- data-manipulation/encryption/encrypt-data-using-memfrob-from-glibc zander.work@mandiant.com
+- collection/group-policy/discover-group-policy-via-gpresult william.ballenthin@mandiant.com
+- host-interaction/bootloader/manipulate-safe-mode-programs william.ballenthin@mandiant.com
+- nursery/enable-safe-mode-boot william.ballenthin@mandiant.com
+- persistence/iis/persist-via-iis-module william.ballenthin@mandiant.com
+- persistence/iis/persist-via-isapi-extension william.ballenthin@mandiant.com
+- targeting/language/identify-system-language-via-api william.ballenthin@mandiant.com
 -
 
 ### Bug Fixes

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-634-blue.svg)](https://github.com/mandiant/capa-rules)
+[![Number of rules](https://img.shields.io/badge/rules-641-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)

setup.py

@@ -12,13 +12,13 @@ import setuptools
 
 requirements = [
     "tqdm==4.62.3",
-    "pyyaml==5.4.1",
+    "pyyaml==6.0",
     "tabulate==0.8.9",
     "colorama==0.4.4",
     "termcolor==1.1.0",
     "wcwidth==0.2.5",
     "ida-settings==2.1.0",
-    "viv-utils[flirt]==0.6.6",
+    "viv-utils[flirt]==0.6.7",
     "halo==0.0.31",
     "networkx==2.5.1",
     "ruamel.yaml==0.17.16",
@@ -78,11 +78,11 @@ setuptools.setup(
             "psutil==5.8.0",
             # type stubs for mypy
             "types-backports==0.1.3",
-            "types-colorama==0.4.3",
-            "types-PyYAML==5.4.10",
-            "types-tabulate==0.8.2",
-            "types-termcolor==1.1.1",
-            "types-psutil==5.8.12",
+            "types-colorama==0.4.4",
+            "types-PyYAML==6.0.0",
+            "types-tabulate==0.8.3",
+            "types-termcolor==1.1.2",
+            "types-psutil==5.8.13",
         ],
     },
     zip_safe=False,