1) Automatic account registration implemented;

2) All openssl command line tools invocations moved to new class OpenSSLTool


git-svn-id: svn://localhost/project_picapica/trunk@150 fb96df88-216d-11de-830c-f3023f12d8ac

1 files changed, 2 insertions, 20 deletions

diff --git a/pica-client/dialogs/viewcertdialog.cpp b/pica-client/dialogs/viewcertdialog.cpp
index 8b096c2..7f4e24a 100644
--- a/pica-client/dialogs/viewcertdialog.cpp
+++ b/pica-client/dialogs/viewcertdialog.cpp
@@ -1,7 +1,6 @@
 #include "viewcertdialog.h"
+#include "openssltool.h"
 #include <QVBoxLayout>
-#include <QProcess>
-
 #include <QMessageBox>
 
 #include <unistd.h>
@@ -42,24 +41,7 @@ ViewCertDialog::ViewCertDialog(QWidget *parent) :
 
 void ViewCertDialog::SetCert(QString cert_pem)
 {
-    QProcess openssl(this);
-    qint64 ret;
-    char *data;
-    QByteArray ba;
-
-    openssl.start("openssl", QStringList()<<"x509"<<"-noout"<<"-text"<<"-nameopt"<<"multiline,-esc_msb,utf8");
-
-    if (!openssl.waitForStarted())
-        return;
-
-    ba = cert_pem.toAscii();
-    ret = openssl.write(data = (char*)ba.constData());
-    openssl.closeWriteChannel();
-
-    if (!openssl.waitForFinished())
-        return;
-
-    cert_text->setPlainText(QString::fromUtf8(openssl.readAllStandardOutput().constData()));
+    cert_text->setPlainText(OpenSSLTool::CertTextFromString(cert_pem));
 }
 
 void ViewCertDialog::OK()