From b2ca07b661a24d07cc58a66823182d7357734128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 8 May 2019 11:25:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20disgname=20=D1=81=D0=B5=D1=80=D1=82=D0=B8?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D0=B0=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/console/application/create_cert.py | 34 ++++++++++++++------------ 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pym/console/application/create_cert.py b/pym/console/application/create_cert.py index 1711d26..135d55d 100644 --- a/pym/console/application/create_cert.py +++ b/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) - if name.CN in ['', None]: - name.CN = result_host_name + _CN = raw_input(_('Host Name [%s]: ') % result_host_name) + name.CN = _CN or result_host_name - name.OU = raw_input(_('User Name [%s]: ') % username) - if name.OU in ['', None]: - name.OU = username - name.O = raw_input(_('Organization Name: ')) - name.L = raw_input(_('Network address (hostname or IP) [%s]: ') + _OU = raw_input(_('User Name [%s]: ') % username) + name.OU = _OU or username + _O = raw_input(_('Organization Name: ')) + name.O = _O or "" + + _L = raw_input(_('Network address (hostname or IP) [%s]: ') % host_name) - name.ST = raw_input(_('City: ')) - name.C = raw_input(_('Country (2 characters): [%s]') % lang) - if not name.C: - name.C = lang + name.L = _L or "" + _ST = raw_input(_('City: ')) + name.ST = _ST or "" + _C = raw_input(_('Country (2 characters): [%s]') % lang) + name.C = _C or lang + else: - name.CN = result_host_name # Имя сертификата (Common Name); - name.OU = username # Название отдела (Organization Unit); + name.CN = result_host_name or "" # Имя сертификата (Common Name); + 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')