Update blake2s.h

This commit is contained in:
Ralph 2024-03-01 15:51:10 -05:00 committed by GitHub
parent 2f4fa35ec2
commit 370b84b9d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -34,96 +34,96 @@
static inline uint32_t load32(const void *src) static inline uint32_t load32(const void *src)
{ {
#if defined(NATIVE_LITTLE_ENDIAN) #if defined(NATIVE_LITTLE_ENDIAN)
return *(uint32_t *)(src); return *(uint32_t *)(src);
#else #else
const uint8_t *p = (uint8_t *)src; const uint8_t *p = (uint8_t *)src;
uint32_t w = *p++; uint32_t w = *p++;
w |= (uint32_t)(*p++) << 8; w |= (uint32_t)(*p++) << 8;
w |= (uint32_t)(*p++) << 16; w |= (uint32_t)(*p++) << 16;
w |= (uint32_t)(*p++) << 24; w |= (uint32_t)(*p++) << 24;
return w; return w;
#endif #endif
} }
static inline void store32(void *dst, uint32_t w) static inline void store32(void *dst, uint32_t w)
{ {
#if defined(NATIVE_LITTLE_ENDIAN) #if defined(NATIVE_LITTLE_ENDIAN)
*(uint32_t *)(dst) = w; *(uint32_t *)(dst) = w;
#else #else
uint8_t *p = (uint8_t *)dst; uint8_t *p = (uint8_t *)dst;
*p++ = (uint8_t)w; w >>= 8; *p++ = (uint8_t)w; w >>= 8;
*p++ = (uint8_t)w; w >>= 8; *p++ = (uint8_t)w; w >>= 8;
*p++ = (uint8_t)w; w >>= 8; *p++ = (uint8_t)w; w >>= 8;
*p++ = (uint8_t)w; *p++ = (uint8_t)w;
#endif #endif
} }
static inline uint64_t load48(const void *src) static inline uint64_t load48(const void *src)
{ {
const uint8_t *p = (const uint8_t *)src; const uint8_t *p = (const uint8_t *)src;
uint64_t w = *p++; uint64_t w = *p++;
w |= (uint64_t)(*p++) << 8; w |= (uint64_t)(*p++) << 8;
w |= (uint64_t)(*p++) << 16; w |= (uint64_t)(*p++) << 16;
w |= (uint64_t)(*p++) << 24; w |= (uint64_t)(*p++) << 24;
w |= (uint64_t)(*p++) << 32; w |= (uint64_t)(*p++) << 32;
w |= (uint64_t)(*p++) << 40; w |= (uint64_t)(*p++) << 40;
return w; return w;
} }
static inline void store48(void *dst, uint64_t w) static inline void store48(void *dst, uint64_t w)
{ {
uint8_t *p = (uint8_t *)dst; uint8_t *p = (uint8_t *)dst;
*p++ = (uint8_t)w; w >>= 8; *p++ = (uint8_t)w; w >>= 8;
*p++ = (uint8_t)w; w >>= 8; *p++ = (uint8_t)w; w >>= 8;
*p++ = (uint8_t)w; w >>= 8; *p++ = (uint8_t)w; w >>= 8;
*p++ = (uint8_t)w; w >>= 8; *p++ = (uint8_t)w; w >>= 8;
*p++ = (uint8_t)w; w >>= 8; *p++ = (uint8_t)w; w >>= 8;
*p++ = (uint8_t)w; *p++ = (uint8_t)w;
} }
/* prevents compiler optimizing out memset() */ /* prevents compiler optimizing out memset() */
static inline void secure_zero_memory(void *v, size_t n) static inline void secure_zero_memory(void *v, size_t n)
{ {
volatile uint8_t *p = ( volatile uint8_t * )v; volatile uint8_t *p = ( volatile uint8_t * )v;
while( n-- ) *p++ = 0; while( n-- ) *p++ = 0;
} }
/* blake2.h */ /* blake2.h */
enum blake2s_constant enum blake2s_constant
{ {
BLAKE2S_BLOCKBYTES = 64, BLAKE2S_BLOCKBYTES = 64,
BLAKE2S_OUTBYTES = 32, BLAKE2S_OUTBYTES = 32,
BLAKE2S_KEYBYTES = 32, BLAKE2S_KEYBYTES = 32,
BLAKE2S_SALTBYTES = 8, BLAKE2S_SALTBYTES = 8,
BLAKE2S_PERSONALBYTES = 8 BLAKE2S_PERSONALBYTES = 8
}; };
#pragma pack(push, 1) #pragma pack(push, 1)
typedef struct __blake2s_param typedef struct __blake2s_param
{ {
uint8_t digest_length; // 1 uint8_t digest_length; // 1
uint8_t key_length; // 2 uint8_t key_length; // 2
uint8_t fanout; // 3 uint8_t fanout; // 3
uint8_t depth; // 4 uint8_t depth; // 4
uint32_t leaf_length; // 8 uint32_t leaf_length; // 8
uint8_t node_offset[6];// 14 uint8_t node_offset[6];// 14
uint8_t node_depth; // 15 uint8_t node_depth; // 15
uint8_t inner_length; // 16 uint8_t inner_length; // 16
// uint8_t reserved[0]; // uint8_t reserved[0];
uint8_t salt[BLAKE2S_SALTBYTES]; // 24 uint8_t salt[BLAKE2S_SALTBYTES]; // 24
uint8_t personal[BLAKE2S_PERSONALBYTES]; // 32 uint8_t personal[BLAKE2S_PERSONALBYTES]; // 32
} blake2s_param; } blake2s_param;
ALIGN( 64 ) typedef struct __blake2s_state typedef struct ALIGN( 64 ) __blake2s_state
{ {
uint32_t h[8]; uint32_t h[8];
uint32_t t[2]; uint32_t t[2];
uint32_t f[2]; uint32_t f[2];
uint8_t buf[2 * BLAKE2S_BLOCKBYTES]; uint8_t buf[2 * BLAKE2S_BLOCKBYTES];
size_t buflen; size_t buflen;
uint8_t last_node; uint8_t last_node;
} blake2s_state; } blake2s_state;
#pragma pack(pop) #pragma pack(pop)
@ -131,21 +131,21 @@ ALIGN( 64 ) typedef struct __blake2s_state
extern "C" { extern "C" {
#endif #endif
int blake2s_compress( blake2s_state *S, const uint8_t block[BLAKE2S_BLOCKBYTES] ); int blake2s_compress( blake2s_state *S, const uint8_t block[BLAKE2S_BLOCKBYTES] );
// Streaming API // Streaming API
int blake2s_init( blake2s_state *S, const uint8_t outlen ); int blake2s_init( blake2s_state *S, const uint8_t outlen );
int blake2s_init_key( blake2s_state *S, const uint8_t outlen, const void *key, const uint8_t keylen ); int blake2s_init_key( blake2s_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
int blake2s_init_param( blake2s_state *S, const blake2s_param *P ); int blake2s_init_param( blake2s_state *S, const blake2s_param *P );
int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen ); int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen );
int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen ); int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen );
// Simple API // Simple API
int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen ); int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
// Direct Hash Mining Helpers // Direct Hash Mining Helpers
#define blake2s_salt32(out, in, inlen, key32) blake2s(out, in, key32, 32, inlen, 32) /* neoscrypt */ #define blake2s_salt32(out, in, inlen, key32) blake2s(out, in, key32, 32, inlen, 32) /* neoscrypt */
#define blake2s_simple(out, in, inlen) blake2s(out, in, NULL, 32, inlen, 0) #define blake2s_simple(out, in, inlen) blake2s(out, in, NULL, 32, inlen, 0)
#if defined(__cplusplus) #if defined(__cplusplus)
} }