Small contextual patch for Pvk2Pfx process in code_sign mod.

BuvinJT · Feb 12, 2021 · 9ca5626 · 9ca5626
1 parent 6fa2a2c
commit 9ca5626
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/distbuilder/code_sign.py b/distbuilder/code_sign.py
@@ -253,7 +253,8 @@ def __validateSelfSignedCertConfig( cfg, isOverwrite ):
                 raise Exception( "File exists: %s" % (cfg.caCertPath,) )
             if isFile( cfg.privateKeyPath ):
                 raise Exception( "File exists: %s" % (cfg.privateKeyPath,) )
-    else: makeDir( cfg.destDirPath )                                            
+    else: makeDir( cfg.destDirPath )       
+
     if cfg._isMakeCertMethod: 
         if cfg.makeCertPath is None: 
             cfg.makeCertPath = getenv( MAKECERT_PATH_ENV_VAR )    
@@ -354,12 +355,14 @@ def __validatePvk2PfxConfig( cfg, isOverwrite ):
         raise Exception( 
             "Missing or invalid CA cert path in Pvk2PfxConfig: %s" %
             (cfg.caCertPath,) )
-    if isOverwrite:
-        removeFromDir( baseFileName( cfg.pfxFilePath ), 
-                            dirPath( cfg.pfxFilePath ) )
-    elif isFile( cfg.pfxFilePath ):
-        raise Exception( "File exists: %s" % (cfg.pfxFilePath,) )
-    else: makeDir( cfg.destDirPath )                                         
+
+    destDirPath = dirPath( cfg.pfxFilePath )
+    if isDir( destDirPath ):    
+        if isOverwrite:
+            removeFromDir( baseFileName( cfg.pfxFilePath ), destDirPath )
+        elif isFile( cfg.pfxFilePath ):
+            raise Exception( "File exists: %s" % (cfg.pfxFilePath,) )
+    else: makeDir( destDirPath )                                         
 
     if cfg.pvk2PfxPath is None: 
         cfg.pvk2PfxPath = getenv( PVK2PFX_PATH_ENV_VAR )    

diff --git a/examples/hello_code_signing/certs/generateTrustCerts.py b/examples/hello_code_signing/certs/generateTrustCerts.py
@@ -7,7 +7,7 @@
 
 # Supply a PFX password using one of the following options. 
 password = getPassword( isGuiPrompt=True )
-#password = None # click ok through the prompts if you really don't want a password!
+#password = None # Verify in prompts that appear that you really don't want a password!
 #password = "my-secure-password"
 
 # Generate code signing files to retain (securely!) in house