fixed cl-core -u

master
idziubenko 3 years ago
parent 8a47d5b0d7
commit 15b0b7f9ed

@ -71,7 +71,7 @@ def new_key_req(key, cert_path, server_host_name, auto=False):
crtreq = req.as_pem()
req_file = os.path.join(cert_path, '%s.csr' % server_host_name)
crtfile = open(req_file, 'w')
crtfile = open(req_file, 'wb')
crtfile.write(crtreq)
crtfile.close()
return req_file

@ -272,7 +272,7 @@ def get_certificate_dn(cert_file):
certobj = OpenSSL.crypto.load_certificate(
OpenSSL.SSL.FILETYPE_PEM, cert_data)
cert_info = dict(certobj.get_subject().get_components())
return cert_info["CN"]
return cert_info[b"CN"].decode("UTF-8")
return "localhost"

@ -45,7 +45,7 @@ _('No module named %s')
def main(*args, **keywords):
_args = list(unpack_single_opts(sys.argv[1:]))
caller = os.path.basename(sys.argv[0])
if not (caller == 'cl-core'):
if not (caller == 'cl-core' or caller == "run_debug_core.py"):
parser = cert_cmd.parse(full=False)
args, unknown_args = parser.parse_known_args(_args)
args.method = '_temp_'

@ -1606,7 +1606,7 @@ def new_key_req(key, cert_path, serv_host_name, port):
if not req:
sys.exit()
crtreq = req.as_pem()
crtfile = open(cert_path + '/server.csr', 'w')
crtfile = open(cert_path + '/server.csr', 'wb')
crtfile.write(crtreq)
crtfile.close()

@ -187,8 +187,8 @@ def local_method(metaObject, args, unknown_args):
import os
sym_link = os.path.basename(sys.argv[0])
# sym_link = "cl-core"
if not (sym_link == 'cl-core'):
#debug
if not (sym_link == 'cl-core' or sym_link == "run_debug_core.py"):
if sym_link in LoadedMethods.conMethods.keys():
args.method = LoadedMethods.conMethods[sym_link][0]
else:

Loading…
Cancel
Save