From 49b7c5e7f8eda7a0b75cee656919cf454783c4d6 Mon Sep 17 00:00:00 2001 From: Kevin Guerineau Date: Tue, 7 May 2024 21:02:47 +0200 Subject: [PATCH] [FIX] Some fixes --- common.py | 6 +++--- manage_pki.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common.py b/common.py index c4fbcfa..77fb0b1 100644 --- a/common.py +++ b/common.py @@ -280,15 +280,15 @@ def create_openssl_intermediate(name, force=False,verbose=False): def generate_dc_certificate(dc_name=None, ca_name=None, force=False, verbose=False): if ca_name != "Root": - dc_certfile = os.path.join(TisPKI.intermediate_cert_path(ca_name),f'{dc_name}.crt') - dc_keyfile = os.path.join(TisPKI.intermediate_keyout_path(ca_name),f'{dc_name}.key') + dc_certfile = TisPKI.intermediate_ca_certfile(ca_name) + dc_keyfile = TisPKI.intermediate_ca_keyfile(ca_name) dc_csrfile = os.path.join(TisPKI.intermediate_csr_path(ca_name),f'{dc_name}.csr') dc_openssl_configfile = os.path.join(TisPKI.intermediate_config_path(ca_name),f'openssl_{dc_name}.ini') crl_file = os.path.join(TisPKI.intermediate_crl_path(ca_name),'intermediate_ca.crl') dc_ca_keyfile = TisPKI.intermediate_ca_keyfile(ca_name) dc_ca_certfile = TisPKI.intermediate_cert_path(ca_name) crl_uri = config.get('openssl_config','intermediate_crl_uri') - pki_dir = TisPKI.pki_intermediate_dir() + pki_dir = TisPKI.pki_intermediate_dir(ca_name) else: dc_certfile = os.path.join(TisPKI.root_cert_path(),f'{dc_name}.crt') dc_keyfile = os.path.join(TisPKI.root_keyout_path(),f'{dc_name}.key') diff --git a/manage_pki.py b/manage_pki.py index aef2a59..32d5f61 100644 --- a/manage_pki.py +++ b/manage_pki.py @@ -58,7 +58,7 @@ def main(): create_openssl_intermediate(args.intermediate_name,args.force,args.verbose) if args.dc_cert: - if not args.dc_name or args.intermediate_name: + if not args.dc_name or not args.intermediate_name: print('Add --dc-name or --name with this command') else: generate_dc_certificate(dc_name=args.dc_name, ca_name=args.intermediate_name, force=args.force, verbose=args.verbose)