Merge pull request #397 from fperrad/20180601_lint

xsalsa20: some linting
This commit is contained in:
Steffen Jaeckel 2018-06-02 12:16:01 +02:00 committed by GitHub
commit 5d8f35e5ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -29,7 +29,7 @@ static const char * const constants = "expand 32-byte k";
/* use modified salsa20 doubleround (no final addition as in salsa20) */
static void _xsalsa20_doubleround(ulong32 *x, int rounds)
{
int i = 0;
int i;
for (i = rounds; i > 0; i -= 2) {
/* columnround */
@ -64,7 +64,7 @@ int xsalsa20_setup(salsa20_state *st, const unsigned char *key, unsigned long ke
const int sti[] = {0, 5, 10, 15, 6, 7, 8, 9}; /* indices used to build subkey fm x */
ulong32 x[64]; /* input to & output fm doubleround */
unsigned char subkey[32];
int i = 0;
int i;
LTC_ARGCHK(st != NULL);
LTC_ARGCHK(key != NULL);

View File

@ -19,7 +19,7 @@
#ifdef LTC_XSALSA20
#ifdef LTC_SHA256
int _sha256(unsigned char *hash, const unsigned char *data, const int datalen) {
static int _sha256(unsigned char *hash, const unsigned char *data, const int datalen) {
hash_state md;
sha256_init(&md);
sha256_process(&md, data, datalen);