From 709d71da3433cfe3af38558b9c980f62fa087305 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?= <mh@calculate.ru>
Date: Wed, 8 May 2019 10:05:49 +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=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D1=81=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=BC=20M2Crypto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/console/__init__.py                 | 0
 pym/console/application/cert_func.py    | 4 ++--
 pym/console/application/cl_client.py    | 2 +-
 pym/console/application/client_class.py | 2 +-
 pym/console/application/create_cert.py  | 4 ++--
 pym/console/console_main.py             | 0
 pym/console/datavars.py                 | 0
 pym/console/variables/console.py        | 0
 8 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 pym/console/__init__.py
 mode change 100755 => 100644 pym/console/console_main.py
 mode change 100755 => 100644 pym/console/datavars.py
 mode change 100755 => 100644 pym/console/variables/console.py

diff --git a/pym/console/__init__.py b/pym/console/__init__.py
old mode 100755
new mode 100644
diff --git a/pym/console/application/cert_func.py b/pym/console/application/cert_func.py
index 912686d..53c37fa 100644
--- a/pym/console/application/cert_func.py
+++ b/pym/console/application/cert_func.py
@@ -95,11 +95,11 @@ def new_key_req(key, cert_path, server_host_name, private_key_passwd=None,
         passphrase_callback
 
     rsa = generateRSAKey()
-    rsa.save_key(key + '_pub', cipher=None, callback=lambda *unused: None)
+    rsa.save_key(key + '_pub', cipher=None, callback=lambda *unused: "")
 
     pkey = makePKey(rsa)
     if not passphrase_callback(private_key_passwd):
-        pkey.save_key(key, cipher=None, callback=lambda *unused: None)
+        pkey.save_key(key, cipher=None, callback=lambda *unused: "")
     else:
         pkey.save_key(key, callback=lambda *unused: str(private_key_passwd))
 
diff --git a/pym/console/application/cl_client.py b/pym/console/application/cl_client.py
index 476fab9..d57820e 100644
--- a/pym/console/application/cl_client.py
+++ b/pym/console/application/cl_client.py
@@ -128,7 +128,7 @@ def connect_with_cert(cert, path_to_cert, url, args, wait_thread, clVarsCore,
     client = None
 
     bio = M2Crypto.BIO.openfile(CERT_KEY)
-    rsa = M2Crypto.m2.rsa_read_key(bio._ptr(), lambda *unused: None)
+    rsa = M2Crypto.m2.rsa_read_key(bio._ptr(), lambda *unused: "")
     store_passwd = None
     if not rsa:
         port = args.port or clVarsCore.Get('core.cl_core_port')
diff --git a/pym/console/application/client_class.py b/pym/console/application/client_class.py
index b4d92e4..e4fc255 100644
--- a/pym/console/application/client_class.py
+++ b/pym/console/application/client_class.py
@@ -495,7 +495,7 @@ class HTTPSClientCertTransport(HttpTransport):
                     OpenSSL.SSL.FILETYPE_PEM, file(key).read(), str(password))
             else:
                 bio = M2Crypto.BIO.openfile(key)
-                rsa = M2Crypto.m2.rsa_read_key(bio._ptr(), lambda *unused: None)
+                rsa = M2Crypto.m2.rsa_read_key(bio._ptr(), lambda *unused: "")
                 if not rsa:
                     raise OpenSSL.crypto.Error
                 client_keyobj = OpenSSL.crypto.load_privatekey(
diff --git a/pym/console/application/create_cert.py b/pym/console/application/create_cert.py
index 56cf366..1711d26 100644
--- a/pym/console/application/create_cert.py
+++ b/pym/console/application/create_cert.py
@@ -26,7 +26,7 @@ setLocalTranslate('cl_console3', sys.modules[__name__])
 
 def passphrase_callback(v):
     if type(v) == int or not v:
-        return None
+        return ""
     return str(v)
 
 
@@ -92,7 +92,7 @@ def makeRequest(pubkey, pkey, serv_host, auto=False):
         name.C = lang  # Двухсимвольный код страны (Country);
     req.set_subject_name(name)
 
-    ext1 = X509.new_extension('Comment', 'Auto Generated')
+    ext1 = X509.new_extension('nsComment', 'Auto Generated')
     extstack = X509.X509_Extension_Stack()
     extstack.push(ext1)
     req.add_extensions(extstack)
diff --git a/pym/console/console_main.py b/pym/console/console_main.py
old mode 100755
new mode 100644
diff --git a/pym/console/datavars.py b/pym/console/datavars.py
old mode 100755
new mode 100644
diff --git a/pym/console/variables/console.py b/pym/console/variables/console.py
old mode 100755
new mode 100644