cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedisct1/libsodium

Browse Source 
* 'master' of github.com:jedisct1/libsodium:
  Use unsigned types for sizes in tests.
  Having dead code in the tree is sad, but keeps the diff with the reference implementation to a minimum.
  THANKS += @jshahbazi for the Fortran bindings
This commit is contained in:
Frank Denis 2014-07-01 12:37:30 -07:00
commit 70c731c95f
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
THANKS
View File

@ -1,6 +1,7 @@
@alethia7 @alethia7
@dnaq @dnaq
@joshjdevl @joshjdevl
@jshahbazi
@neheb @neheb
Amit Murthy (@amitmurthy) Amit Murthy (@amitmurthy)
Bruno Oliveira (@abstractj) Bruno Oliveira (@abstractj)

11
src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c
View File

@ -48,13 +48,13 @@ static inline int blake2b_set_lastnode( blake2b_state *S )
S->f[1] = ~0ULL; S->f[1] = ~0ULL;
return 0; return 0;
} }
#if 0
static inline int blake2b_clear_lastnode( blake2b_state *S ) static inline int blake2b_clear_lastnode( blake2b_state *S )
{ {
S->f[1] = 0ULL; S->f[1] = 0ULL;
return 0; return 0;
} }
#endif
/* Some helper functions, not necessarily useful */ /* Some helper functions, not necessarily useful */
static inline int blake2b_set_lastblock( blake2b_state *S ) static inline int blake2b_set_lastblock( blake2b_state *S )
{ {
@ -63,7 +63,7 @@ static inline int blake2b_set_lastblock( blake2b_state *S )
S->f[0] = ~0ULL; S->f[0] = ~0ULL;
return 0; return 0;
} }
#if 0
static inline int blake2b_clear_lastblock( blake2b_state *S ) static inline int blake2b_clear_lastblock( blake2b_state *S )
{ {
if( S->last_node ) blake2b_clear_lastnode( S ); if( S->last_node ) blake2b_clear_lastnode( S );
@ -71,7 +71,7 @@ static inline int blake2b_clear_lastblock( blake2b_state *S )
S->f[0] = 0ULL; S->f[0] = 0ULL;
return 0; return 0;
} }
#endif
static inline int blake2b_increment_counter( blake2b_state *S, const uint64_t inc ) static inline int blake2b_increment_counter( blake2b_state *S, const uint64_t inc )
{ {
S->t[0] += inc; S->t[0] += inc;
@ -82,6 +82,7 @@ static inline int blake2b_increment_counter( blake2b_state *S, const uint64_t in
// Parameter-related functions // Parameter-related functions
#if 0
static inline int blake2b_param_set_digest_length( blake2b_param *P, const uint8_t digest_length ) static inline int blake2b_param_set_digest_length( blake2b_param *P, const uint8_t digest_length )
{ {
P->digest_length = digest_length; P->digest_length = digest_length;
@ -123,7 +124,7 @@ static inline int blake2b_param_set_inner_length( blake2b_param *P, const uint8_
P->inner_length = inner_length; P->inner_length = inner_length;
return 0; return 0;
} }
#endif
static inline int blake2b_param_set_salt( blake2b_param *P, const uint8_t salt[BLAKE2B_SALTBYTES] ) static inline int blake2b_param_set_salt( blake2b_param *P, const uint8_t salt[BLAKE2B_SALTBYTES] )
{ {
memcpy( P->salt, salt, BLAKE2B_SALTBYTES ); memcpy( P->salt, salt, BLAKE2B_SALTBYTES );

11
src/libsodium/crypto_generichash/blake2/ref/blake2s-ref.c
View File

@ -44,13 +44,13 @@ static inline int blake2s_set_lastnode( blake2s_state *S )
S->f[1] = ~0U; S->f[1] = ~0U;
return 0; return 0;
} }
#if 0
static inline int blake2s_clear_lastnode( blake2s_state *S ) static inline int blake2s_clear_lastnode( blake2s_state *S )
{ {
S->f[1] = 0U; S->f[1] = 0U;
return 0; return 0;
} }
#endif
/* Some helper functions, not necessarily useful */ /* Some helper functions, not necessarily useful */
static inline int blake2s_set_lastblock( blake2s_state *S ) static inline int blake2s_set_lastblock( blake2s_state *S )
{ {
@ -59,7 +59,7 @@ static inline int blake2s_set_lastblock( blake2s_state *S )
S->f[0] = ~0U; S->f[0] = ~0U;
return 0; return 0;
} }
#if 0
static inline int blake2s_clear_lastblock( blake2s_state *S ) static inline int blake2s_clear_lastblock( blake2s_state *S )
{ {
if( S->last_node ) blake2s_clear_lastnode( S ); if( S->last_node ) blake2s_clear_lastnode( S );
@ -67,7 +67,7 @@ static inline int blake2s_clear_lastblock( blake2s_state *S )
S->f[0] = 0U; S->f[0] = 0U;
return 0; return 0;
} }
#endif
static inline int blake2s_increment_counter( blake2s_state *S, const uint32_t inc ) static inline int blake2s_increment_counter( blake2s_state *S, const uint32_t inc )
{ {
S->t[0] += inc; S->t[0] += inc;
@ -76,6 +76,7 @@ static inline int blake2s_increment_counter( blake2s_state *S, const uint32_t in
} }
// Parameter-related functions // Parameter-related functions
#if 0
static inline int blake2s_param_set_digest_length( blake2s_param *P, const uint8_t digest_length ) static inline int blake2s_param_set_digest_length( blake2s_param *P, const uint8_t digest_length )
{ {
P->digest_length = digest_length; P->digest_length = digest_length;
@ -117,7 +118,7 @@ static inline int blake2s_param_set_inner_length( blake2s_param *P, const uint8_
P->inner_length = inner_length; P->inner_length = inner_length;
return 0; return 0;
} }
#endif
static inline int blake2s_param_set_salt( blake2s_param *P, const uint8_t salt[BLAKE2S_SALTBYTES] ) static inline int blake2s_param_set_salt( blake2s_param *P, const uint8_t salt[BLAKE2S_SALTBYTES] )
{ {
memcpy( P->salt, salt, BLAKE2S_SALTBYTES ); memcpy( P->salt, salt, BLAKE2S_SALTBYTES );

2
test/default/box_easy.c
View File

@ -47,7 +47,7 @@ unsigned char c[147 + crypto_box_MACBYTES];
int main(void) int main(void)
{ {
int i; size_t i;
crypto_box_easy(c, m, 131, nonce, bobpk, alicesk); crypto_box_easy(c, m, 131, nonce, bobpk, alicesk);
for (i = 0; i < 131 + crypto_box_MACBYTES; ++i) { for (i = 0; i < 131 + crypto_box_MACBYTES; ++i) {

2
test/default/secretbox_easy.c
View File

@ -41,7 +41,7 @@ unsigned char mac[crypto_secretbox_MACBYTES];
int main(void) int main(void)
{ {
int i; size_t i;
crypto_secretbox_easy(c, m, 131, nonce, firstkey); crypto_secretbox_easy(c, m, 131, nonce, firstkey);
for (i = 0;i < 131 + crypto_secretbox_MACBYTES; ++i) { for (i = 0;i < 131 + crypto_secretbox_MACBYTES; ++i) {