From 7583e31ae738b8dd6f9dd33792b0b557e7bf4cb1 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 10:05:19 +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=20M2Crypto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/consolegui/__init__.py | 0 pym/consolegui/application/Box.py | 0 pym/consolegui/application/CertificateClass.py | 0 pym/consolegui/application/DisplayMethod.py | 0 pym/consolegui/application/LeftMenu.py | 0 pym/consolegui/application/MainClass.py | 0 pym/consolegui/application/MainFrameResult.py | 0 pym/consolegui/application/ReturnMessage.py | 0 pym/consolegui/application/View_Process.py | 0 pym/consolegui/application/__init__.py | 0 pym/consolegui/application/client_class.py | 0 pym/consolegui/application/conf_connection.py | 2 +- pym/consolegui/application/create_cert.py | 8 ++++---- pym/consolegui/application/helpwidget.py | 0 pym/consolegui/application/mainframe.py | 0 pym/consolegui/application/mainmenu.py | 0 pym/consolegui/application/more.py | 0 pym/consolegui/application/pid_information.py | 0 pym/consolegui/application/session_function.py | 0 pym/consolegui/application/statusfield.py | 0 pym/consolegui/application/tools.py | 0 pym/consolegui/datavars.py | 0 pym/consolegui/variables/console.py | 0 23 files changed, 5 insertions(+), 5 deletions(-) mode change 100755 => 100644 pym/consolegui/__init__.py mode change 100755 => 100644 pym/consolegui/application/Box.py mode change 100755 => 100644 pym/consolegui/application/CertificateClass.py mode change 100755 => 100644 pym/consolegui/application/DisplayMethod.py mode change 100755 => 100644 pym/consolegui/application/LeftMenu.py mode change 100755 => 100644 pym/consolegui/application/MainClass.py mode change 100755 => 100644 pym/consolegui/application/MainFrameResult.py mode change 100755 => 100644 pym/consolegui/application/ReturnMessage.py mode change 100755 => 100644 pym/consolegui/application/View_Process.py mode change 100755 => 100644 pym/consolegui/application/__init__.py mode change 100755 => 100644 pym/consolegui/application/client_class.py mode change 100755 => 100644 pym/consolegui/application/conf_connection.py mode change 100755 => 100644 pym/consolegui/application/create_cert.py mode change 100755 => 100644 pym/consolegui/application/helpwidget.py mode change 100755 => 100644 pym/consolegui/application/mainframe.py mode change 100755 => 100644 pym/consolegui/application/mainmenu.py mode change 100755 => 100644 pym/consolegui/application/more.py mode change 100755 => 100644 pym/consolegui/application/pid_information.py mode change 100755 => 100644 pym/consolegui/application/session_function.py mode change 100755 => 100644 pym/consolegui/application/statusfield.py mode change 100755 => 100644 pym/consolegui/application/tools.py mode change 100755 => 100644 pym/consolegui/datavars.py mode change 100755 => 100644 pym/consolegui/variables/console.py diff --git a/pym/consolegui/__init__.py b/pym/consolegui/__init__.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/Box.py b/pym/consolegui/application/Box.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/CertificateClass.py b/pym/consolegui/application/CertificateClass.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/DisplayMethod.py b/pym/consolegui/application/DisplayMethod.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/LeftMenu.py b/pym/consolegui/application/LeftMenu.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/MainClass.py b/pym/consolegui/application/MainClass.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/MainFrameResult.py b/pym/consolegui/application/MainFrameResult.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/ReturnMessage.py b/pym/consolegui/application/ReturnMessage.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/View_Process.py b/pym/consolegui/application/View_Process.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/__init__.py b/pym/consolegui/application/__init__.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/client_class.py b/pym/consolegui/application/client_class.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/conf_connection.py b/pym/consolegui/application/conf_connection.py old mode 100755 new mode 100644 index c4b08b4..bc441fd --- a/pym/consolegui/application/conf_connection.py +++ b/pym/consolegui/application/conf_connection.py @@ -320,7 +320,7 @@ class FrameConnection(qt.QWidget): # check passwd private_key import M2Crypto 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: "") if re_passwd != False: self.str_passwd = re_passwd if not rsa and not self.str_passwd and auto: diff --git a/pym/consolegui/application/create_cert.py b/pym/consolegui/application/create_cert.py old mode 100755 new mode 100644 index 60e8f3c..d2ed71f --- a/pym/consolegui/application/create_cert.py +++ b/pym/consolegui/application/create_cert.py @@ -21,7 +21,7 @@ from more import LabelWordWrap, show_msg, get_icon def passphrase_callback(v): if type(v) == int or not v: - return None + return "" return str(v) def generateRSAKey(): @@ -147,12 +147,12 @@ class RequestCreate (qt.QWidget): private_key_passwd = self.passwd_lineedit.text() rsa = generateRSAKey() rsa.save_key(self.key + '_pub', cipher = None, - callback = lambda *unused: None) + callback = lambda *unused: "") pkey = makePKey(rsa) if not passphrase_callback(private_key_passwd): pkey.save_key(self.key, cipher = None, - callback = lambda *unused: None) + callback = lambda *unused: "") else: pkey.save_key(self.key,\ callback= lambda *unused: str(private_key_passwd)) @@ -175,7 +175,7 @@ class RequestCreate (qt.QWidget): ####### 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/consolegui/application/helpwidget.py b/pym/consolegui/application/helpwidget.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/mainframe.py b/pym/consolegui/application/mainframe.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/mainmenu.py b/pym/consolegui/application/mainmenu.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/more.py b/pym/consolegui/application/more.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/pid_information.py b/pym/consolegui/application/pid_information.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/session_function.py b/pym/consolegui/application/session_function.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/statusfield.py b/pym/consolegui/application/statusfield.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/application/tools.py b/pym/consolegui/application/tools.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/datavars.py b/pym/consolegui/datavars.py old mode 100755 new mode 100644 diff --git a/pym/consolegui/variables/console.py b/pym/consolegui/variables/console.py old mode 100755 new mode 100644