Use ptrdiff_t type to more precisely indicate usage and avoid compiler warnings.

pull/12351/head
murrayn 7 years ago
parent d32528e733
commit a25cb0f313

@ -44,7 +44,7 @@ static int ec_privkey_import_der(const secp256k1_context* ctx, unsigned char *ou
if (end - privkey < 1 || !(*privkey & 0x80u)) { if (end - privkey < 1 || !(*privkey & 0x80u)) {
return 0; return 0;
} }
size_t lenb = *privkey & ~0x80u; privkey++; ptrdiff_t lenb = *privkey & ~0x80u; privkey++;
if (lenb < 1 || lenb > 2) { if (lenb < 1 || lenb > 2) {
return 0; return 0;
} }
@ -52,7 +52,7 @@ static int ec_privkey_import_der(const secp256k1_context* ctx, unsigned char *ou
return 0; return 0;
} }
/* sequence length */ /* sequence length */
size_t len = privkey[lenb-1] | (lenb > 1 ? privkey[lenb-2] << 8 : 0u); ptrdiff_t len = privkey[lenb-1] | (lenb > 1 ? privkey[lenb-2] << 8 : 0u);
privkey += lenb; privkey += lenb;
if (end - privkey < len) { if (end - privkey < len) {
return 0; return 0;
@ -66,7 +66,7 @@ static int ec_privkey_import_der(const secp256k1_context* ctx, unsigned char *ou
if (end - privkey < 2 || privkey[0] != 0x04u) { if (end - privkey < 2 || privkey[0] != 0x04u) {
return 0; return 0;
} }
size_t oslen = privkey[1]; ptrdiff_t oslen = privkey[1];
privkey += 2; privkey += 2;
if (oslen > 32 || end - privkey < oslen) { if (oslen > 32 || end - privkey < oslen) {
return 0; return 0;

Loading…
Cancel
Save