j3d1/bearssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Harmonized behaviour when point length is invalid.

Browse source
This commit is contained in:
Thomas Pornin 2020-04-24 15:18:58 +02:00
parent acc70b1be6
commit dda1f8a0c4
4 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/ec/ec_p256_m15.c
View file

@ -2039,12 +2039,13 @@ api_mul(unsigned char *G, size_t Glen,
p256_jacobian P; p256_jacobian P;
(void)curve; (void)curve;
if (Glen != 65) {
return 0;
}
r = p256_decode(&P, G, Glen); r = p256_decode(&P, G, Glen);
p256_mul(&P, x, xlen); p256_mul(&P, x, xlen);
if (Glen >= 65) {
p256_to_affine(&P); p256_to_affine(&P);
p256_encode(G, &P); p256_encode(G, &P);
}
return r; return r;
} }
@ -2059,16 +2060,6 @@ api_mulgen(unsigned char *R,
p256_to_affine(&P); p256_to_affine(&P);
p256_encode(R, &P); p256_encode(R, &P);
return 65; return 65;
/*
const unsigned char *G;
size_t Glen;
G = api_generator(curve, &Glen);
memcpy(R, G, Glen);
api_mul(R, Glen, x, xlen, curve);
return Glen;
*/
} }
static uint32_t static uint32_t
@ -2081,6 +2072,9 @@ api_muladd(unsigned char *A, const unsigned char *B, size_t len,
int i; int i;
(void)curve; (void)curve;
if (len != 65) {
return 0;
}
r = p256_decode(&P, A, len); r = p256_decode(&P, A, len);
p256_mul(&P, x, xlen); p256_mul(&P, x, xlen);
if (B == NULL) { if (B == NULL) {

18
src/ec/ec_p256_m31.c
View file

@ -1384,12 +1384,13 @@ api_mul(unsigned char *G, size_t Glen,
p256_jacobian P; p256_jacobian P;
(void)curve; (void)curve;
if (Glen != 65) {
return 0;
}
r = p256_decode(&P, G, Glen); r = p256_decode(&P, G, Glen);
p256_mul(&P, x, xlen); p256_mul(&P, x, xlen);
if (Glen >= 65) {
p256_to_affine(&P); p256_to_affine(&P);
p256_encode(G, &P); p256_encode(G, &P);
}
return r; return r;
} }
@ -1404,16 +1405,6 @@ api_mulgen(unsigned char *R,
p256_to_affine(&P); p256_to_affine(&P);
p256_encode(R, &P); p256_encode(R, &P);
return 65; return 65;
/*
const unsigned char *G;
size_t Glen;
G = api_generator(curve, &Glen);
memcpy(R, G, Glen);
api_mul(R, Glen, x, xlen, curve);
return Glen;
*/
} }
static uint32_t static uint32_t
@ -1426,6 +1417,9 @@ api_muladd(unsigned char *A, const unsigned char *B, size_t len,
int i; int i;
(void)curve; (void)curve;
if (len != 65) {
return 0;
}
r = p256_decode(&P, A, len); r = p256_decode(&P, A, len);
p256_mul(&P, x, xlen); p256_mul(&P, x, xlen);
if (B == NULL) { if (B == NULL) {

8
src/ec/ec_prime_i15.c
View file

@ -733,11 +733,12 @@ api_mul(unsigned char *G, size_t Glen,
jacobian P; jacobian P;
cc = id_to_curve(curve); cc = id_to_curve(curve);
if (Glen != cc->point_len) {
return 0;
}
r = point_decode(&P, G, Glen, cc); r = point_decode(&P, G, Glen, cc);
point_mul(&P, x, xlen, cc); point_mul(&P, x, xlen, cc);
if (Glen == cc->point_len) {
point_encode(G, &P, cc); point_encode(G, &P, cc);
}
return r; return r;
} }
@ -770,6 +771,9 @@ api_muladd(unsigned char *A, const unsigned char *B, size_t len,
*/ */
cc = id_to_curve(curve); cc = id_to_curve(curve);
if (len != cc->point_len) {
return 0;
}
r = point_decode(&P, A, len, cc); r = point_decode(&P, A, len, cc);
if (B == NULL) { if (B == NULL) {
size_t Glen; size_t Glen;

13
src/ec/ec_prime_i31.c
View file

@ -107,15 +107,16 @@ typedef struct {
const uint32_t *b; const uint32_t *b;
const uint32_t *R2; const uint32_t *R2;
uint32_t p0i; uint32_t p0i;
size_t point_len;
} curve_params; } curve_params;
static inline const curve_params * static inline const curve_params *
id_to_curve(int curve) id_to_curve(int curve)
{ {
static const curve_params pp[] = { static const curve_params pp[] = {
{ P256_P, P256_B, P256_R2, 0x00000001 }, { P256_P, P256_B, P256_R2, 0x00000001, 65 },
{ P384_P, P384_B, P384_R2, 0x00000001 }, { P384_P, P384_B, P384_R2, 0x00000001, 97 },
{ P521_P, P521_B, P521_R2, 0x00000001 } { P521_P, P521_B, P521_R2, 0x00000001, 133 }
}; };
return &pp[curve - BR_EC_secp256r1]; return &pp[curve - BR_EC_secp256r1];
@ -734,6 +735,9 @@ api_mul(unsigned char *G, size_t Glen,
jacobian P; jacobian P;
cc = id_to_curve(curve); cc = id_to_curve(curve);
if (Glen != cc->point_len) {
return 0;
}
r = point_decode(&P, G, Glen, cc); r = point_decode(&P, G, Glen, cc);
point_mul(&P, x, xlen, cc); point_mul(&P, x, xlen, cc);
point_encode(G, &P, cc); point_encode(G, &P, cc);
@ -769,6 +773,9 @@ api_muladd(unsigned char *A, const unsigned char *B, size_t len,
*/ */
cc = id_to_curve(curve); cc = id_to_curve(curve);
if (len != cc->point_len) {
return 0;
}
r = point_decode(&P, A, len, cc); r = point_decode(&P, A, len, cc);
if (B == NULL) { if (B == NULL) {
size_t Glen; size_t Glen;