Permalink
Browse files

scrypt-jane: gcc and vstudio warnings fixes

  • Loading branch information...
1 parent df19a20 commit d6c5d6b489597493b3a3e8c82c1bae029b9286db @tpruvot committed Dec 7, 2015
Showing with 7 additions and 3 deletions.
  1. +4 −0 algo/scrypt-jane.c
  2. +2 −2 scryptjane/scrypt-jane-romix-basic.h
  3. +1 −1 scryptjane/scrypt-jane-romix-template.h
View
@@ -10,6 +10,10 @@
/* Only the instrinsics versions are optimized for hard-coded values - mikaelh */
#define CPU_X86_FORCE_INTRINSICS
+
+#undef SCRYPT_KECCAK512
+#undef SCRYPT_CHACHA
+#undef SCRYPT_CHOOSE_COMPILETIME
#define SCRYPT_KECCAK512
#define SCRYPT_CHACHA
#define SCRYPT_CHOOSE_COMPILETIME
@@ -4,12 +4,12 @@ typedef void (FASTCALL *scrypt_ROMixfn)(scrypt_mix_word_t *X/*[chunkWords]*/, sc
#endif
/* romix pre/post nop function */
-//static void asm_calling_convention
+static void /* asm_calling_convention */
scrypt_romix_nop(scrypt_mix_word_t *blocks, size_t nblocks) {
}
/* romix pre/post endian conversion function */
-//static void asm_calling_convention
+static void /* asm_calling_convention */
scrypt_romix_convert_endian(scrypt_mix_word_t *blocks, size_t nblocks) {
#if !defined(CPU_LE)
static const union { uint8_t b[2]; uint16_t w; } endian_test = {{1,0}};
@@ -17,7 +17,7 @@
2*r: number of blocks in the chunk
*/
-//static void asm_calling_convention
+static void /* asm_calling_convention */
SCRYPT_CHUNKMIX_FN(scrypt_mix_word_t *Bout/*[chunkWords]*/, scrypt_mix_word_t *Bin/*[chunkWords]*/, scrypt_mix_word_t *Bxor/*[chunkWords]*/, uint32_t r) {
scrypt_mix_word_t MM16 X[SCRYPT_BLOCK_WORDS], *block;
uint32_t i, j, blocksPerChunk = r * 2, half = 0;

0 comments on commit d6c5d6b

Please sign in to comment.