aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-02-21 11:28:30 +0200
committerRiccardo Spagni <ric@spagni.net>2017-02-21 11:28:31 +0200
commit31a189b7ddaf8c06cd8e6c8bb8581d115d8e35f9 (patch)
tree4c6d41123e9efafa814ad08b3694a9049087bfbb
parentMerge pull request #1736 (diff)
parentFix compiler error about nested externs in slow_hash.c by moving declarations (diff)
downloadmonero-31a189b7ddaf8c06cd8e6c8bb8581d115d8e35f9.tar.xz
Merge pull request #1728
67693415 Fix compiler error about nested externs in slow_hash.c by moving declarations (NanoAkron)
-rw-r--r--src/crypto/slow-hash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c
index 43b9619f3..684c991bf 100644
--- a/src/crypto/slow-hash.c
+++ b/src/crypto/slow-hash.c
@@ -44,6 +44,9 @@
#define INIT_SIZE_BLK 8
#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))
// Optimised code below, uses x86-specific intrinsics, SSE2, AES-NI
// Fall back to more portable code is down at the bottom
@@ -138,9 +141,6 @@
#define THREADV __thread
#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)
union cn_slow_hash_state
{