infra/samba-pki-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[FIX] Some fixes

Browse Source
This commit is contained in:
Kevin GUERINEAU
2024-05-07 21:02:47 +02:00
parent 79ca16c139
commit 49b7c5e7f8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.py
+3 -3
View File
@@ -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')
manage_pki.py
+1 -1
View File
@@ -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)