diff options
| author | Anton <anton@picapica> | 2018-07-14 22:52:41 +0400 |
|---|---|---|
| committer | Anton <anton@picapica> | 2018-07-14 22:52:41 +0400 |
| commit | 73f53c9e9d8d9c3521dc43bef6385b6913033051 (patch) | |
| tree | 73330e639284536a6083db5181d3447a79d95e75 /pica-client | |
| parent | df505721b8901e94b919066bee07feb0921f4d83 (diff) | |
| download | pica-pica-73f53c9e9d8d9c3521dc43bef6385b6913033051.tar.gz pica-pica-73f53c9e9d8d9c3521dc43bef6385b6913033051.zip | |
remove CA usage
Diffstat (limited to 'pica-client')
| -rw-r--r-- | pica-client/accounts.cpp | 6 | ||||
| -rw-r--r-- | pica-client/accountswindow.cpp | 2 | ||||
| -rw-r--r-- | pica-client/globals.h | 1 | ||||
| -rw-r--r-- | pica-client/main.cpp | 5 |
4 files changed, 2 insertions, 12 deletions
diff --git a/pica-client/accounts.cpp b/pica-client/accounts.cpp index 0f7c3b3..4473084 100644 --- a/pica-client/accounts.cpp +++ b/pica-client/accounts.cpp @@ -127,11 +127,5 @@ bool Accounts::CheckFiles(AccountRecord &acc, QString &error_string) return false; } - if (!QFile::exists(acc.CA_file)) - { - error_string = QObject::tr("Certificate Authority file %1 does not exist").arg(acc.CA_file); - return false; - } - return true; } diff --git a/pica-client/accountswindow.cpp b/pica-client/accountswindow.cpp index a6d4fb4..de2954c 100644 --- a/pica-client/accountswindow.cpp +++ b/pica-client/accountswindow.cpp @@ -157,7 +157,7 @@ void AccountsWindow::CreateAccount(QString CertFilename, QString PkeyFilename, b rec.name = name; rec.cert_file = certfilename; rec.pkey_file = pkeyfilename; - rec.CA_file = config_defaultCA; //;certfilename + rec.CA_file = QLatin1String("none"); accounts.Add(rec); diff --git a/pica-client/globals.h b/pica-client/globals.h index c5befda..dd03bf8 100644 --- a/pica-client/globals.h +++ b/pica-client/globals.h @@ -18,7 +18,6 @@ //variables are defined in main.cpp extern class QString config_dir; extern class QString config_dbname; -extern class QString config_defaultCA; extern class QString config_defaultDHParam; extern class SkyNet *skynet; extern class MainWindow *mainwindow; diff --git a/pica-client/main.cpp b/pica-client/main.cpp index ad9ffb2..a397d8e 100644 --- a/pica-client/main.cpp +++ b/pica-client/main.cpp @@ -33,10 +33,8 @@ class PicaSysTray *systray; class FileTransferController *ftctrl; class AccountsWindow *accwindow; -// /usr/share/pica-client/pica-pica_CA.pem -//QString config_defaultCA("/home/root_jr/files/projects/picapica_wc/localhost/project_picapica/trunk/tests/trusted_CA.pem"); + #ifndef WIN32 -QString config_defaultCA(PICA_INSTALLPREFIX"/share/pica-client/CA.pem"); QString config_defaultDHParam(PICA_INSTALLPREFIX"/share/pica-client/"PICA_CLIENT_DHPARAMFILE); QString snd_newmessage(PICA_INSTALLPREFIX"/share/pica-client/picapica-snd-newmessage.wav"); @@ -45,7 +43,6 @@ QString config_defaultDHParam("./"PICA_APPBUNDLENAME"/Contents/Resources/"PICA_C QString snd_newmessage("./"PICA_APPBUNDLENAME"/Contents/Resources/picapica-snd-newmessage.wav"); #else -QString config_defaultCA("share\\CA.pem"); QString config_defaultDHParam("share\\"PICA_CLIENT_DHPARAMFILE); QString snd_newmessage("share\\picapica-snd-newmessage.wav"); |