From 1588b970cdf055af3273d4ec810d81215eda40ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= <as@calculate.ru>
Date: Mon, 29 Nov 2010 14:30:21 +0300
Subject: [PATCH] Fix path certificate.

---
 pym/encrypt.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pym/encrypt.py b/pym/encrypt.py
index 79df156..94b8164 100644
--- a/pym/encrypt.py
+++ b/pym/encrypt.py
@@ -243,16 +243,16 @@ emailAddress       = %(sslEmail)s
 nsCertType         = %(nsCertType)s
 """
 
-    templCreateKey = "%(sslFile)s genrsa -out %(certKeyFile)s %(sslBits)s"
+    templCreateKey = "%(sslFile)s genrsa -out '%(certKeyFile)s' %(sslBits)s"
     templCreateCert = "%(sslFile)s req -new -x509 -days %(sslDays)s "\
-                      "-config %(cnfFile)s -key %(certKeyFile)s "\
-                      "-out %(certFile)s"
+                      "-config '%(cnfFile)s' -key '%(certKeyFile)s' "\
+                      "-out '%(certFile)s'"
     templCreateReq = "%(sslFile)s req -new -days %(sslDays)s "\
-                     "-config %(cnfFile)s -key %(certKeyFile)s "\
-                     "-out %(certCsrFile)s"
-    templCreateSignCert = "%(sslFile)s ca -batch -config %(cnfFile)s "\
-                          "-policy policy_anything -days %(sslDays)s "\
-                          "-out %(certFile)s -infiles %(certCsrFile)s"
+                     "-config '%(cnfFile)s' -key '%(certKeyFile)s' "\
+                     "-out '%(certCsrFile)s'"
+    templCreateSignCert = "%(sslFile)s ca -batch -config '%(cnfFile)s' "\
+                          "-policy policy_anything -days '%(sslDays)s' "\
+                          "-out '%(certFile)s' -infiles '%(certCsrFile)s'"
 
     def createCnfFile(self, textCnf):
         '''Generate openssl.cnf file'''
@@ -269,7 +269,7 @@ nsCertType         = %(nsCertType)s
 
     def checkCertificate(self, certFile):
         # Проверка сертификата
-        textLine = execProg("%s x509 -subject -fingerprint -noout -in %s"
+        textLine = execProg("%s x509 -subject -fingerprint -noout -in '%s'"
                                  %(self.sslFile, certFile))
         if textLine is False:
             self.printERROR(_("Error checking certificate %s")%certFile)
@@ -456,10 +456,6 @@ nsCertType         = %(nsCertType)s
             os.chown(keyFile, uid,gid)
             os.chmod(keyFile, fileMode)
         # generate request
-        templCreateReq = "%(sslFile)s req -new -days %(sslDays)s "\
-                     "-config %(cnfFile)s -key %(certKeyFile)s "\
-                     "-out %(certCsrFile)s"
-
         execStr = self.templCreateReq%{'sslFile':self.sslFile,
                                        'sslDays':sslDays,
                                        'cnfFile':cnfFile,
@@ -539,9 +535,10 @@ nsCertType         = %(nsCertType)s
             if not os.path.exists(dirName):
                 self._createDir(dirName, uid=uid, gid=gid)
         # Создание сертификата
-        textLine = execProg(
-            "%s req -new -x509 -nodes -config %s -days %s -out %s -keyout %s"
-            %(self.sslFile, cnfFile, sslDays, certFile, keyFile))
+        textLine = execProg("%s req -new -x509 -nodes -config '%s'"
+                            "-days %s -out '%s'-keyout '%s'"
+                            %(self.sslFile, cnfFile, sslDays, certFile,
+                              keyFile))
         if textLine is False:
             self.printERROR(_("Can not create certificate %s")%certFile)
             return False