Исправлено заполнение disgname сертификата

pym/console/application/create_cert.py

@@ -69,27 +69,29 @@ def makeRequest(pubkey, pkey, serv_host, auto=False):
         # list_host_name[len(list_host_name)-1]+"@"+serv_host
         # else:
         # host_name = socket.getfqdn()
-        name.CN = raw_input(_('Host Name [%s]: ') % result_host_name)
+        _CN = raw_input(_('Host Name [%s]: ') % result_host_name)
-        if name.CN in ['', None]:
+        name.CN = _CN or result_host_name
-            name.CN = result_host_name
 
-        name.OU = raw_input(_('User Name [%s]: ') % username)
+        _OU = raw_input(_('User Name [%s]: ') % username)
-        if name.OU in ['', None]:
+        name.OU = _OU or username
-            name.OU = username
+        _O = raw_input(_('Organization Name: '))
-        name.O = raw_input(_('Organization Name: '))
+        name.O = _O or ""
-        name.L = raw_input(_('Network address (hostname or IP) [%s]: ')
+
+        _L = raw_input(_('Network address (hostname or IP) [%s]: ')
                            % host_name)
-        name.ST = raw_input(_('City: '))
+        name.L = _L or ""
-        name.C = raw_input(_('Country (2 characters): [%s]') % lang)
+        _ST = raw_input(_('City: '))
-        if not name.C:
+        name.ST = _ST or ""
-            name.C = lang
+        _C = raw_input(_('Country (2 characters): [%s]') % lang)
+        name.C = _C or lang
+
     else:
-        name.CN = result_host_name  # Имя сертификата (Common Name);
+        name.CN = result_host_name or ""  # Имя сертификата (Common Name);
-        name.OU = username  # Название отдела (Organization Unit);
+        name.OU = username or ""  # Название отдела (Organization Unit);
         name.O = 'My Company'  # Название организации (Organization Name);
-        name.L = host_name  # Название города (Locality Name);
+        name.L = host_name or ""  # Название города (Locality Name);
         name.ST = 'My State'  # Название региона (State Name);
-        name.C = lang  # Двухсимвольный код страны (Country);
+        name.C = lang or "C"  # Двухсимвольный код страны (Country);
     req.set_subject_name(name)
 
     ext1 = X509.new_extension('nsComment', 'Auto Generated')