Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix

Browse source
This commit is contained in:
dnotestein 2014-02-21 19:55:39 -05:00
commit 7df77777f1
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/crypto/scrypt.cpp
View file

@ -5,10 +5,10 @@
#include <openssl/evp.h> #include <openssl/evp.h>
/*
#define SCRYPT_SALSA 1 #define SCRYPT_SALSA 1
#define SCRYPT_SHA256 1 #define SCRYPT_SHA256 1
/*
#include "code/scrypt-jane-portable.h" #include "code/scrypt-jane-portable.h"
#include "code/scrypt-jane-romix.h" #include "code/scrypt-jane-romix.h"
*/ */
@ -18,7 +18,6 @@ namespace fc {
void scrypt_derive_key( const std::vector<unsigned char> &passphrase, const std::vector<unsigned char> &salt, void scrypt_derive_key( const std::vector<unsigned char> &passphrase, const std::vector<unsigned char> &salt,
unsigned int n, unsigned int r, unsigned int p, std::vector<unsigned char> &key ) unsigned int n, unsigned int r, unsigned int p, std::vector<unsigned char> &key )
{ {
FC_ASSERT( !"Does not compile on OS X" );
/* /*
unsigned int chunk_bytes = SCRYPT_BLOCK_BYTES * r * 2; unsigned int chunk_bytes = SCRYPT_BLOCK_BYTES * r * 2;
std::vector<unsigned char> yx((p+1) * chunk_bytes); std::vector<unsigned char> yx((p+1) * chunk_bytes);

7
vendor/scrypt-jane/code/scrypt-jane-portable.h vendored
View file

@ -300,7 +300,14 @@ scrypt_ensure_zero(void *p, size_t len) {
#endif #endif
} }
#if defined(MACOS_X) || (defined(__APPLE__) & defined(__MACH__))
static size_t
detect_cpu(void) {
return 0;
}
#else
#include "scrypt-jane-portable-x86.h" #include "scrypt-jane-portable-x86.h"
#endif
#if !defined(asm_calling_convention) #if !defined(asm_calling_convention)
#define asm_calling_convention #define asm_calling_convention