Some more BSD fixes.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 050117b4da0392a90f8eb8101c6ff4133ffb2607..c3f13e5191805b385fa73006d447676c8b5f6e12 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -770,7 +770,7 @@ TRY_RUN(_CAN_RUN _CAN_COMPILE
        "${CMAKE_BINARY_DIR}" "${CMAKE_BINARY_DIR}/pthread_setpshared.c"
        CMAKE_FLAGS CMAKE_C_FLAGS="-pthread")
 IF(_CAN_RUN EQUAL 1)
-       SET(HAVE_PTHREAD_PROCESS_SHARED)
+       SET(HAVE_PTHREAD_PROCESS_SHARED 1)
 ENDIF(_CAN_RUN EQUAL 1)
 IF(HAVE_PTHREAD_PROCESS_SHARED)
        MESSAGE(STATUS "pthread_mutexattr_setpshared is supported")

diff --git a/src/libcryptobox/cryptobox.c b/src/libcryptobox/cryptobox.c
index b99368c5a1fa4edf925ec81578bd9da80763a27f..d115f79c6025a2149ce63b94e94f76995e385988 100644 (file)
--- a/src/libcryptobox/cryptobox.c
+++ b/src/libcryptobox/cryptobox.c
@@ -145,8 +145,8 @@ void rspamd_cryptobox_encrypt_nm_inplace (guchar *data, gsize len,
                const rspamd_nm_t nm, rspamd_sig_t sig)
 {
        poly1305_state mac_ctx;
-       ALIGN(64) guchar subkey[CHACHA_BLOCKBYTES];
-       ALIGN(64) chacha_state s;
+       guchar subkey[CHACHA_BLOCKBYTES];
+       chacha_state s;
        gsize r;
 
        xchacha_init (&s, (const chacha_key *)nm, (const chacha_iv24 *)nonce, 20);
@@ -168,10 +168,10 @@ gboolean
 rspamd_cryptobox_decrypt_nm_inplace (guchar *data, gsize len,
                const rspamd_nonce_t nonce, const rspamd_nm_t nm, const rspamd_sig_t sig)
 {
-       ALIGN(64) poly1305_state mac_ctx;
-       ALIGN(64) guchar subkey[CHACHA_BLOCKBYTES];
+       poly1305_state mac_ctx;
+       guchar subkey[CHACHA_BLOCKBYTES];
        rspamd_sig_t mac;
-       ALIGN(64) chacha_state s;
+       chacha_state s;
        gsize r;
        gboolean ret = TRUE;