diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-10-03 21:48:28 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-10-06 11:37:18 +0200 |
| commit | 783e3552c092fd7bb74f1f39c6f89ddc097e15cc (patch) | |
| tree | 35c8d0c721bb800db5845400dd68e23fe94f81d1 /common | |
| parent | loleaflet: l10n update from Pootle (diff) | |
| download | online-783e3552c092fd7bb74f1f39c6f89ddc097e15cc.tar.gz online-783e3552c092fd7bb74f1f39c6f89ddc097e15cc.zip | |
Support key logic in loolws + improvements in loolconfig.
To be able to set the support key directly from the command line, and to show
the option, etc.
Change-Id: Iac93bc47a6f4b9d5a5ad0ac8b06bda978e01b760
Reviewed-on: https://gerrit.libreoffice.org/43098
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/Crypto.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/common/Crypto.cpp b/common/Crypto.cpp index aa268ae3c6..a8e84c2d6b 100644 --- a/common/Crypto.cpp +++ b/common/Crypto.cpp @@ -54,7 +54,7 @@ struct SupportKeyImpl _signature = key.substr(lastColon + 1, key.length() - lastColon); _data = key.substr(0, lastColon); - std::cout << "signature '" << _signature << "' data '" << _data << "'\n"; + LOG_INF("Support key signature '" << _signature << "' data '" << _data << "'"); _invalid = false; } @@ -83,15 +83,23 @@ bool SupportKey::verify() } std::ifstream pubStream; + std::string supportKeyFilename = +#if ENABLE_DEBUG + SUPPORT_KEY_FILE +#else + LOOLWSD_CONFIGDIR "/" SUPPORT_KEY_FILE +#endif + ; + try { - pubStream.open ("pubKey.pub", std::ifstream::in); + pubStream.open(supportKeyFilename, std::ifstream::in); if (pubStream.fail()) { - LOG_ERR("Failed to open support public key."); + LOG_ERR("Failed to open support public key '" << supportKeyFilename << "'."); return false; } } catch (...) { - LOG_ERR("Exception opening public key"); + LOG_ERR("Exception opening public key '" << supportKeyFilename << "'."); return false; } try { |