diff options
| author | Steve Wills <swills@FreeBSD.org> | 2018-05-23 17:17:00 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2018-05-23 17:17:00 +0000 |
| commit | 70ad24d5d5c074b57fcfdd68d4e340b3078dff14 (patch) | |
| tree | a2a54b42af1c44358d3edf46d78f932631274e9c /net-p2p/litecoin/files | |
| parent | x11-drivers/xf86-video-mach64: Update to 6.9.6 (diff) | |
net-p2p/litecoin: update to 0.15.1
Notes
Notes:
svn path=/head/; revision=470710
Diffstat (limited to 'net-p2p/litecoin/files')
| -rw-r--r-- | net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp (renamed from net-p2p/litecoin/files/patch-src_crypto_scrypt.cpp) | 14 | ||||
| -rw-r--r-- | net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h (renamed from net-p2p/litecoin/files/patch-src_crypto_scrypt.h) | 8 |
2 files changed, 13 insertions, 9 deletions
diff --git a/net-p2p/litecoin/files/patch-src_crypto_scrypt.cpp b/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp index cc8602b25fad..513d19e8b866 100644 --- a/net-p2p/litecoin/files/patch-src_crypto_scrypt.cpp +++ b/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.cpp @@ -1,5 +1,5 @@ ---- src/crypto/scrypt.cpp.orig 2015-08-04 13:27:49 UTC -+++ src/crypto/scrypt.cpp +--- src/crypto/scrypt.cpp.orig 2018-02-26 19:37:55.000000000 -0500 ++++ src/crypto/scrypt.cpp 2018-05-23 11:25:45.718849000 -0400 @@ -32,6 +32,7 @@ #include <stdlib.h> #include <stdint.h> @@ -8,10 +8,12 @@ #include <openssl/sha.h> #if defined(USE_SSE2) && !defined(USE_SSE2_ALWAYS) -@@ -44,22 +45,6 @@ +@@ -42,24 +43,6 @@ + // GCC Linux or i686-w64-mingw32 + #include <cpuid.h> #endif - #endif - +-#endif +-#ifndef __FreeBSD__ -static inline uint32_t be32dec(const void *pp) -{ - const uint8_t *p = (uint8_t const *)pp; @@ -28,6 +30,6 @@ - p[0] = (x >> 24) & 0xff; -} - + #endif typedef struct HMAC_SHA256Context { SHA256_CTX ictx; - SHA256_CTX octx; diff --git a/net-p2p/litecoin/files/patch-src_crypto_scrypt.h b/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h index 0a87927825a4..80a204515069 100644 --- a/net-p2p/litecoin/files/patch-src_crypto_scrypt.h +++ b/net-p2p/litecoin/files/extra-patch-src_crypto_scrypt.h @@ -1,9 +1,10 @@ ---- src/crypto/scrypt.h.orig 2015-06-15 08:51:30 UTC -+++ src/crypto/scrypt.h -@@ -27,19 +27,4 @@ void +--- src/crypto/scrypt.h.orig 2018-05-23 11:31:01.662350000 -0400 ++++ src/crypto/scrypt.h 2018-05-23 11:31:25.771775000 -0400 +@@ -28,21 +28,4 @@ void PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt, size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen); +-#ifndef __FreeBSD__ -static inline uint32_t le32dec(const void *pp) -{ - const uint8_t *p = (uint8_t const *)pp; @@ -19,4 +20,5 @@ - p[2] = (x >> 16) & 0xff; - p[3] = (x >> 24) & 0xff; -} +-#endif #endif |