projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ossl_ ecx symbols
[openssl.git]
/
crypto
/
ec
/
curve448
/
curve448.c
diff --git
a/crypto/ec/curve448/curve448.c
b/crypto/ec/curve448/curve448.c
index b03218283ec568a4ef4d3ad6f8b6cfeb76911b4e..b624692713946db70b3ed73f2b4f59dbd4063e94 100644
(file)
--- a/
crypto/ec/curve448/curve448.c
+++ b/
crypto/ec/curve448/curve448.c
@@
-55,7
+55,7
@@
static void gf_invert(gf y, const gf x, int assert_nonzero)
}
/** identity = (0,1) */
}
/** identity = (0,1) */
-const curve448_point_t curve448_point_identity =
+const curve448_point_t
ossl_
curve448_point_identity =
{ {{{{0}}}, {{{1}}}, {{{1}}}, {{{0}}}} };
static void point_double_internal(curve448_point_t p, const curve448_point_t q,
{ {{{{0}}}, {{{1}}}, {{{1}}}, {{{0}}}} };
static void point_double_internal(curve448_point_t p, const curve448_point_t q,
@@
-82,7
+82,7
@@
static void point_double_internal(curve448_point_t p, const curve448_point_t q,
gf_mul(p->t, b, d);
}
gf_mul(p->t, b, d);
}
-void curve448_point_double(curve448_point_t p, const curve448_point_t q)
+void
ossl_
curve448_point_double(curve448_point_t p, const curve448_point_t q)
{
point_double_internal(p, q, 0);
}
{
point_double_internal(p, q, 0);
}
@@
-184,8
+184,9
@@
static void sub_pniels_from_pt(curve448_point_t p, const pniels_t pn,
sub_niels_from_pt(p, pn->n, before_double);
}
sub_niels_from_pt(p, pn->n, before_double);
}
-c448_bool_t curve448_point_eq(const curve448_point_t p,
- const curve448_point_t q)
+c448_bool_t
+ossl_curve448_point_eq(const curve448_point_t p,
+ const curve448_point_t q)
{
mask_t succ;
gf a, b;
{
mask_t succ;
gf a, b;
@@
-198,7
+199,8
@@
c448_bool_t curve448_point_eq(const curve448_point_t p,
return mask_to_bool(succ);
}
return mask_to_bool(succ);
}
-c448_bool_t curve448_point_valid(const curve448_point_t p)
+c448_bool_t
+ossl_curve448_point_valid(const curve448_point_t p)
{
mask_t out;
gf a, b, c;
{
mask_t out;
gf a, b, c;
@@
-225,7
+227,8
@@
static ossl_inline void constant_time_lookup_niels(niels_s * RESTRICT ni,
constant_time_lookup(ni, table, sizeof(niels_s), nelts, idx);
}
constant_time_lookup(ni, table, sizeof(niels_s), nelts, idx);
}
-void curve448_precomputed_scalarmul(curve448_point_t out,
+void
+ossl_curve448_precomputed_scalarmul(curve448_point_t out,
const curve448_precomputed_s * table,
const curve448_scalar_t scalar)
{
const curve448_precomputed_s * table,
const curve448_scalar_t scalar)
{
@@
-234,8
+237,8
@@
void curve448_precomputed_scalarmul(curve448_point_t out,
niels_t ni;
curve448_scalar_t scalar1x;
niels_t ni;
curve448_scalar_t scalar1x;
- curve448_scalar_add(scalar1x, scalar, precomputed_scalarmul_adjustment);
- curve448_scalar_halve(scalar1x, scalar1x);
+
ossl_
curve448_scalar_add(scalar1x, scalar, precomputed_scalarmul_adjustment);
+
ossl_
curve448_scalar_halve(scalar1x, scalar1x);
for (i = s; i > 0; i--) {
if (i != s)
for (i = s; i > 0; i--) {
if (i != s)
@@
-272,7
+275,8
@@
void curve448_precomputed_scalarmul(curve448_point_t out,
OPENSSL_cleanse(scalar1x, sizeof(scalar1x));
}
OPENSSL_cleanse(scalar1x, sizeof(scalar1x));
}
-void curve448_point_mul_by_ratio_and_encode_like_eddsa(
+void
+ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
uint8_t enc[EDDSA_448_PUBLIC_BYTES],
const curve448_point_t p)
{
uint8_t enc[EDDSA_448_PUBLIC_BYTES],
const curve448_point_t p)
{
@@
-316,10
+320,11
@@
void curve448_point_mul_by_ratio_and_encode_like_eddsa(
OPENSSL_cleanse(y, sizeof(y));
OPENSSL_cleanse(z, sizeof(z));
OPENSSL_cleanse(t, sizeof(t));
OPENSSL_cleanse(y, sizeof(y));
OPENSSL_cleanse(z, sizeof(z));
OPENSSL_cleanse(t, sizeof(t));
- curve448_point_destroy(q);
+
ossl_
curve448_point_destroy(q);
}
}
-c448_error_t curve448_point_decode_like_eddsa_and_mul_by_ratio(
+c448_error_t
+ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
curve448_point_t p,
const uint8_t enc[EDDSA_448_PUBLIC_BYTES])
{
curve448_point_t p,
const uint8_t enc[EDDSA_448_PUBLIC_BYTES])
{
@@
-372,14
+377,15
@@
c448_error_t curve448_point_decode_like_eddsa_and_mul_by_ratio(
}
OPENSSL_cleanse(enc2, sizeof(enc2));
}
OPENSSL_cleanse(enc2, sizeof(enc2));
- assert(curve448_point_valid(p) || ~succ);
+ assert(
ossl_
curve448_point_valid(p) || ~succ);
return c448_succeed_if(mask_to_bool(succ));
}
return c448_succeed_if(mask_to_bool(succ));
}
-c448_error_t x448_int(uint8_t out[X_PUBLIC_BYTES],
- const uint8_t base[X_PUBLIC_BYTES],
- const uint8_t scalar[X_PRIVATE_BYTES])
+c448_error_t
+ossl_x448_int(uint8_t out[X_PUBLIC_BYTES],
+ const uint8_t base[X_PUBLIC_BYTES],
+ const uint8_t scalar[X_PRIVATE_BYTES])
{
gf x1, x2, z2, x3, z3, t1, t2;
int t;
{
gf x1, x2, z2, x3, z3, t1, t2;
int t;
@@
-456,7
+462,8
@@
c448_error_t x448_int(uint8_t out[X_PUBLIC_BYTES],
return c448_succeed_if(mask_to_bool(nz));
}
return c448_succeed_if(mask_to_bool(nz));
}
-void curve448_point_mul_by_ratio_and_encode_like_x448(uint8_t
+void
+ossl_curve448_point_mul_by_ratio_and_encode_like_x448(uint8_t
out[X_PUBLIC_BYTES],
const curve448_point_t p)
{
out[X_PUBLIC_BYTES],
const curve448_point_t p)
{
@@
-467,11
+474,11
@@
void curve448_point_mul_by_ratio_and_encode_like_x448(uint8_t
gf_mul(q->z, q->t, q->y); /* y/x */
gf_sqr(q->y, q->z); /* (y/x)^2 */
gf_serialize(out, q->y, 1);
gf_mul(q->z, q->t, q->y); /* y/x */
gf_sqr(q->y, q->z); /* (y/x)^2 */
gf_serialize(out, q->y, 1);
- curve448_point_destroy(q);
+
ossl_
curve448_point_destroy(q);
}
}
-void x448_derive_public_key(uint8_t out[X_PUBLIC_BYTES],
- const uint8_t scalar[X_PRIVATE_BYTES])
+void
ossl_
x448_derive_public_key(uint8_t out[X_PUBLIC_BYTES],
+
const uint8_t scalar[X_PRIVATE_BYTES])
{
/* Scalar conditioning */
uint8_t scalar2[X_PRIVATE_BYTES];
{
/* Scalar conditioning */
uint8_t scalar2[X_PRIVATE_BYTES];
@@
-485,15
+492,16
@@
void x448_derive_public_key(uint8_t out[X_PUBLIC_BYTES],
scalar2[X_PRIVATE_BYTES - 1] &= ~((0u - 1u) << ((X_PRIVATE_BITS + 7) % 8));
scalar2[X_PRIVATE_BYTES - 1] |= 1 << ((X_PRIVATE_BITS + 7) % 8);
scalar2[X_PRIVATE_BYTES - 1] &= ~((0u - 1u) << ((X_PRIVATE_BITS + 7) % 8));
scalar2[X_PRIVATE_BYTES - 1] |= 1 << ((X_PRIVATE_BITS + 7) % 8);
- curve448_scalar_decode_long(the_scalar, scalar2, sizeof(scalar2));
+
ossl_
curve448_scalar_decode_long(the_scalar, scalar2, sizeof(scalar2));
/* Compensate for the encoding ratio */
for (i = 1; i < X448_ENCODE_RATIO; i <<= 1)
/* Compensate for the encoding ratio */
for (i = 1; i < X448_ENCODE_RATIO; i <<= 1)
- curve448_scalar_halve(the_scalar, the_scalar);
+
ossl_
curve448_scalar_halve(the_scalar, the_scalar);
- curve448_precomputed_scalarmul(p, curve448_precomputed_base, the_scalar);
- curve448_point_mul_by_ratio_and_encode_like_x448(out, p);
- curve448_point_destroy(p);
+ ossl_curve448_precomputed_scalarmul(p, ossl_curve448_precomputed_base,
+ the_scalar);
+ ossl_curve448_point_mul_by_ratio_and_encode_like_x448(out, p);
+ ossl_curve448_point_destroy(p);
}
/* Control for variable-time scalar multiply algorithms. */
}
/* Control for variable-time scalar multiply algorithms. */
@@
-610,7
+618,7
@@
static void prepare_wnaf_table(pniels_t * output,
if (tbits == 0)
return;
if (tbits == 0)
return;
- curve448_point_double(tmp, working);
+
ossl_
curve448_point_double(tmp, working);
pt_to_pniels(twop, tmp);
add_pniels_to_pt(tmp, output[0], 0);
pt_to_pniels(twop, tmp);
add_pniels_to_pt(tmp, output[0], 0);
@@
-621,11
+629,12
@@
static void prepare_wnaf_table(pniels_t * output,
pt_to_pniels(output[i], tmp);
}
pt_to_pniels(output[i], tmp);
}
- curve448_point_destroy(tmp);
+
ossl_
curve448_point_destroy(tmp);
OPENSSL_cleanse(twop, sizeof(twop));
}
OPENSSL_cleanse(twop, sizeof(twop));
}
-void curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
+void
+ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
const curve448_scalar_t scalar1,
const curve448_point_t base2,
const curve448_scalar_t scalar2)
const curve448_scalar_t scalar1,
const curve448_point_t base2,
const curve448_scalar_t scalar2)
@@
-645,7
+654,7
@@
void curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
i = control_var[0].power;
if (i < 0) {
i = control_var[0].power;
if (i < 0) {
- curve448_point_copy(combo, curve448_point_identity);
+ curve448_point_copy(combo,
ossl_
curve448_point_identity);
return;
}
if (i > control_pre[0].power) {
return;
}
if (i > control_pre[0].power) {
@@
-653,13
+662,14
@@
void curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
contv++;
} else if (i == control_pre[0].power && i >= 0) {
pniels_to_pt(combo, precmp_var[control_var[0].addend >> 1]);
contv++;
} else if (i == control_pre[0].power && i >= 0) {
pniels_to_pt(combo, precmp_var[control_var[0].addend >> 1]);
- add_niels_to_pt(combo, curve448_wnaf_base[control_pre[0].addend >> 1],
+ add_niels_to_pt(combo,
+ ossl_curve448_wnaf_base[control_pre[0].addend >> 1],
i);
contv++;
contp++;
} else {
i = control_pre[0].power;
i);
contv++;
contp++;
} else {
i = control_pre[0].power;
- niels_to_pt(combo, curve448_wnaf_base[control_pre[0].addend >> 1]);
+ niels_to_pt(combo,
ossl_
curve448_wnaf_base[control_pre[0].addend >> 1]);
contp++;
}
contp++;
}
@@
-688,11
+698,11
@@
void curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
if (control_pre[contp].addend > 0)
add_niels_to_pt(combo,
if (control_pre[contp].addend > 0)
add_niels_to_pt(combo,
- curve448_wnaf_base[control_pre[contp].addend
+
ossl_
curve448_wnaf_base[control_pre[contp].addend
>> 1], i);
else
sub_niels_from_pt(combo,
>> 1], i);
else
sub_niels_from_pt(combo,
- curve448_wnaf_base[(-control_pre
+
ossl_
curve448_wnaf_base[(-control_pre
[contp].addend) >> 1], i);
contp++;
}
[contp].addend) >> 1], i);
contp++;
}
@@
-709,20
+719,20
@@
void curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
(void)ncb_pre;
}
(void)ncb_pre;
}
-void curve448_point_destroy(curve448_point_t point)
+void
ossl_
curve448_point_destroy(curve448_point_t point)
{
OPENSSL_cleanse(point, sizeof(curve448_point_t));
}
{
OPENSSL_cleanse(point, sizeof(curve448_point_t));
}
-int
X
448(uint8_t out_shared_key[56], const uint8_t private_key[56],
- const uint8_t peer_public_value[56])
+int
ossl_x
448(uint8_t out_shared_key[56], const uint8_t private_key[56],
+
const uint8_t peer_public_value[56])
{
{
- return x448_int(out_shared_key, peer_public_value, private_key)
+ return
ossl_
x448_int(out_shared_key, peer_public_value, private_key)
== C448_SUCCESS;
}
== C448_SUCCESS;
}
-void
X
448_public_from_private(uint8_t out_public_value[56],
- const uint8_t private_key[56])
+void
ossl_x
448_public_from_private(uint8_t out_public_value[56],
+
const uint8_t private_key[56])
{
{
- x448_derive_public_key(out_public_value, private_key);
+
ossl_
x448_derive_public_key(out_public_value, private_key);
}
}