binary-refinery 0.7.1__tar.gz → 0.7.2__tar.gz

{binary_refinery-0.7.1/binary_refinery.egg-info → binary_refinery-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: binary-refinery
-Version: 0.7.1
+Version: 0.7.2
 Summary: A toolkit to transform and refine (mostly) binary data.
 Home-page: https://github.com/binref/refinery/
 Author: Jesko Huettenhain
@@ -27,126 +27,126 @@ Requires-Dist: setuptools
 Requires-Dist: toml
 Requires-Dist: wheel
 Requires-Dist: python-magic
-Requires-Dist: pyperclip
 Requires-Dist: capstone
+Requires-Dist: pyperclip
 Provides-Extra: all
-Requires-Dist: colorama; extra == "all"
-Requires-Dist: python-evtx; extra == "all"
-Requires-Dist: pycdlib; extra == "all"
-Requires-Dist: pypcapkit[scapy]>=1.3; extra == "all"
-Requires-Dist: angr; extra == "all"
-Requires-Dist: pyonenote; extra == "all"
-Requires-Dist: pypdf>=3.1.0; extra == "all"
-Requires-Dist: asn1crypto; extra == "all"
-Requires-Dist: msoffcrypto-tool; extra == "all"
-Requires-Dist: python-registry; extra == "all"
-Requires-Dist: uncompyle6; extra == "all"
-Requires-Dist: Pillow; extra == "all"
+Requires-Dist: k2l>=2.0; extra == "all"
+Requires-Dist: unicorn; extra == "all"
 Requires-Dist: cabarchive; extra == "all"
+Requires-Dist: Pillow; extra == "all"
 Requires-Dist: decompyle3; extra == "all"
-Requires-Dist: capstone; extra == "all"
-Requires-Dist: pyxlsb2; extra == "all"
-Requires-Dist: pyzstd; extra == "all"
-Requires-Dist: intervaltree; extra == "all"
-Requires-Dist: xdis; extra == "all"
+Requires-Dist: python-evtx; extra == "all"
+Requires-Dist: oletools; extra == "all"
 Requires-Dist: xlrd2; extra == "all"
+Requires-Dist: colorama; extra == "all"
+Requires-Dist: chardet; extra == "all"
+Requires-Dist: extract-msg<=0.41.0; extra == "all"
+Requires-Dist: pypcapkit[scapy]>=1.3; extra == "all"
+Requires-Dist: pyzipper; extra == "all"
 Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: phpserialize; extra == "all"
-Requires-Dist: unicorn; extra == "all"
-Requires-Dist: olefile; extra == "all"
+Requires-Dist: javaobj-py3>=0.4.0.1; extra == "all"
+Requires-Dist: asn1crypto; extra == "all"
+Requires-Dist: intervaltree; extra == "all"
+Requires-Dist: XLMMacroDeobfuscator; extra == "all"
+Requires-Dist: LnkParse3>=1.4.0; extra == "all"
+Requires-Dist: pyxlsb2; extra == "all"
 Requires-Dist: mitmproxy; extra == "all"
-Requires-Dist: pyzipper; extra == "all"
-Requires-Dist: oletools; extra == "all"
 Requires-Dist: py7zr; extra == "all"
+Requires-Dist: angr; extra == "all"
+Requires-Dist: pyzstd; extra == "all"
+Requires-Dist: uncompyle6; extra == "all"
+Requires-Dist: python-registry; extra == "all"
+Requires-Dist: olefile; extra == "all"
+Requires-Dist: phpserialize; extra == "all"
+Requires-Dist: msoffcrypto-tool; extra == "all"
 Requires-Dist: numpy; extra == "all"
-Requires-Dist: chardet; extra == "all"
-Requires-Dist: k2l>=2.0; extra == "all"
-Requires-Dist: XLMMacroDeobfuscator; extra == "all"
-Requires-Dist: javaobj-py3>=0.4.0.1; extra == "all"
+Requires-Dist: pyonenote; extra == "all"
+Requires-Dist: pycdlib; extra == "all"
+Requires-Dist: capstone; extra == "all"
+Requires-Dist: xdis; extra == "all"
+Requires-Dist: pypdf>=3.1.0; extra == "all"
 Requires-Dist: jsbeautifier; extra == "all"
-Requires-Dist: LnkParse3>=1.4.0; extra == "all"
-Requires-Dist: extract-msg<=0.41.0; extra == "all"
 Provides-Extra: speed
 Requires-Dist: numpy; extra == "speed"
 Provides-Extra: default
-Requires-Dist: intervaltree; extra == "default"
-Requires-Dist: colorama; extra == "default"
-Requires-Dist: pycdlib; extra == "default"
 Requires-Dist: unicorn; extra == "default"
-Requires-Dist: pypdf>=3.1.0; extra == "default"
-Requires-Dist: asn1crypto; extra == "default"
-Requires-Dist: pyzipper; extra == "default"
-Requires-Dist: py7zr; extra == "default"
-Requires-Dist: numpy; extra == "default"
-Requires-Dist: chardet; extra == "default"
 Requires-Dist: cabarchive; extra == "default"
-Requires-Dist: capstone; extra == "default"
 Requires-Dist: LnkParse3>=1.4.0; extra == "default"
+Requires-Dist: py7zr; extra == "default"
+Requires-Dist: asn1crypto; extra == "default"
+Requires-Dist: colorama; extra == "default"
+Requires-Dist: chardet; extra == "default"
+Requires-Dist: numpy; extra == "default"
 Requires-Dist: extract-msg<=0.41.0; extra == "default"
+Requires-Dist: pycdlib; extra == "default"
+Requires-Dist: capstone; extra == "default"
+Requires-Dist: pypdf>=3.1.0; extra == "default"
+Requires-Dist: pyzipper; extra == "default"
+Requires-Dist: intervaltree; extra == "default"
 Provides-Extra: extended
-Requires-Dist: colorama; extra == "extended"
-Requires-Dist: pycdlib; extra == "extended"
-Requires-Dist: pyonenote; extra == "extended"
-Requires-Dist: pypdf>=3.1.0; extra == "extended"
-Requires-Dist: asn1crypto; extra == "extended"
-Requires-Dist: uncompyle6; extra == "extended"
+Requires-Dist: unicorn; extra == "extended"
 Requires-Dist: cabarchive; extra == "extended"
-Requires-Dist: capstone; extra == "extended"
-Requires-Dist: intervaltree; extra == "extended"
-Requires-Dist: xdis; extra == "extended"
+Requires-Dist: oletools; extra == "extended"
 Requires-Dist: xlrd2; extra == "extended"
-Requires-Dist: LnkParse3>=1.4.0; extra == "extended"
+Requires-Dist: colorama; extra == "extended"
+Requires-Dist: chardet; extra == "extended"
+Requires-Dist: extract-msg<=0.41.0; extra == "extended"
 Requires-Dist: openpyxl; extra == "extended"
-Requires-Dist: unicorn; extra == "extended"
-Requires-Dist: olefile; extra == "extended"
 Requires-Dist: pyzipper; extra == "extended"
-Requires-Dist: oletools; extra == "extended"
+Requires-Dist: asn1crypto; extra == "extended"
+Requires-Dist: intervaltree; extra == "extended"
+Requires-Dist: pyxlsb2; extra == "extended"
+Requires-Dist: LnkParse3>=1.4.0; extra == "extended"
 Requires-Dist: py7zr; extra == "extended"
+Requires-Dist: uncompyle6; extra == "extended"
+Requires-Dist: olefile; extra == "extended"
+Requires-Dist: pyonenote; extra == "extended"
+Requires-Dist: pypdf>=3.1.0; extra == "extended"
 Requires-Dist: numpy; extra == "extended"
-Requires-Dist: chardet; extra == "extended"
+Requires-Dist: pycdlib; extra == "extended"
+Requires-Dist: capstone; extra == "extended"
+Requires-Dist: xdis; extra == "extended"
 Requires-Dist: jsbeautifier; extra == "extended"
-Requires-Dist: pyxlsb2; extra == "extended"
-Requires-Dist: extract-msg<=0.41.0; extra == "extended"
 Provides-Extra: arc
-Requires-Dist: xdis; extra == "arc"
-Requires-Dist: pycdlib; extra == "arc"
-Requires-Dist: pyzipper; extra == "arc"
+Requires-Dist: cabarchive; extra == "arc"
 Requires-Dist: py7zr; extra == "arc"
+Requires-Dist: pyzstd; extra == "arc"
 Requires-Dist: uncompyle6; extra == "arc"
-Requires-Dist: cabarchive; extra == "arc"
 Requires-Dist: decompyle3; extra == "arc"
-Requires-Dist: pyzstd; extra == "arc"
+Requires-Dist: pycdlib; extra == "arc"
+Requires-Dist: xdis; extra == "arc"
+Requires-Dist: pyzipper; extra == "arc"
 Provides-Extra: python
-Requires-Dist: xdis; extra == "python"
 Requires-Dist: uncompyle6; extra == "python"
+Requires-Dist: xdis; extra == "python"
 Requires-Dist: decompyle3; extra == "python"
 Provides-Extra: formats
-Requires-Dist: xlrd2; extra == "formats"
+Requires-Dist: XLMMacroDeobfuscator; extra == "formats"
+Requires-Dist: LnkParse3>=1.4.0; extra == "formats"
+Requires-Dist: pyxlsb2; extra == "formats"
+Requires-Dist: Pillow; extra == "formats"
+Requires-Dist: python-registry; extra == "formats"
+Requires-Dist: oletools; extra == "formats"
 Requires-Dist: python-evtx; extra == "formats"
-Requires-Dist: openpyxl; extra == "formats"
+Requires-Dist: msoffcrypto-tool; extra == "formats"
 Requires-Dist: phpserialize; extra == "formats"
-Requires-Dist: pyonenote; extra == "formats"
+Requires-Dist: extract-msg<=0.41.0; extra == "formats"
 Requires-Dist: olefile; extra == "formats"
+Requires-Dist: xlrd2; extra == "formats"
+Requires-Dist: pyonenote; extra == "formats"
 Requires-Dist: pypdf>=3.1.0; extra == "formats"
-Requires-Dist: msoffcrypto-tool; extra == "formats"
-Requires-Dist: oletools; extra == "formats"
-Requires-Dist: python-registry; extra == "formats"
-Requires-Dist: Pillow; extra == "formats"
-Requires-Dist: pyxlsb2; extra == "formats"
-Requires-Dist: XLMMacroDeobfuscator; extra == "formats"
+Requires-Dist: openpyxl; extra == "formats"
 Requires-Dist: javaobj-py3>=0.4.0.1; extra == "formats"
-Requires-Dist: LnkParse3>=1.4.0; extra == "formats"
-Requires-Dist: extract-msg<=0.41.0; extra == "formats"
 Provides-Extra: office
+Requires-Dist: XLMMacroDeobfuscator; extra == "office"
+Requires-Dist: pyxlsb2; extra == "office"
 Requires-Dist: xlrd2; extra == "office"
-Requires-Dist: openpyxl; extra == "office"
-Requires-Dist: pyonenote; extra == "office"
+Requires-Dist: oletools; extra == "office"
 Requires-Dist: olefile; extra == "office"
 Requires-Dist: msoffcrypto-tool; extra == "office"
-Requires-Dist: oletools; extra == "office"
-Requires-Dist: XLMMacroDeobfuscator; extra == "office"
-Requires-Dist: pyxlsb2; extra == "office"
 Requires-Dist: extract-msg<=0.41.0; extra == "office"
+Requires-Dist: pyonenote; extra == "office"
+Requires-Dist: openpyxl; extra == "office"
 Provides-Extra: display
 Requires-Dist: colorama; extra == "display"
 Requires-Dist: jsbeautifier; extra == "display"

{binary_refinery-0.7.1 → binary_refinery-0.7.2/binary_refinery.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: binary-refinery
-Version: 0.7.1
+Version: 0.7.2
 Summary: A toolkit to transform and refine (mostly) binary data.
 Home-page: https://github.com/binref/refinery/
 Author: Jesko Huettenhain
@@ -27,126 +27,126 @@ Requires-Dist: setuptools
 Requires-Dist: toml
 Requires-Dist: wheel
 Requires-Dist: python-magic
-Requires-Dist: pyperclip
 Requires-Dist: capstone
+Requires-Dist: pyperclip
 Provides-Extra: all
-Requires-Dist: colorama; extra == "all"
-Requires-Dist: python-evtx; extra == "all"
-Requires-Dist: pycdlib; extra == "all"
-Requires-Dist: pypcapkit[scapy]>=1.3; extra == "all"
-Requires-Dist: angr; extra == "all"
-Requires-Dist: pyonenote; extra == "all"
-Requires-Dist: pypdf>=3.1.0; extra == "all"
-Requires-Dist: asn1crypto; extra == "all"
-Requires-Dist: msoffcrypto-tool; extra == "all"
-Requires-Dist: python-registry; extra == "all"
-Requires-Dist: uncompyle6; extra == "all"
-Requires-Dist: Pillow; extra == "all"
+Requires-Dist: k2l>=2.0; extra == "all"
+Requires-Dist: unicorn; extra == "all"
 Requires-Dist: cabarchive; extra == "all"
+Requires-Dist: Pillow; extra == "all"
 Requires-Dist: decompyle3; extra == "all"
-Requires-Dist: capstone; extra == "all"
-Requires-Dist: pyxlsb2; extra == "all"
-Requires-Dist: pyzstd; extra == "all"
-Requires-Dist: intervaltree; extra == "all"
-Requires-Dist: xdis; extra == "all"
+Requires-Dist: python-evtx; extra == "all"
+Requires-Dist: oletools; extra == "all"
 Requires-Dist: xlrd2; extra == "all"
+Requires-Dist: colorama; extra == "all"
+Requires-Dist: chardet; extra == "all"
+Requires-Dist: extract-msg<=0.41.0; extra == "all"
+Requires-Dist: pypcapkit[scapy]>=1.3; extra == "all"
+Requires-Dist: pyzipper; extra == "all"
 Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: phpserialize; extra == "all"
-Requires-Dist: unicorn; extra == "all"
-Requires-Dist: olefile; extra == "all"
+Requires-Dist: javaobj-py3>=0.4.0.1; extra == "all"
+Requires-Dist: asn1crypto; extra == "all"
+Requires-Dist: intervaltree; extra == "all"
+Requires-Dist: XLMMacroDeobfuscator; extra == "all"
+Requires-Dist: LnkParse3>=1.4.0; extra == "all"
+Requires-Dist: pyxlsb2; extra == "all"
 Requires-Dist: mitmproxy; extra == "all"
-Requires-Dist: pyzipper; extra == "all"
-Requires-Dist: oletools; extra == "all"
 Requires-Dist: py7zr; extra == "all"
+Requires-Dist: angr; extra == "all"
+Requires-Dist: pyzstd; extra == "all"
+Requires-Dist: uncompyle6; extra == "all"
+Requires-Dist: python-registry; extra == "all"
+Requires-Dist: olefile; extra == "all"
+Requires-Dist: phpserialize; extra == "all"
+Requires-Dist: msoffcrypto-tool; extra == "all"
 Requires-Dist: numpy; extra == "all"
-Requires-Dist: chardet; extra == "all"
-Requires-Dist: k2l>=2.0; extra == "all"
-Requires-Dist: XLMMacroDeobfuscator; extra == "all"
-Requires-Dist: javaobj-py3>=0.4.0.1; extra == "all"
+Requires-Dist: pyonenote; extra == "all"
+Requires-Dist: pycdlib; extra == "all"
+Requires-Dist: capstone; extra == "all"
+Requires-Dist: xdis; extra == "all"
+Requires-Dist: pypdf>=3.1.0; extra == "all"
 Requires-Dist: jsbeautifier; extra == "all"
-Requires-Dist: LnkParse3>=1.4.0; extra == "all"
-Requires-Dist: extract-msg<=0.41.0; extra == "all"
 Provides-Extra: speed
 Requires-Dist: numpy; extra == "speed"
 Provides-Extra: default
-Requires-Dist: intervaltree; extra == "default"
-Requires-Dist: colorama; extra == "default"
-Requires-Dist: pycdlib; extra == "default"
 Requires-Dist: unicorn; extra == "default"
-Requires-Dist: pypdf>=3.1.0; extra == "default"
-Requires-Dist: asn1crypto; extra == "default"
-Requires-Dist: pyzipper; extra == "default"
-Requires-Dist: py7zr; extra == "default"
-Requires-Dist: numpy; extra == "default"
-Requires-Dist: chardet; extra == "default"
 Requires-Dist: cabarchive; extra == "default"
-Requires-Dist: capstone; extra == "default"
 Requires-Dist: LnkParse3>=1.4.0; extra == "default"
+Requires-Dist: py7zr; extra == "default"
+Requires-Dist: asn1crypto; extra == "default"
+Requires-Dist: colorama; extra == "default"
+Requires-Dist: chardet; extra == "default"
+Requires-Dist: numpy; extra == "default"
 Requires-Dist: extract-msg<=0.41.0; extra == "default"
+Requires-Dist: pycdlib; extra == "default"
+Requires-Dist: capstone; extra == "default"
+Requires-Dist: pypdf>=3.1.0; extra == "default"
+Requires-Dist: pyzipper; extra == "default"
+Requires-Dist: intervaltree; extra == "default"
 Provides-Extra: extended
-Requires-Dist: colorama; extra == "extended"
-Requires-Dist: pycdlib; extra == "extended"
-Requires-Dist: pyonenote; extra == "extended"
-Requires-Dist: pypdf>=3.1.0; extra == "extended"
-Requires-Dist: asn1crypto; extra == "extended"
-Requires-Dist: uncompyle6; extra == "extended"
+Requires-Dist: unicorn; extra == "extended"
 Requires-Dist: cabarchive; extra == "extended"
-Requires-Dist: capstone; extra == "extended"
-Requires-Dist: intervaltree; extra == "extended"
-Requires-Dist: xdis; extra == "extended"
+Requires-Dist: oletools; extra == "extended"
 Requires-Dist: xlrd2; extra == "extended"
-Requires-Dist: LnkParse3>=1.4.0; extra == "extended"
+Requires-Dist: colorama; extra == "extended"
+Requires-Dist: chardet; extra == "extended"
+Requires-Dist: extract-msg<=0.41.0; extra == "extended"
 Requires-Dist: openpyxl; extra == "extended"
-Requires-Dist: unicorn; extra == "extended"
-Requires-Dist: olefile; extra == "extended"
 Requires-Dist: pyzipper; extra == "extended"
-Requires-Dist: oletools; extra == "extended"
+Requires-Dist: asn1crypto; extra == "extended"
+Requires-Dist: intervaltree; extra == "extended"
+Requires-Dist: pyxlsb2; extra == "extended"
+Requires-Dist: LnkParse3>=1.4.0; extra == "extended"
 Requires-Dist: py7zr; extra == "extended"
+Requires-Dist: uncompyle6; extra == "extended"
+Requires-Dist: olefile; extra == "extended"
+Requires-Dist: pyonenote; extra == "extended"
+Requires-Dist: pypdf>=3.1.0; extra == "extended"
 Requires-Dist: numpy; extra == "extended"
-Requires-Dist: chardet; extra == "extended"
+Requires-Dist: pycdlib; extra == "extended"
+Requires-Dist: capstone; extra == "extended"
+Requires-Dist: xdis; extra == "extended"
 Requires-Dist: jsbeautifier; extra == "extended"
-Requires-Dist: pyxlsb2; extra == "extended"
-Requires-Dist: extract-msg<=0.41.0; extra == "extended"
 Provides-Extra: arc
-Requires-Dist: xdis; extra == "arc"
-Requires-Dist: pycdlib; extra == "arc"
-Requires-Dist: pyzipper; extra == "arc"
+Requires-Dist: cabarchive; extra == "arc"
 Requires-Dist: py7zr; extra == "arc"
+Requires-Dist: pyzstd; extra == "arc"
 Requires-Dist: uncompyle6; extra == "arc"
-Requires-Dist: cabarchive; extra == "arc"
 Requires-Dist: decompyle3; extra == "arc"
-Requires-Dist: pyzstd; extra == "arc"
+Requires-Dist: pycdlib; extra == "arc"
+Requires-Dist: xdis; extra == "arc"
+Requires-Dist: pyzipper; extra == "arc"
 Provides-Extra: python
-Requires-Dist: xdis; extra == "python"
 Requires-Dist: uncompyle6; extra == "python"
+Requires-Dist: xdis; extra == "python"
 Requires-Dist: decompyle3; extra == "python"
 Provides-Extra: formats
-Requires-Dist: xlrd2; extra == "formats"
+Requires-Dist: XLMMacroDeobfuscator; extra == "formats"
+Requires-Dist: LnkParse3>=1.4.0; extra == "formats"
+Requires-Dist: pyxlsb2; extra == "formats"
+Requires-Dist: Pillow; extra == "formats"
+Requires-Dist: python-registry; extra == "formats"
+Requires-Dist: oletools; extra == "formats"
 Requires-Dist: python-evtx; extra == "formats"
-Requires-Dist: openpyxl; extra == "formats"
+Requires-Dist: msoffcrypto-tool; extra == "formats"
 Requires-Dist: phpserialize; extra == "formats"
-Requires-Dist: pyonenote; extra == "formats"
+Requires-Dist: extract-msg<=0.41.0; extra == "formats"
 Requires-Dist: olefile; extra == "formats"
+Requires-Dist: xlrd2; extra == "formats"
+Requires-Dist: pyonenote; extra == "formats"
 Requires-Dist: pypdf>=3.1.0; extra == "formats"
-Requires-Dist: msoffcrypto-tool; extra == "formats"
-Requires-Dist: oletools; extra == "formats"
-Requires-Dist: python-registry; extra == "formats"
-Requires-Dist: Pillow; extra == "formats"
-Requires-Dist: pyxlsb2; extra == "formats"
-Requires-Dist: XLMMacroDeobfuscator; extra == "formats"
+Requires-Dist: openpyxl; extra == "formats"
 Requires-Dist: javaobj-py3>=0.4.0.1; extra == "formats"
-Requires-Dist: LnkParse3>=1.4.0; extra == "formats"
-Requires-Dist: extract-msg<=0.41.0; extra == "formats"
 Provides-Extra: office
+Requires-Dist: XLMMacroDeobfuscator; extra == "office"
+Requires-Dist: pyxlsb2; extra == "office"
 Requires-Dist: xlrd2; extra == "office"
-Requires-Dist: openpyxl; extra == "office"
-Requires-Dist: pyonenote; extra == "office"
+Requires-Dist: oletools; extra == "office"
 Requires-Dist: olefile; extra == "office"
 Requires-Dist: msoffcrypto-tool; extra == "office"
-Requires-Dist: oletools; extra == "office"
-Requires-Dist: XLMMacroDeobfuscator; extra == "office"
-Requires-Dist: pyxlsb2; extra == "office"
 Requires-Dist: extract-msg<=0.41.0; extra == "office"
+Requires-Dist: pyonenote; extra == "office"
+Requires-Dist: openpyxl; extra == "office"
 Provides-Extra: display
 Requires-Dist: colorama; extra == "display"
 Requires-Dist: jsbeautifier; extra == "display"

{binary_refinery-0.7.1 → binary_refinery-0.7.2}/binary_refinery.egg-info/SOURCES.txt

@@ -265,7 +265,6 @@ refinery/units/malware/n40.py
 refinery/units/meta/__init__.py
 refinery/units/meta/chop.py
 refinery/units/meta/cm.py
-refinery/units/meta/cull.py
 refinery/units/meta/dedup.py
 refinery/units/meta/eat.py
 refinery/units/meta/ef.py

{binary_refinery-0.7.1 → binary_refinery-0.7.2}/binary_refinery.egg-info/entry_points.txt

@@ -55,7 +55,6 @@ csb = refinery.units.pattern.carve:csb.run
 csd = refinery.units.pattern.carve:csd.run
 csv = refinery.units.formats.csv:csv.run
 cswap = refinery.units.strings.cswap:cswap.run
-cull = refinery.units.meta.cull:cull.run
 cupper = refinery.units.strings.cupper:cupper.run
 datefix = refinery.units.misc.datefix:datefix.run
 decompress = refinery.units.compression.decompress:decompress.run
@@ -176,6 +175,9 @@ nrv2e = refinery.units.compression.nrv:nrv2e.run
 ntlm = refinery.units.crypto.hash.password_hashes:ntlm.run
 officecrypt = refinery.units.formats.office.officecrypt:officecrypt.run
 opc = refinery.units.formats.exe.opc:opc.run
+p1 = refinery.units.meta.pick:p1.run
+p2 = refinery.units.meta.pick:p2.run
+p3 = refinery.units.meta.pick:p3.run
 pack = refinery.units.blockwise.pack:pack.run
 pad = refinery.units.meta.pad:pad.run
 pbkdf1 = refinery.units.crypto.keyderive.pbkdf1:pbkdf1.run

{binary_refinery-0.7.1 → binary_refinery-0.7.2}/refinery/__init__.py

@@ -34,7 +34,7 @@ various `refinery.units.Unit`s can be combined.
 4. `refinery.units`: writing custom units, add command-line arguments, and how to use refinery
    units within Python code.
 """
-__version__ = '0.7.1'
+__version__ = '0.7.2'
 __distribution__ = 'binary-refinery'
 
 from typing import Dict, List, Optional, Type, TypeVar, Iterable

{binary_refinery-0.7.1 → binary_refinery-0.7.2}/refinery/lib/argformats.py

@@ -1400,6 +1400,21 @@ class DelayedRegexpArgument(DelayedArgument):
 
         return expression.encode('latin-1')
 
+    @handler.register('f', final=True)
+    def format(self, name: str) -> bytes:
+        """
+        The handler `f:[name]` returns a regular expression for to one of the format types
+        supported by `refinery.carve` unit.
+        """
+        from refinery.lib.patterns import formats
+        try:
+            return formats[name]
+        except LookupError:
+            raise ArgumentTypeError(
+                F'Based on the prefix "f:", the parser looked for a carve format named "{name}".'
+                U' No such format is known; prefix the entire expression with "s:" if this was '
+                U'unintended, otherwise correct the format name spelling.')
+
     @handler.register('yara', 'Y')
     def yara(self, pattern: bytes) -> bytes:
         """

{binary_refinery-0.7.1 → binary_refinery-0.7.2}/refinery/lib/argparser.py

@@ -6,7 +6,7 @@ Provides a customized argument parser that is used by all refinery `refinery.uni
 from __future__ import annotations
 
 from typing import IO, Optional, List, Dict, Any
-from argparse import ArgumentParser, ArgumentError, Action, RawDescriptionHelpFormatter
+from argparse import ArgumentParser, ArgumentError, ArgumentTypeError, Action, RawDescriptionHelpFormatter
 
 import sys
 
@@ -136,10 +136,10 @@ class ArgumentParserWithKeywordHooks(ArgumentParser):
         self.set_defaults(**self.keywords)
         try:
             parsed = self.parse_args(args=args, namespace=namespace)
-        except ArgumentError as e:
+        except (ArgumentError, ArgumentTypeError, ArgparseError) as e:
             self.error(str(e))
-        except Exception:
-            self.error(F'Failed to parse arguments: {args!r}')
+        except Exception as e:
+            self.error(F'Failed to parse arguments: {args!r}, {e}, {type(e).__name__}')
         for name in keywords:
             param = getattr(parsed, name, None)
             if param != keywords[name]:

{binary_refinery-0.7.1 → binary_refinery-0.7.2}/refinery/lib/frame.py

@@ -120,6 +120,7 @@ import json
 import base64
 import itertools
 import zlib
+import uuid
 
 from typing import Generator, Iterable, BinaryIO, Callable, Optional, List, Dict, ByteString, Any
 from typing import TYPE_CHECKING
@@ -175,6 +176,7 @@ class Chunk(bytearray):
     """
     temp: Any = None
     meta: LazyMetaOracle
+    uuid: uuid.UUID
 
     def __init__(
         self,
@@ -191,6 +193,8 @@ class Chunk(bytearray):
         else:
             bytearray.__init__(self, data)
 
+        self.uuid = uuid.uuid4()
+
         if path is None:
             path = []
         if view is None:
@@ -220,10 +224,6 @@ class Chunk(bytearray):
             return data
         return cls(data)
 
-    @property
-    def guid(self) -> int:
-        return hash((id(self), *(id(v) for v in self.meta.values())))
-
     def set_next_scope(self, visible: bool) -> None:
         self._fill_scope = visible
 

{binary_refinery-0.7.1 → binary_refinery-0.7.2}/refinery/lib/types.py

@@ -9,6 +9,7 @@ from typing import Union, Tuple, Type, Dict, Any, Optional, List
 
 
 ByteStr = Union[bytes, bytearray, memoryview]
+BufferOrStr = Union[bytes, bytearray, memoryview, str]
 
 JSON = Optional[Union[str, int, float, bool, Type[None], Dict[str, 'JSON'], List['JSON']]]
 JSONDict = Dict[str, JSON]

{binary_refinery-0.7.1 → binary_refinery-0.7.2}/refinery/units/__init__.py

@@ -1113,7 +1113,7 @@ class DelayedArgumentProxy:
     _argo: List[str]
     _args: Dict[str, Any]
     _done: bool
-    _guid: int
+    _uuid: Any
     _lock: Lock
 
     def __copy__(self):
@@ -1125,7 +1125,7 @@ class DelayedArgumentProxy:
             _argo=list(self._argo),
             _args=dict(self._args),
             _done=self._done,
-            _guid=self._guid,
+            _uuid=self._uuid,
         )
         return clone
 
@@ -1149,10 +1149,10 @@ class DelayedArgumentProxy:
             _argo=list(argo),
             _args=args,
             _done=done,
-            _guid=None,
+            _uuid=None,
         )
 
-    def __call__(self, data: bytearray):
+    def __call__(self, data: Chunk):
         """
         Update the current arguments for the input `data`, regardless of whether or not this chunk
         has already been used. In most cases, the matrix-multiplication syntax should be used instead
@@ -1168,18 +1168,16 @@ class DelayedArgumentProxy:
                 value = getattr(self._argv, name, None)
                 if value and pending(value):
                     self._args[name] = manifest(value, data)
-            self._store(_guid=id(data))
+            self._store(_uuid=data.uuid)
         return data
 
-    def __matmul__(self, data: bytearray):
+    def __matmul__(self, data: Chunk):
         """
         Interpret the current arguments for the given input `data`.
         """
         if self._done:
             return data
-        if not isinstance(data, bytearray):
-            data = bytearray(data)
-        if id(data) == self._guid:
+        if self._uuid == data.uuid:
             return data
         return self(data)
 
@@ -1414,7 +1412,7 @@ class Unit(UnitBase, abstract=True):
             if self.leniency >= 1:
                 return exception.partial
             if self.log_level < LogLevel.DETACHED:
-                self.log_warn(F'error, partial result returned: {exception}')
+                self.log_warn(F'A partial result was returned, use the -L switch to retrieve it: {exception}')
                 return None
             raise exception
         elif self.log_level >= LogLevel.DETACHED:
@@ -1443,8 +1441,8 @@ class Unit(UnitBase, abstract=True):
                 message = F'{message}; {explanation!s}'
             if self.log_level <= LogLevel.INFO and data is not None:
                 from refinery.units.sinks.peek import peek
-                peeked = str(data | peek(lines=2, decode=True, stdout=True))
-                message = F'{message}\n{peeked}'
+                preview = data | peek(lines=2, decode=True, stdout=True) | [str]
+                message = '\n'.join((message, *preview))
             self.log_fail(message)
 
         if self.log_debug():
@@ -1793,20 +1791,19 @@ class Unit(UnitBase, abstract=True):
             return B''
 
     def act(self, data: Union[Chunk, ByteStr]) -> Generator[ByteStr, None, None]:
-        skip = self.args.iff
-        mode = self.args.reverse
-        if skip and not self.handles(data):
-            if skip < 2:
+        reverse = self.args.reverse
+        iff = self.args.iff
+        if iff and not self.handles(data):
+            if iff < 2:
                 yield data
             return
         else:
             data = self.args @ data
-        if not mode:
-            it = self.process(data)
-        elif mode % 2:
+            data = data
+        if reverse:
             it = self.reverse(data)
         else:
-            it = self.reverse(self.process(data))
+            it = self.process(data)
         if not inspect.isgenerator(it):
             it = (it,)
         for out in it:
@@ -1928,8 +1925,8 @@ class Unit(UnitBase, abstract=True):
             help='Specify up to two times to increase log level.')
 
         if cls.is_reversible:
-            base.add_argument('-R', '--reverse', action='count', default=0,
-                help='Use the reverse operation; Specify twice to normalize (first decode, then encode).')
+            base.add_argument('-R', '--reverse', action='store_true',
+                help='Use the reverse operation.')
 
         if cls.handles.__func__ is not Unit.handles.__func__:
             base.add_argument('-F', '--iff', action='count', default=0,