From b09a0605693b0a350f4ee1a08896d638ebdd23ef Mon Sep 17 00:00:00 2001 From: me_desk Date: Fri, 11 Oct 2013 20:53:36 +0000 Subject: better handling of DH parameter generation - added new class DHParam, default DH param file dhparam4096.pem git-svn-id: svn://localhost/project_picapica/trunk@277 fb96df88-216d-11de-830c-f3023f12d8ac --- pica-client/openssltool.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'pica-client/openssltool.cpp') diff --git a/pica-client/openssltool.cpp b/pica-client/openssltool.cpp index 25640ca..b9bf6d9 100644 --- a/pica-client/openssltool.cpp +++ b/pica-client/openssltool.cpp @@ -158,7 +158,7 @@ QString OpenSSLTool::ReadStdOut() return QString::fromUtf8(openssl_.readAllStandardOutput().constData()); } -bool OpenSSLTool::GenDHParam(quint32 numbits, QString output_file) +bool OpenSSLTool::GenDHParamSignal(quint32 numbits, QString output_file, QObject *receiver, const char *finished_slot) {//openssl dhparam -5 4096 openssl_.start("openssl", QStringList() @@ -170,11 +170,8 @@ bool OpenSSLTool::GenDHParam(quint32 numbits, QString output_file) if (!openssl_.waitForStarted()) return false; - if (!openssl_.waitForFinished(-1)) - return false; - - if (openssl_.exitCode() != 0) - return false; + openssl_.disconnect(&openssl_, SIGNAL(finished(int,QProcess::ExitStatus)), 0, 0); + openssl_.connect(&openssl_, SIGNAL(finished(int,QProcess::ExitStatus)), receiver, finished_slot); return true; } -- cgit v1.2.1