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 10:58:14 -05:00
commit bfb7c0e87b
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/crypto/scrypt.cpp
View file

@ -5,17 +5,21 @@
#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"
*/
namespace fc { 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);
@ -48,6 +52,7 @@ namespace fc {
std::fill( yx.begin(), yx.end(), 0 ); std::fill( yx.begin(), yx.end(), 0 );
std::fill( v.begin(), v.end(), 0 ); std::fill( v.begin(), v.end(), 0 );
*/
} }
} // namespace fc } // namespace fc