From d48153658548e6b17ec3e7c9eaf2a10f8283101e Mon Sep 17 00:00:00 2001 From: magnum Date: Tue, 26 Nov 2024 20:21:51 +0100 Subject: [PATCH] Keepass formats: salt alignment Closes #5581, assuming #1284 is no longer an issue. --- src/keepass_common.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/keepass_common.h b/src/keepass_common.h index 27fdb721fd..97ae92bf8a 100644 --- a/src/keepass_common.h +++ b/src/keepass_common.h @@ -19,12 +19,7 @@ #define KEEPASS_BINARY_SIZE 0 #define KEEPASS_BINARY_ALIGN MEM_ALIGN_NONE #define KEEPASS_SALT_SIZE sizeof(keepass_salt_t) -#if ARCH_ALLOWS_UNALIGNED -// Avoid a compiler bug, see #1284 -#define KEEPASS_SALT_ALIGN 1 -#else -#define KEEPASS_SALT_ALIGN sizeof(uint64_t) -#endif +#define KEEPASS_SALT_ALIGN sizeof(uint32_t) #define KEEPASS_MIN_KEYS_PER_CRYPT 1 #define KEEPASS_MAX_KEYS_PER_CRYPT 1