Merge pull request #1728

67693415 Fix compiler error about nested externs in slow_hash.c by moving declarations (NanoAkron)
This commit is contained in:
Riccardo Spagni 2017-02-21 11:28:30 +02:00
commit 31a189b7dd
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -44,6 +44,9 @@
#define INIT_SIZE_BLK 8 #define INIT_SIZE_BLK 8
#define INIT_SIZE_BYTE (INIT_SIZE_BLK * AES_BLOCK_SIZE) #define INIT_SIZE_BYTE (INIT_SIZE_BLK * AES_BLOCK_SIZE)
extern int aesb_single_round(const uint8_t *in, uint8_t*out, const uint8_t *expandedKey);
extern int aesb_pseudo_round(const uint8_t *in, uint8_t *out, const uint8_t *expandedKey);
#if defined(__x86_64__) || (defined(_MSC_VER) && defined(_WIN64)) #if defined(__x86_64__) || (defined(_MSC_VER) && defined(_WIN64))
// Optimised code below, uses x86-specific intrinsics, SSE2, AES-NI // Optimised code below, uses x86-specific intrinsics, SSE2, AES-NI
// Fall back to more portable code is down at the bottom // Fall back to more portable code is down at the bottom
@ -138,9 +141,6 @@
#define THREADV __thread #define THREADV __thread
#endif #endif
extern int aesb_single_round(const uint8_t *in, uint8_t*out, const uint8_t *expandedKey);
extern int aesb_pseudo_round(const uint8_t *in, uint8_t *out, const uint8_t *expandedKey);
#pragma pack(push, 1) #pragma pack(push, 1)
union cn_slow_hash_state union cn_slow_hash_state
{ {