From 6f80cd3299aac6b1df9aeb5822080ad6574b3f6e Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 18 May 2018 23:47:37 +0100 Subject: [PATCH] [Fix] Relax alignment requirements Issue: #2222 --- contrib/t1ha/t1ha.h | 4 ++-- src/libcryptobox/cryptobox.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/t1ha/t1ha.h b/contrib/t1ha/t1ha.h index 191758c57..3d267838c 100644 --- a/contrib/t1ha/t1ha.h +++ b/contrib/t1ha/t1ha.h @@ -218,14 +218,14 @@ #endif /* T1HA_API */ #if defined(_MSC_VER) -#define T1HA_ALIGN_PREFIX __declspec(align(32)) /* required only for SIMD */ +#define T1HA_ALIGN_PREFIX __declspec(align(16)) /* required only for SIMD */ #else #define T1HA_ALIGN_PREFIX #endif /* _MSC_VER */ #if defined(__GNUC__) #define T1HA_ALIGN_SUFFIX \ - __attribute__((aligned(32))) /* required only for SIMD */ + __attribute__((aligned(16))) /* required only for SIMD */ #else #define T1HA_ALIGN_SUFFIX #endif /* GCC x86 */ diff --git a/src/libcryptobox/cryptobox.h b/src/libcryptobox/cryptobox.h index 9fc5c7fe9..1045547a2 100644 --- a/src/libcryptobox/cryptobox.h +++ b/src/libcryptobox/cryptobox.h @@ -312,7 +312,7 @@ guint rspamd_cryptobox_mac_bytes (enum rspamd_cryptobox_mode mode); guint rspamd_cryptobox_signature_bytes (enum rspamd_cryptobox_mode mode); /* Hash IUF interface */ -typedef struct RSPAMD_ALIGNED(32) rspamd_cryptobox_hash_state_s { +typedef struct RSPAMD_ALIGNED(16) rspamd_cryptobox_hash_state_s { unsigned char opaque[256]; } rspamd_cryptobox_hash_state_t; @@ -343,7 +343,7 @@ void rspamd_cryptobox_hash (guchar *out, gsize keylen); /* Non crypto hash IUF interface */ -typedef struct RSPAMD_ALIGNED(32) rspamd_cryptobox_fast_hash_state_s { +typedef struct RSPAMD_ALIGNED(16) rspamd_cryptobox_fast_hash_state_s { unsigned char opaque[64 + sizeof (size_t) + sizeof (uint64_t)]; } rspamd_cryptobox_fast_hash_state_t; -- 2.39.5