Skip to content

xsalsa20: some linting #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 2, 2018
Merged

xsalsa20: some linting #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
772a9e6
make _sha256 a static function
fperrad Jun 1, 2018
57bffba
remove useless initialization
fperrad Jun 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/stream/salsa20/xsalsa20_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/stream/salsa20/xsalsa20_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down