Remove genPublicCaCert_dependencies function

Katello · Sep 14, 2020 · e9dca5d · e9dca5d
1 parent 947f654
commit e9dca5d
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/katello_certs_tools/katello_ssl_tool.py b/katello_certs_tools/katello_ssl_tool.py
@@ -236,12 +236,19 @@ def genPrivateCaKey(password, d, verbosity=0, forceYN=0):
     os.chmod(ca_key, 0o600)
 
 
-def genPublicCaCert_dependencies(password, d, forceYN=0):
+def genPublicCaCert(password, d, verbosity=0, forceYN=0):
     """ public CA certificate (client-side) generation """
 
+    passwordCheck(password)
+
     gendir(d['--dir'])
+
     ca_key = os.path.join(d['--dir'], os.path.basename(d['--ca-key']))
-    ca_cert = os.path.join(d['--dir'], os.path.basename(d['--ca-cert']))
+    dependencyCheck(ca_key)
+
+    ca_cert_name = os.path.basename(d['--ca-cert'])
+    ca_cert = os.path.join(d['--dir'], ca_cert_name)
+    ca_openssl_cnf = os.path.join(d['--dir'], CA_OPENSSL_CNF_NAME)
 
     if not forceYN and os.path.exists(ca_cert):
         sys.stderr.write("""\
@@ -251,21 +258,6 @@ def genPublicCaCert_dependencies(password, d, forceYN=0):
 """ % ca_cert)
         sys.exit(errnoGeneralError)
 
-    dependencyCheck(ca_key)
-
-    passwordCheck(password)
-
-
-def genPublicCaCert(password, d, verbosity=0, forceYN=0):
-    """ public CA certificate (client-side) generation """
-
-    ca_key = os.path.join(d['--dir'], os.path.basename(d['--ca-key']))
-    ca_cert_name = os.path.basename(d['--ca-cert'])
-    ca_cert = os.path.join(d['--dir'], ca_cert_name)
-    ca_openssl_cnf = os.path.join(d['--dir'], CA_OPENSSL_CNF_NAME)
-
-    genPublicCaCert_dependencies(password, d, forceYN)
-
     configFile = ConfigFile(ca_openssl_cnf)
     if '--set-hostname' in d:
         del d['--set-hostname']
@@ -832,7 +824,6 @@ def _main():
             genPrivateCaKey(getCAPassword(options), DEFS,
                             options.verbose, options.force)
         elif getOption(options, 'cert_only'):
-            genPublicCaCert_dependencies(getCAPassword(options), DEFS, options.force)
             genPublicCaCert(getCAPassword(options), DEFS,
                             options.verbose, options.force)
         elif getOption(options, 'rpm_only'):