haskell/cryptonite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevented internal blake2 functions from being exported

Browse Source
This commit is contained in:
John Galt 2015-11-13 15:49:13 -05:00
parent 958e07c5dc
commit 64d7dca79a
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cbits/blake2/blake2b.c
View File

@ -175,6 +175,7 @@ static inline int blake2b_init0( blake2b_state *S )
}
/* init xors IV with input parameter block */
__attribute__((visibility ("hidden")))
int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
{
//blake2b_init0( S );
@ -191,6 +192,7 @@ int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
/* Some sort of default parameter block initialization, for sequential blake2b */
__attribute__((visibility ("hidden")))
int blake2b_init( blake2b_state *S, const uint8_t outlen )
{
if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
@ -212,6 +214,7 @@ int blake2b_init( blake2b_state *S, const uint8_t outlen )
return blake2b_init_param( S, &P );
}
__attribute__((visibility ("hidden")))
int blake2b_init_key( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen )
{
if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
@ -316,7 +319,7 @@ static inline int blake2b_compress( blake2b_state *S, const uint8_t block[BLAKE2
return 0;
}
__attribute__((visibility ("hidden")))
int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen )
{
while( inlen > 0 )
@ -347,7 +350,7 @@ int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen )
return 0;
}
__attribute__((visibility ("hidden")))
int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen )
{
if( outlen > BLAKE2B_OUTBYTES )
@ -369,7 +372,7 @@ int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen )
return 0;
}
__attribute__((visibility ("hidden")))
int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen )
{
blake2b_state S[1];

8
cbits/blake2/blake2bp.c
View File

@ -59,7 +59,7 @@ static inline int blake2bp_init_root( blake2b_state *S, uint8_t outlen, uint8_t
return blake2b_init_param( S, P );
}
__attribute__((visibility ("hidden")))
int blake2bp_init( blake2bp_state *S, const uint8_t outlen )
{
if( !outlen || outlen > BLAKE2B_OUTBYTES ) return -1;
@ -78,6 +78,7 @@ int blake2bp_init( blake2bp_state *S, const uint8_t outlen )
return 0;
}
__attribute__((visibility ("hidden")))
int blake2bp_init_key( blake2bp_state *S, const uint8_t outlen, const void *key, const uint8_t keylen )
{
if( !outlen || outlen > BLAKE2B_OUTBYTES ) return -1;
@ -108,7 +109,7 @@ int blake2bp_init_key( blake2bp_state *S, const uint8_t outlen, const void *key,
return 0;
}
__attribute__((visibility ("hidden")))
int blake2bp_update( blake2bp_state *S, const uint8_t *in, uint64_t inlen )
{
size_t left = S->buflen;
@ -159,7 +160,7 @@ int blake2bp_update( blake2bp_state *S, const uint8_t *in, uint64_t inlen )
}
__attribute__((visibility ("hidden")))
int blake2bp_final( blake2bp_state *S, uint8_t *out, const uint8_t outlen )
{
uint8_t hash[PARALLELISM_DEGREE][BLAKE2B_OUTBYTES];
@ -184,6 +185,7 @@ int blake2bp_final( blake2bp_state *S, uint8_t *out, const uint8_t outlen )
return blake2b_final( S->R, out, outlen );
}
__attribute__((visibility ("hidden")))
int blake2bp( uint8_t *out, const void *in, const void *key, uint8_t outlen, uint64_t inlen, uint8_t keylen )
{
uint8_t hash[PARALLELISM_DEGREE][BLAKE2B_OUTBYTES];

7
cbits/blake2/blake2s.c
View File

@ -162,6 +162,7 @@ static inline int blake2s_init0( blake2s_state *S )
}
/* init2 xors IV with input parameter block */
__attribute__((visibility ("hidden")))
int blake2s_init_param( blake2s_state *S, const blake2s_param *P )
{
//blake2s_init0( S );
@ -178,6 +179,7 @@ int blake2s_init_param( blake2s_state *S, const blake2s_param *P )
/* Some sort of default parameter block initialization, for sequential blake2s */
__attribute__((visibility ("hidden")))
int blake2s_init( blake2s_state *S, const uint8_t outlen )
{
/* Move interval verification here? */
@ -199,7 +201,7 @@ int blake2s_init( blake2s_state *S, const uint8_t outlen )
return blake2s_init_param( S, &P );
}
__attribute__((visibility ("hidden")))
int blake2s_init_key( blake2s_state *S, const uint8_t outlen, const void *key, const uint8_t keylen )
{
/* Move interval verification here? */
@ -293,6 +295,7 @@ static inline int blake2s_compress( blake2s_state *S, const uint8_t block[BLAKE2
}
/* inlen now in bytes */
__attribute__((visibility ("hidden")))
int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen )
{
while( inlen > 0 )
@ -324,6 +327,7 @@ int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen )
}
/* Is this correct? */
__attribute__((visibility ("hidden")))
int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen )
{
uint8_t buffer[BLAKE2S_OUTBYTES] = {0};
@ -352,6 +356,7 @@ int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen )
}
/* inlen, at least, should be uint64_t. Others can be size_t. */
__attribute__((visibility ("hidden")))
int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen )
{
blake2s_state S[1];

9
cbits/blake2/blake2sp.c
View File

@ -56,7 +56,7 @@ static inline int blake2sp_init_root( blake2s_state *S, uint8_t outlen, uint8_t
return blake2s_init_param( S, P );
}
__attribute__((visibility ("hidden")))
int blake2sp_init( blake2sp_state *S, const uint8_t outlen )
{
if( !outlen || outlen > BLAKE2S_OUTBYTES ) return -1;
@ -75,6 +75,7 @@ int blake2sp_init( blake2sp_state *S, const uint8_t outlen )
return 0;
}
__attribute__((visibility ("hidden")))
int blake2sp_init_key( blake2sp_state *S, const uint8_t outlen, const void *key, const uint8_t keylen )
{
if( !outlen || outlen > BLAKE2S_OUTBYTES ) return -1;
@ -105,7 +106,7 @@ int blake2sp_init_key( blake2sp_state *S, const uint8_t outlen, const void *key,
return 0;
}
__attribute__((visibility ("hidden")))
int blake2sp_update( blake2sp_state *S, const uint8_t *in, uint64_t inlen )
{
size_t left = S->buflen;
@ -155,7 +156,7 @@ int blake2sp_update( blake2sp_state *S, const uint8_t *in, uint64_t inlen )
return 0;
}
__attribute__((visibility ("hidden")))
int blake2sp_final( blake2sp_state *S, uint8_t *out, const uint8_t outlen )
{
uint8_t hash[PARALLELISM_DEGREE][BLAKE2S_OUTBYTES];
@ -180,7 +181,7 @@ int blake2sp_final( blake2sp_state *S, uint8_t *out, const uint8_t outlen )
return blake2s_final( S->R, out, outlen );
}
__attribute__((visibility ("hidden")))
int blake2sp( uint8_t *out, const void *in, const void *key, uint8_t outlen, uint64_t inlen, uint8_t keylen )
{
uint8_t hash[PARALLELISM_DEGREE][BLAKE2S_OUTBYTES];

2
cbits/cryptonite_blake2sp.c
View File

@ -1,6 +1,6 @@
#include "cryptonite_blake2sp.h"
void cryptonite_blake2spp_init(blake2sp_ctx *ctx)
void cryptonite_blake2sp_init(blake2sp_ctx *ctx)
{
blake2sp_init(ctx, 32);
}