diff options
| author | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2013-10-11 20:53:36 +0000 |
|---|---|---|
| committer | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2013-10-11 20:53:36 +0000 |
| commit | b09a0605693b0a350f4ee1a08896d638ebdd23ef (patch) | |
| tree | 372199dad42e5245370dfd0a01909c5326ec81b7 /pica-client/openssltool.cpp | |
| parent | 56c1e5aacaaec79b24453d406e7c2b218fa0cc9f (diff) | |
| download | pica-pica-b09a0605693b0a350f4ee1a08896d638ebdd23ef.tar.gz pica-pica-b09a0605693b0a350f4ee1a08896d638ebdd23ef.zip | |
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
Diffstat (limited to 'pica-client/openssltool.cpp')
| -rw-r--r-- | pica-client/openssltool.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
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; } |