summaryrefslogtreecommitdiff
path: root/onlineupdate/StaticLibrary_libmarverify.mk
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-07-31 20:53:57 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-07-31 23:56:19 +0200
commit6de75d132fe44a6f3e6160fec0c2e5e32ed023d3 (patch)
treefb7239e88f8a9cd67f5710f39b44c39af57f91ed /onlineupdate/StaticLibrary_libmarverify.mk
parent2539702ff5e7bf6bc5dbdb3f8301196487b9266b (diff)
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/StaticLibrary_libmarverify.mk')
-rw-r--r--onlineupdate/StaticLibrary_libmarverify.mk36
1 files changed, 36 insertions, 0 deletions
diff --git a/onlineupdate/StaticLibrary_libmarverify.mk b/onlineupdate/StaticLibrary_libmarverify.mk
new file mode 100644
index 000000000000..d95aeb44f79c
--- /dev/null
+++ b/onlineupdate/StaticLibrary_libmarverify.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,libmarverify))
+
+$(eval $(call gb_StaticLibrary_set_include,libmarverify,\
+ -I$(SRCDIR)/onlineupdate/source/libmar/src/ \
+ $$(INCLUDE) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_StaticLibrary_add_defs,libmarverify,\
+ -DUNICODE \
+))
+else
+$(eval $(call gb_StaticLibrary_add_defs,libmar,\
+ -DMAR_NSS \
+))
+
+$(eval $(call gb_StaticLibrary_use_externals,libmarverify,\
+ nss3 \
+))
+endif
+
+$(eval $(call gb_StaticLibrary_add_cobjects,libmarverify,\
+ onlineupdate/source/libmar/verify/mar_verify \
+ onlineupdate/source/libmar/verify/cryptox \
+))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab: */