From e6c725fedcc960b689578237c03a5c3bced92583 Mon Sep 17 00:00:00 2001 From: Kevin Guerineau Date: Tue, 7 May 2024 19:05:20 +0200 Subject: [PATCH] [FIX] set name variable to generate intermediate_ca --- common.py | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/common.py b/common.py index e5b2446..f2c3bbb 100644 --- a/common.py +++ b/common.py @@ -74,26 +74,26 @@ class TisPKI: def pki_intermediate_dir(name): return os.path.join(config.get('general','pki_dir'),f'{name}_intermediate_ca') - def intermediate_ca_certfile(): - return os.path.join(TisPKI.pki_intermediate_dir(),'certs','intermediate_ca.crt') + def intermediate_ca_certfile(name): + return os.path.join(TisPKI.pki_intermediate_dir(name),'certs','intermediate_ca.crt') - def intermediate_keyout_path(): - return os.path.join(TisPKI.pki_intermediate_dir(),'private') + def intermediate_keyout_path(name): + return os.path.join(TisPKI.pki_intermediate_dir(name),'private') - def intermediate_csr_path(): - return os.path.join(TisPKI.pki_intermediate_dir(),'csr') + def intermediate_csr_path(name): + return os.path.join(TisPKI.pki_intermediate_dir(name),'csr') - def intermediate_cert_path(): - return os.path.join(TisPKI.pki_intermediate_dir(),'certs') + def intermediate_cert_path(name): + return os.path.join(TisPKI.pki_intermediate_dir(name),'certs') - def intermediate_p12_path(): - return os.path.join(TisPKI.pki_intermediate_dir(),'p12') + def intermediate_p12_path(name): + return os.path.join(TisPKI.pki_intermediate_dir(name),'p12') - def intermediate_config_path(): - return os.path.join(TisPKI.pki_intermediate_dir(),'config') + def intermediate_config_path(name): + return os.path.join(TisPKI.pki_intermediate_dir(name),'config') - def intermediate_crl_path(): - return os.path.join(TisPKI.pki_intermediate_dir(),'crl') + def intermediate_crl_path(name): + return os.path.join(TisPKI.pki_intermediate_dir(name),'crl') @@ -201,9 +201,9 @@ def create_openssl_intermediate(name, force=False,verbose=False): Printing.information(f'Create intermediate CA {name} ') check_directories(path=TisPKI.pki_intermediate_dir(name),verbose=verbose) - intermediate_ca_config = os.path.join(TisPKI.intermediate_config_path(),'create_intermediate_ca.ini') - intermediate_ca_keyfile = os.path.join(TisPKI.intermediate_keyout_path(),'intermediate_ca.key') - intermediate_crl_file = os.path.join(TisPKI.intermediate_crl_path(),'intermediate_ca.crl') + intermediate_ca_config = os.path.join(TisPKI.intermediate_config_path(name),'create_intermediate_ca.ini') + intermediate_ca_keyfile = os.path.join(TisPKI.intermediate_keyout_path(name),'intermediate_ca.key') + intermediate_crl_file = os.path.join(TisPKI.intermediate_crl_path(name),'intermediate_ca.crl') root_ca_sign_intermediate = os.path.join(TisPKI.root_config_path(),'openssl_root_ca_sign_intermediate.ini') if not os.path.isfile(root_ca_sign_intermediate): @@ -250,12 +250,12 @@ def create_openssl_intermediate(name, force=False,verbose=False): if not os.path.isfile(intermediate_ca_keyfile) and not os.path.isfile(TisPKI.intermediate_ca_certfile()): print('Generate Intermediate CA private key and CSR') - gen_intermediate_ca = subprocess.run(f'/usr/bin/openssl req -config {intermediate_ca_config} -new -sha512 -keyout {intermediate_ca_keyfile} -out {TisPKI.intermediate_csr_path()}/intermediate_ca.csr', shell=True, check=True, executable='/bin/bash') + gen_intermediate_ca = subprocess.run(f'/usr/bin/openssl req -config {intermediate_ca_config} -new -sha512 -keyout {intermediate_ca_keyfile} -out {TisPKI.intermediate_csr_path(name)}/intermediate_ca.csr', shell=True, check=True, executable='/bin/bash') print('Sign Intermediate CA with Root CA') - sign_intermediate_ca = subprocess.run(f"/usr/bin/openssl ca -config {os.path.join(TisPKI.pki_dir(),'config','openssl_root_ca_sign_intermediate.ini')} -extensions v3_intermediate_ca -days 1825 -notext -md sha512 -create_serial -in {TisPKI.intermediate_csr_path()}/intermediate_ca.csr -out {TisPKI.intermediate_ca_certfile()}", shell=True, check=True, executable='/bin/bash' ) + sign_intermediate_ca = subprocess.run(f"/usr/bin/openssl ca -config {os.path.join(TisPKI.pki_dir(),'config','openssl_root_ca_sign_intermediate.ini')} -extensions v3_intermediate_ca -days 1825 -notext -md sha512 -create_serial -in {TisPKI.intermediate_csr_path(name)}/intermediate_ca.csr -out {TisPKI.intermediate_ca_certfile(name)}", shell=True, check=True, executable='/bin/bash' ) if sign_intermediate_ca.returncode == 0: - print(f'Intermediate CA Certfile is stored in : {TisPKI.intermediate_ca_certfile()}') - print(subprocess.run(f'openssl x509 -in {TisPKI.intermediate_ca_certfile()} -text -noout', shell=True, check=True, executable='/bin/bash')) + print(f'Intermediate CA Certfile is stored in : {TisPKI.intermediate_ca_certfile(name)}') + print(subprocess.run(f'openssl x509 -in {TisPKI.intermediate_ca_certfile(name)} -text -noout', shell=True, check=True, executable='/bin/bash')) input("Press Enter to continue...") else: print('Error on generating Intermediate CA private key')