Skip to content

Silence warnings converting between signed and unsigned types without an explicit cast #25

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
MichaelBuckley wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Silence warnings converting between signed and unsigned types without an explicit cast #25

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
efc6cad
Fix a const-correctness issue that was being hidden behind a cast
Michael-Panic Apr 23, 2019
d84e9b6
Add explicit casting when converting between signed and unsigned types
Michael-Panic Apr 23, 2019
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
20 changes: 10 additions & 10 deletions src/fe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,16 +295,16 @@ void fe_copy(fe h, const fe f) {
*/

void fe_frombytes(fe h, const unsigned char *s) {
int64_t h0 = load_4(s);
int64_t h1 = load_3(s + 4) << 6;
int64_t h2 = load_3(s + 7) << 5;
int64_t h3 = load_3(s + 10) << 3;
int64_t h4 = load_3(s + 13) << 2;
int64_t h5 = load_4(s + 16);
int64_t h6 = load_3(s + 20) << 7;
int64_t h7 = load_3(s + 23) << 5;
int64_t h8 = load_3(s + 26) << 4;
int64_t h9 = (load_3(s + 29) & 8388607) << 2;
int64_t h0 = (int64_t) load_4(s);
int64_t h1 = (int64_t) (load_3(s + 4) << 6);
int64_t h2 = (int64_t) (load_3(s + 7) << 5);
int64_t h3 = (int64_t) (load_3(s + 10) << 3);
int64_t h4 = (int64_t) (load_3(s + 13) << 2);
int64_t h5 = (int64_t) load_4(s + 16);
int64_t h6 = (int64_t) (load_3(s + 20) << 7);
int64_t h7 = (int64_t) (load_3(s + 23) << 5);
int64_t h8 = (int64_t) (load_3(s + 26) << 4);
int64_t h9 = (int64_t) ((load_3(s + 29) & 8388607) << 2);
int64_t carry0;
int64_t carry1;
int64_t carry2;
Expand Down
24 changes: 12 additions & 12 deletions src/ge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,8 @@ void ge_p3_tobytes(unsigned char *s, const ge_p3 *h) {


static unsigned char equal(signed char b, signed char c) {
unsigned char ub = b;
unsigned char uc = c;
unsigned char ub = (unsigned char)b;
unsigned char uc = (unsigned char)c;
unsigned char x = ub ^ uc; /* 0: yes; 1..255: no */
uint64_t y = x; /* 0: yes; 1..255: no */
y -= 1; /* large: yes; 0..254: no */
Expand All @@ -341,7 +341,7 @@ static unsigned char equal(signed char b, signed char c) {
}

static unsigned char negative(signed char b) {
uint64_t x = b; /* 18446744073709551361..18446744073709551615: yes; 0..255: no */
uint64_t x = (uint64_t) b; /* 18446744073709551361..18446744073709551615: yes; 0..255: no */
x >>= 63; /* 1: yes; 0: no */
return (unsigned char) x;
}
Expand All @@ -356,18 +356,18 @@ static void cmov(ge_precomp *t, const ge_precomp *u, unsigned char b) {
static void select(ge_precomp *t, int pos, signed char b) {
ge_precomp minust;
unsigned char bnegative = negative(b);
unsigned char babs = b - (((-bnegative) & b) << 1);
unsigned char babs = (unsigned char) (b - (((-bnegative) & b) << 1));
fe_1(t->yplusx);
fe_1(t->yminusx);
fe_0(t->xy2d);
cmov(t, &base[pos][0], equal(babs, 1));
cmov(t, &base[pos][1], equal(babs, 2));
cmov(t, &base[pos][2], equal(babs, 3));
cmov(t, &base[pos][3], equal(babs, 4));
cmov(t, &base[pos][4], equal(babs, 5));
cmov(t, &base[pos][5], equal(babs, 6));
cmov(t, &base[pos][6], equal(babs, 7));
cmov(t, &base[pos][7], equal(babs, 8));
cmov(t, &base[pos][0], equal((signed char) babs, 1));
cmov(t, &base[pos][1], equal((signed char) babs, 2));
cmov(t, &base[pos][2], equal((signed char) babs, 3));
cmov(t, &base[pos][3], equal((signed char) babs, 4));
cmov(t, &base[pos][4], equal((signed char) babs, 5));
cmov(t, &base[pos][5], equal((signed char) babs, 6));
cmov(t, &base[pos][6], equal((signed char) babs, 7));
cmov(t, &base[pos][7], equal((signed char) babs, 8));
fe_copy(minust.yplusx, t->yminusx);
fe_copy(minust.yminusx, t->yplusx);
fe_neg(minust.xy2d, t->xy2d);
Expand Down
4 changes: 2 additions & 2 deletions src/sha512.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static const uint64_t K[80] = {
#endif

/* compress 1024-bits */
static int sha512_compress(sha512_context *md, unsigned char *buf)
static int sha512_compress(sha512_context *md, const unsigned char *buf)
{
uint64_t S[8], W[80], t0, t1;
int i;
Expand Down Expand Up @@ -180,7 +180,7 @@ int sha512_update (sha512_context * md, const unsigned char *in, size_t inlen)
}
while (inlen > 0) {
if (md->curlen == 0 && inlen >= 128) {
if ((err = sha512_compress (md, (unsigned char *)in)) != 0) {
if ((err = sha512_compress (md, in)) != 0) {
return err;
}
md->length += 128 * 8;
Expand Down