Skip to content

Avoiding conditional directives that split up parts of statements. #1480

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Avoiding conditional directives that split up parts of statements. #1480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
30fa7c7
Avoiding conditional directives that split up parts of statements.
marciomribeiro Dec 4, 2015
dc5881d
Avoiding conditional directives that split up parts of statements.
marciomribeiro Dec 4, 2015
68ca982
Avoiding conditional directives that split up parts of statements.
marciomribeiro Dec 4, 2015
4dcfa8b
Indenting #ifdefs (as requested by @GrayHatter)
marciomribeiro Mar 8, 2016
4e2c2df
Indenting #ifdefs (as requested by @GrayHatter)
marciomribeiro Mar 8, 2016
e4c075f
Indenting #ifdefs (as requested by @GrayHatter)
marciomribeiro Mar 8, 2016
10ad117
Update pwhash_scryptsalsa208sha256_nosse.c
marciomribeiro Jan 12, 2017
2bc8074
Update scrypt_platform.c
marciomribeiro Jan 12, 2017
b094268
Update pwhash_scryptsalsa208sha256_sse.c
marciomribeiro Jan 12, 2017
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
6 changes: 3 additions & 3 deletions toxencryptsave/crypto_pwhash_scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,11 @@ escrypt_kdf_nosse(escrypt_local_t * local,
errno = EINVAL;
return -1;
}
if ((r > SIZE_MAX / 128 / p) ||
_Bool test_size_max = (r > SIZE_MAX / 128 / p) || (N > SIZE_MAX / 128 / r);
#if SIZE_MAX / 256 <= UINT32_MAX
(r > SIZE_MAX / 256) ||
test_size_max = test_size_max || (r > SIZE_MAX / 256);
#endif
(N > SIZE_MAX / 128 / r)) {
if (test_size_max) {
errno = ENOMEM;
return -1;
}
Expand Down
8 changes: 4 additions & 4 deletions toxencryptsave/crypto_pwhash_scryptsalsa208sha256/scrypt_platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ alloc_region(escrypt_region_t * region, size_t size)
{
uint8_t * base, * aligned;
#ifdef MAP_ANON
if ((base = (uint8_t *) mmap(NULL, size, PROT_READ | PROT_WRITE,
int flags;
#ifdef MAP_NOCORE
MAP_ANON | MAP_PRIVATE | MAP_NOCORE,
flags = MAP_ANON | MAP_PRIVATE | MAP_NOCORE;
#else
MAP_ANON | MAP_PRIVATE,
flags = MAP_ANON | MAP_PRIVATE;
#endif
-1, 0)) == MAP_FAILED)
if ((base = (uint8_t *) mmap(NULL, size, PROT_READ | PROT_WRITE, flags, -1, 0)) == MAP_FAILED)
base = NULL;
aligned = base;
#elif defined(HAVE_POSIX_MEMALIGN)
Expand Down
8 changes: 4 additions & 4 deletions toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ escrypt_kdf_sse(escrypt_local_t * local,
size_t B_size, V_size, XY_size, need;
uint8_t * B;
uint32_t * V, * XY;
size_t r = _r, p = _p;
size_t r = _r, p = _p;
uint32_t i;

/* Sanity-check parameters. */
Expand All @@ -345,11 +345,11 @@ escrypt_kdf_sse(escrypt_local_t * local,
errno = EINVAL;
return -1;
}
if ((r > SIZE_MAX / 128 / p) ||
_Bool test_size_max = (r > SIZE_MAX / 128 / p) || (N > SIZE_MAX / 128 / r);
#if SIZE_MAX / 256 <= UINT32_MAX
(r > SIZE_MAX / 256) ||
test_size_max = test_size_max || (r > SIZE_MAX / 256);
#endif
(N > SIZE_MAX / 128 / r)) {
if (test_size_max) {
errno = ENOMEM;
return -1;
}
Expand Down