2f512aaa6c
https://www.rfc-editor.org/rfc/rfc9106.html * add css::xml::crypto::KDFID constant group * add "KeyDerivationFunction" to setEncryptionAlgorithms sequence * Argon2 is used by default for wholesome ODF encryption, but $LO_ARGON2_DISABLE can be set to use PBKDF2 * extend various structs in package * use 3 new ODF attributes "loext:argon2-iterations" "loext:argon2-memory" "loext:argon2-lanes" to store the arguments * use this URL for now: "urn:org:documentfoundation:names:experimental🏢manifest:argon2id" * use default arguments according to second recommendation from "7.4. Recommendations" of RFC9106; 64 MiB RAM should hopefully not be too much even for 32 bit builds Change-Id: I683118cc5e0706bd6544db6fb909096768ac9920 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161009 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 48829f87ebafbb9938d23a8f0bff4d11d770690e Mon Sep 17 00:00:00 2001
|
|
From: Patrick Steinhardt <ps@pks.im>
|
|
Date: Thu, 20 Feb 2020 17:37:32 +0100
|
|
Subject: [PATCH] Fix possible compiler error due to undefined _MSC_VER
|
|
|
|
In order to determine how to set up the ARGON2_PUBLIC and ARGON2_LOCAL
|
|
macros, we check for various different environments via preprocessor
|
|
defines. For Microsoft Visual Studio, we check that the macro _MSC_VER
|
|
evaluates to non-zero via `#elif _MSC_VER`. This may raise a compile
|
|
error when compiling with "-Werror=undef" if the variable isn't defined.
|
|
|
|
Fix the issue by using `#elif defined(_MSC_VER)` instead.
|
|
---
|
|
include/argon2.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/include/argon2.h b/include/argon2.h
|
|
index fc8682c..1b471f6 100644
|
|
--- a/include/argon2.h
|
|
+++ b/include/argon2.h
|
|
@@ -30,7 +30,7 @@ extern "C" {
|
|
#ifdef A2_VISCTL
|
|
#define ARGON2_PUBLIC __attribute__((visibility("default")))
|
|
#define ARGON2_LOCAL __attribute__ ((visibility ("hidden")))
|
|
-#elif _MSC_VER
|
|
+#elif defined(_MSC_VER)
|
|
#define ARGON2_PUBLIC __declspec(dllexport)
|
|
#define ARGON2_LOCAL
|
|
#else
|
|
--
|
|
2.43.0
|
|
|