diff options
| author | Anton <anton@picapica> | 2018-07-28 19:56:52 +0400 |
|---|---|---|
| committer | Anton <anton@picapica> | 2018-07-28 19:56:52 +0400 |
| commit | d240ed3e88dbb164d36a8007939b4ab7913f8435 (patch) | |
| tree | 30d8b8dd7e306ab6928e3cfb158c19c34b7cf11b /pica-client | |
| parent | fd9f68b50ef480f84bda3910e6e2a064eeaaee51 (diff) | |
| download | pica-pica-d240ed3e88dbb164d36a8007939b4ab7913f8435.tar.gz pica-pica-d240ed3e88dbb164d36a8007939b4ab7913f8435.zip | |
add header file PICA_security.h to group important security parameters in one place
Diffstat (limited to 'pica-client')
| -rw-r--r-- | pica-client/dialogs/registeraccountdialog.cpp | 3 | ||||
| -rw-r--r-- | pica-client/openssltool.cpp | 4 | ||||
| -rw-r--r-- | pica-client/pica-client.pro | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/pica-client/dialogs/registeraccountdialog.cpp b/pica-client/dialogs/registeraccountdialog.cpp index 3fd0f71..34254d9 100644 --- a/pica-client/dialogs/registeraccountdialog.cpp +++ b/pica-client/dialogs/registeraccountdialog.cpp @@ -17,6 +17,7 @@ */ #include "registeraccountdialog.h" #include "../globals.h" +#include "../../PICA_security.h" #include <QVBoxLayout> #include <QDir> #include <QFile> @@ -178,7 +179,7 @@ void RegisterAccountDialog::Register() nickname->setEnabled(false); btRegister->setEnabled(false); - ost.GenRSAKeySignal(4096, config_dir + QDir::separator() + "privkey.pem", cbSetPassword->isChecked(), + ost.GenRSAKeySignal(PICA_RSA_KEYSIZE, config_dir + QDir::separator() + "privkey.pem", cbSetPassword->isChecked(), password->text(), rand, this, SLOT(stageSignCert(int, QProcess::ExitStatus))); } diff --git a/pica-client/openssltool.cpp b/pica-client/openssltool.cpp index a899c74..314dbd5 100644 --- a/pica-client/openssltool.cpp +++ b/pica-client/openssltool.cpp @@ -16,6 +16,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "openssltool.h" +#include "../PICA_security.h" #include <QProcess> #include <QRegExp> #include <QMessageBox> @@ -119,7 +120,7 @@ bool OpenSSLTool::GenRSAKeySignal(quint32 numbits, QString keyfile, bool setpass args << "genrsa" << "-out" << keyfile; if (setpassword) - args << "-passout" << "stdin" << "-aes256"; + args << "-passout" << "stdin" << PICA_PRIVKEYENCALGO; if (!rand.isEmpty()) args << "-rand" << rand; @@ -160,6 +161,7 @@ bool OpenSSLTool::GenCertSignal(QString cert_file, QString keyfile, QString keyp << "-days" << "3680" << "-utf8" << "-batch" + << PICA_CERTDIGESTALGO << "-passin" << "stdin"); diff --git a/pica-client/pica-client.pro b/pica-client/pica-client.pro index 205d215..b7c5fa4 100644 --- a/pica-client/pica-client.pro +++ b/pica-client/pica-client.pro @@ -72,7 +72,8 @@ HEADERS += mainwindow.h \ sound.h \ dialogs/settingsdialog.h \ settings.h \ - ../PICA_netconf.h + ../PICA_netconf.h \ + ../PICA_security.h DEFINES = PICA_MULTITHREADED |