infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Land #9604, Fix logged errors when running without Python 3.6 / gmpy2

4.x
Jacob Robles 2018-02-22 08:11:30 -06:00 committed by Metasploit
parent a189673782
commit 178afdaed1
No known key found for this signature in database
GPG Key ID: CDFB5FA52007B954
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/msf/core/modules/external/python/metasploit/module.py vendored
View File

@ -29,7 +29,7 @@ def report_vuln(ip, name, **opts):
def run(metadata, module_callback): def run(metadata, module_callback):
req = json.loads(os.read(0, 10000)) req = json.loads(os.read(0, 10000).decode("utf-8"))
if req['method'] == 'describe': if req['method'] == 'describe':
rpc_send({'jsonrpc': '2.0', 'id': req['id'], 'response': metadata}) rpc_send({'jsonrpc': '2.0', 'id': req['id'], 'response': metadata})
elif req['method'] == 'run': elif req['method'] == 'run':

14
modules/auxiliary/scanner/ssl/bleichenbacher_oracle.py
View File

@ -9,9 +9,13 @@ import os
import ssl import ssl
# extra modules # extra modules
import gmpy2 dependencies_missing = False
from cryptography import x509 try:
from cryptography.hazmat.backends import default_backend import gmpy2
from cryptography import x509
from cryptography.hazmat.backends import default_backend
except ImportError:
dependencies_missing = True
from metasploit import module from metasploit import module
@ -151,6 +155,10 @@ def oracle(target, pms, cke_2nd_prefix, cipher_handshake=ch_def, messageflow=Fal
def run(args): def run(args):
if dependencies_missing:
module.log("Module dependencies (gmpy2 and cryptography python libraries) missing, cannot continue", level='error')
return
target = (args['rhost'], int(args['rport'])) target = (args['rhost'], int(args['rport']))
timeout = float(args['timeout']) timeout = float(args['timeout'])
cipher_handshake = cipher_handshakes[args['cipher_group']] cipher_handshake = cipher_handshakes[args['cipher_group']]