Skip to content
This repository has been archived by the owner on Dec 6, 2023. It is now read-only.

Commit

Permalink
Updated all submodules, replace pycrypto with pycryptodomex
Browse files Browse the repository at this point in the history
  • Loading branch information
byt3bl33d3r committed Mar 14, 2019
1 parent a258bcf commit 333f1c4
Show file tree
Hide file tree
Showing 8 changed files with 411 additions and 267 deletions.
12 changes: 6 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
[submodule "cme/data/randomps-scripts"]
path = cme/data/randomps-scripts
url = https://github.com/xorrior/RandomPS-Scripts
[submodule "cme/thirdparty/pywerview_"]
path = cme/thirdparty/pywerview
url = https://github.com/the-useless-one/pywerview
[submodule "cme/thirdparty/impacket_"]
path = cme/thirdparty/impacket
url = https://github.com/CoreSecurity/impacket
[submodule "cme/data/cme_powershell_scripts"]
path = cme/data/cme_powershell_scripts
url = https://github.com/byt3bl33d3r/CME-PowerShell-Scripts
Expand All @@ -34,3 +28,9 @@
[submodule "cme/thirdparty/pywinrm"]
path = cme/thirdparty/pywinrm
url = https://github.com/diyan/pywinrm
[submodule "cme/thirdparty/impacket"]
path = cme/thirdparty/impacket
url = https://github.com/SecureAuthCorp/impacket
[submodule "cme/thirdparty/pywerview"]
path = cme/thirdparty/pywerview
url = https://github.com/the-useless-one/pywerview
28 changes: 11 additions & 17 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
[[source]]

url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
ipython = "*"

[packages]

pycrypto = ">=2.6"
"pyasn1" = ">=0.1.8"
gevent = ">=1.2.0"
requests = ">=2.9.1"
"bs4" = "*"
pycryptodomex = "*"
pyasn1 = "*"
gevent = "*"
requests = "*"
requests-ntlm = "*"
bs4 = "*"
netaddr = "*"
pyopenssl = "*"
termcolor = "*"
Expand All @@ -21,14 +22,7 @@ splinter = "*"
paramiko = "*"
xmltodict = "*"
six = "*"
requests-ntlm = ">=0.3.0"
terminaltables = "*"


[dev-packages]



[requires]

python_version = "2.7"
python_version = "2.7"
583 changes: 366 additions & 217 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cme/modules/gpp_password.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import xml.etree.ElementTree as ET
from Crypto.Cipher import AES
from Cryptodome.Cipher import AES
from base64 import b64decode
from binascii import unhexlify
from StringIO import StringIO
Expand Down
2 changes: 1 addition & 1 deletion cme/thirdparty/impacket
2 changes: 1 addition & 1 deletion cme/thirdparty/pywerview
47 changes: 24 additions & 23 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
-i https://pypi.python.org/simple
-i https://pypi.org/simple
asn1crypto==0.24.0
bcrypt==3.1.4
beautifulsoup4==4.6.3
backports.functools-lru-cache==1.5 ; python_version < '3'
bcrypt==3.1.6
beautifulsoup4==4.7.1
bs4==0.0.1
certifi==2018.8.24
cffi==1.11.5
certifi==2019.3.9
cffi==1.12.2
chardet==3.0.4
cryptography==2.3.1
enum34==1.1.6; python_version < '3'
gevent==1.3.6
greenlet==0.4.14; platform_python_implementation == 'CPython'
idna==2.7
ipaddress==1.0.22; python_version < '3'
cryptography==2.6.1
enum34==1.1.6 ; python_version < '3'
gevent==1.4.0
greenlet==0.4.15 ; platform_python_implementation == 'CPython'
idna==2.8
ipaddress==1.0.22 ; python_version < '3'
msgpack-python==0.5.6
netaddr==0.7.19
ntlm-auth==1.2.0
paramiko==2.4.1
pyasn1==0.4.4
pycparser==2.18
pycrypto==2.6.1
paramiko==2.4.2
pyasn1==0.4.5
pycparser==2.19
pycryptodomex==3.7.3
pylnk==0.2
pynacl==1.2.1
pyopenssl==18.0.0
pynacl==1.3.0
pyopenssl==19.0.0
requests-ntlm==1.1.0
requests==2.19.1
selenium==3.14.0; python_version >= '2.6'
six==1.11.0
splinter==0.9.0
requests==2.21.0
selenium==3.141.0
six==1.12.0
soupsieve==1.8
splinter==0.10.0
termcolor==1.1.0
terminaltables==3.1.0
urllib3==1.23; python_version >= '2.6'
xmltodict==0.11.0
urllib3==1.24.1
xmltodict==0.12.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"cme", "cme.*"
]),
install_requires=[
'pycrypto>=2.6',
'pycryptodomex',
'pyasn1>=0.1.8',
'gevent>=1.2.0',
'requests>=2.9.1',
Expand Down

0 comments on commit 333f1c4

Please sign in to comment.