Skip to content

Commit 4b45e81

Browse files
psrok1psrok1
committed
Merge branch 'feature/serpent' into 'release/v1.1'
Added serpent See merge request cert/malduck!5
2 parents 9345920 + 0b8e9e2 commit 4b45e81

File tree

7 files changed

+3031
-2
lines changed

7 files changed

+3031
-2
lines changed

‎docs/crypto.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ Cryptography
1616
.. autoclass:: malduck.crypto.rsa.RSA
1717
:members:
1818
.. autofunction:: malduck.crypto.xor.xor
19+
.. autoclass:: malduck.crypto.serpent.Serpent
20+
:members:

‎malduck/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from .short import (
2222
aes, blowfish, des3, rc4, pe, aplib, gzip, procmem, procmempe, cuckoomem, pad, unpad,
23-
insn, rsa, verify, base64, rabbit
23+
insn, rsa, verify, base64, rabbit, serpent
2424
)
2525

2626
from .string.bin import (

‎malduck/crypto/components/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)