From: MASM fan <masmfan@gmail.com>
Date: Sat, 3 Jan 2015 03:46:38 +0000 (-0800)
Subject: Remove scrypt_nosalt function
X-Git-Tag: nvc-v0.5.1~33
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=46488ba4fcecb2e255fafc0cd0509339ddf00c3f

Remove scrypt_nosalt function
---

diff --git a/src/scrypt.cpp b/src/scrypt.cpp
index c0e237d..06d1d23 100644
--- a/src/scrypt.cpp
+++ b/src/scrypt.cpp
@@ -15,22 +15,17 @@ extern "C" void scrypt_core(unsigned int *X, unsigned int *V);
    r = 1, p = 1, N = 1024
  */
 
-uint256 scrypt_nosalt(const void* input, size_t inputlen, void *scratchpad)
+uint256 scrypt_blockhash(const void* input)
 {
-    unsigned int *V;
-    unsigned int X[32];
+    uint8_t scratchpad[SCRYPT_BUFFER_SIZE];
+    uint32_t X[32];
     uint256 result = 0;
-    V = (unsigned int *)(((uintptr_t)(scratchpad) + 63) & ~ (uintptr_t)(63));
 
-    PBKDF2_SHA256((const uint8_t*)input, inputlen, (const uint8_t*)input, inputlen, 1, (uint8_t *)X, 128);
+    uint32_t *V = (uint32_t *)(((uintptr_t)(scratchpad) + 63) & ~ (uintptr_t)(63));
+
+    PBKDF2_SHA256((const uint8_t*)input, 80, (const uint8_t*)input, 80, 1, (uint8_t *)X, 128);
     scrypt_core(X, V);
-    PBKDF2_SHA256((const uint8_t*)input, inputlen, (uint8_t *)X, 128, 1, (uint8_t*)&result, 32);
+    PBKDF2_SHA256((const uint8_t*)input, 80, (uint8_t *)X, 128, 1, (uint8_t*)&result, 32);
 
     return result;
 }
-
-uint256 scrypt_blockhash(const void* input)
-{
-    unsigned char scratchpad[SCRYPT_BUFFER_SIZE];
-    return scrypt_nosalt(input, 80, scratchpad);
-}