Merge branch 'release/v1.1' into 'master'

Release/v1.1 See merge request cert/malduck!4
CERT-Polska · Jul 3, 2019 · 00afc0e · 00afc0e
2 parents b71924f + 4b45e81
commit 00afc0e
Show file tree

Hide file tree

Showing 19 changed files with 3,162 additions and 32 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
 author = 'CERT Polska'
 
 # The full version, including alpha/beta/rc tags
-release = '1.0.0'
+release = '1.1.0'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/crypto.rst b/docs/crypto.rst
@@ -16,3 +16,5 @@ Cryptography
 .. autoclass:: malduck.crypto.rsa.RSA
     :members:
 .. autofunction:: malduck.crypto.xor.xor
+.. autoclass:: malduck.crypto.serpent.Serpent
+    :members:
diff --git a/malduck/__init__.py b/malduck/__init__.py
@@ -20,7 +20,7 @@
 
 from .short import (
     aes, blowfish, des3, rc4, pe, aplib, gzip, procmem, procmempe, cuckoomem, pad, unpad,
-    insn, rsa, verify, base64, rabbit
+    insn, rsa, verify, base64, rabbit, serpent
 )
 
 from .string.bin import (

diff --git a/malduck/crypto/components/__init__.py b/malduck/crypto/components/__init__.py