700fed5d14
- Improve USE_QT4 - Fix build after boost update
33 lines
823 B
C++
33 lines
823 B
C++
--- ./src/scrypt.cpp.orig 2014-01-10 01:38:53.000000000 +0000
|
|
+++ ./src/scrypt.cpp 2014-02-09 05:45:03.131006405 +0000
|
|
@@ -33,6 +33,7 @@
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
#include <openssl/sha.h>
|
|
+#include <boost/lexical_cast.hpp>
|
|
|
|
#if defined(USE_SSE2) && !defined(USE_SSE2_ALWAYS)
|
|
#ifdef _MSC_VER
|
|
@@ -44,22 +45,6 @@
|
|
#endif
|
|
#endif
|
|
|
|
-static inline uint32_t be32dec(const void *pp)
|
|
-{
|
|
- const uint8_t *p = (uint8_t const *)pp;
|
|
- return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) +
|
|
- ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24));
|
|
-}
|
|
-
|
|
-static inline void be32enc(void *pp, uint32_t x)
|
|
-{
|
|
- uint8_t *p = (uint8_t *)pp;
|
|
- p[3] = x & 0xff;
|
|
- p[2] = (x >> 8) & 0xff;
|
|
- p[1] = (x >> 16) & 0xff;
|
|
- p[0] = (x >> 24) & 0xff;
|
|
-}
|
|
-
|
|
typedef struct HMAC_SHA256Context {
|
|
SHA256_CTX ictx;
|
|
SHA256_CTX octx;
|