diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-07-31 20:53:57 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-07-31 23:56:19 +0200 |
| commit | 6de75d132fe44a6f3e6160fec0c2e5e32ed023d3 (patch) | |
| tree | fb7239e88f8a9cd67f5710f39b44c39af57f91ed /onlineupdate/source | |
| parent | updater: fix windows build, string issues (diff) | |
| download | core-6de75d132fe44a6f3e6160fec0c2e5e32ed023d3.tar.gz core-6de75d132fe44a6f3e6160fec0c2e5e32ed023d3.zip | |
updater: get the signature verification working on Windows
The updater itself does not link to NSS on Windows and instead uses the
Windows-internal crypto libraries. However the mar executable needs to
link against NSS, so we need to split the code a bit.
Change-Id: Iea61c716aa507a876fdb444eb28ad828bdea18bd
Reviewed-on: https://gerrit.libreoffice.org/40608
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'onlineupdate/source')
| -rw-r--r-- | onlineupdate/source/libmar/verify/cryptox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/onlineupdate/source/libmar/verify/cryptox.c b/onlineupdate/source/libmar/verify/cryptox.c index 7edf8bea233d..5cda191dec7e 100644 --- a/onlineupdate/source/libmar/verify/cryptox.c +++ b/onlineupdate/source/libmar/verify/cryptox.c @@ -11,13 +11,13 @@ #include <stdlib.h> #include "cryptox.h" -#if defined(MAR_NSS) - #ifdef _WIN32 #pragma warning(push) #pragma warning(disable: 4204) #endif +#if defined(MAR_NSS) + /** * Loads the public key for the specified cert name from the NSS store. * |