twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-22 20:44:56 +00:00
Code Issues Projects Releases Wiki Activity

Do not define be32dec / le32dec on FreeBSD, since they are already defined in sys/endian.h

Browse Source
This commit is contained in:
thierry-FreeBSD 2014-06-22 16:20:29 +02:00
parent 09d2cf44fb
commit e3ce8e18b7
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/scrypt.cpp
View File

@ -34,6 +34,8 @@
#include <string.h>
#include <openssl/sha.h>
#ifndef __FreeBSD__
/* Allready defined in sys/endian.h */
static inline uint32_t be32dec(const void *pp)
{
const uint8_t *p = (uint8_t const *)pp;
@ -49,6 +51,7 @@ static inline void be32enc(void *pp, uint32_t x)
p[1] = (x >> 16) & 0xff;
p[0] = (x >> 24) & 0xff;
}
#endif
typedef struct HMAC_SHA256Context {
SHA256_CTX ictx;

3
src/scrypt.h
View File

@ -17,6 +17,8 @@ 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__
/* Allready defined in sys/endian.h */
static inline uint32_t le32dec(const void *pp)
{
const uint8_t *p = (uint8_t const *)pp;
@ -32,4 +34,5 @@ static inline void le32enc(void *pp, uint32_t x)
p[2] = (x >> 16) & 0xff;
p[3] = (x >> 24) & 0xff;
}
# endif
#endif