mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2025-11-11 11:08:02 -06:00
Linux: Fix build error under ARM64
This commit is contained in:
@@ -21,6 +21,8 @@
|
|||||||
#include "argon2.h"
|
#include "argon2.h"
|
||||||
#include "core.h"
|
#include "core.h"
|
||||||
|
|
||||||
|
#if defined(__AVX2__)
|
||||||
|
|
||||||
#include "blake2/blake2.h"
|
#include "blake2/blake2.h"
|
||||||
#include "blake2/blamka-round-opt.h"
|
#include "blake2/blamka-round-opt.h"
|
||||||
|
|
||||||
@@ -33,7 +35,6 @@
|
|||||||
* @param with_xor Whether to XOR into the new block (1) or just overwrite (0)
|
* @param with_xor Whether to XOR into the new block (1) or just overwrite (0)
|
||||||
* @pre all block pointers must be valid
|
* @pre all block pointers must be valid
|
||||||
*/
|
*/
|
||||||
#if defined(__AVX2__)
|
|
||||||
static void fill_block(__m256i *state, const block *ref_block,
|
static void fill_block(__m256i *state, const block *ref_block,
|
||||||
block *next_block, int with_xor) {
|
block *next_block, int with_xor) {
|
||||||
__m256i block_XY[ARGON2_HWORDS_IN_BLOCK];
|
__m256i block_XY[ARGON2_HWORDS_IN_BLOCK];
|
||||||
@@ -194,7 +195,7 @@ void fill_segment_avx2(const argon2_instance_t *instance,
|
|||||||
#else
|
#else
|
||||||
void fill_segment_avx2(const argon2_instance_t* instance,
|
void fill_segment_avx2(const argon2_instance_t* instance,
|
||||||
argon2_position_t position) {
|
argon2_position_t position) {
|
||||||
UNREFERENCED_PARAMETER(instance);
|
(void)instance;
|
||||||
UNREFERENCED_PARAMETER(position);
|
(void)position;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -20,12 +20,12 @@
|
|||||||
#include "argon2.h"
|
#include "argon2.h"
|
||||||
#include "core.h"
|
#include "core.h"
|
||||||
|
|
||||||
|
#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
|
||||||
|
|
||||||
#include "blake2/blake2.h"
|
#include "blake2/blake2.h"
|
||||||
#include "blake2/blamka-round-opt.h"
|
#include "blake2/blamka-round-opt.h"
|
||||||
#include "Crypto/config.h"
|
#include "Crypto/config.h"
|
||||||
|
|
||||||
#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Function fills a new memory block and optionally XORs the old block over the new one.
|
* Function fills a new memory block and optionally XORs the old block over the new one.
|
||||||
* Memory must be initialized.
|
* Memory must be initialized.
|
||||||
@@ -198,5 +198,7 @@ void fill_segment_sse2(const argon2_instance_t *instance,
|
|||||||
#else
|
#else
|
||||||
void fill_segment_sse2(const argon2_instance_t* instance,
|
void fill_segment_sse2(const argon2_instance_t* instance,
|
||||||
argon2_position_t position) {
|
argon2_position_t position) {
|
||||||
|
(void)instance;
|
||||||
|
(void)position;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user