yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-reformat comments for parameters in src/ec.

Browse Source 
Rustfmt moved these to the end of the line "helpfully" but didn't make
them "//" comments. Do that.
This commit is contained in:
Brian Smith 2018-11-15 16:07:36 -10:00
parent a7d3a785f5
commit 0a9cd4dcd2
4 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chacha.rs
View File

@ -82,7 +82,7 @@ extern {
pub const KEY_LEN_IN_BYTES: usize = 256 / 8;
pub const NONCE_LEN: usize = 12; /* 96 bits */
pub const NONCE_LEN: usize = 12; // 96 bits
#[cfg(test)]
mod tests {

32
src/ec/suite_b/ops/mod.rs
View File

@ -195,10 +195,10 @@ pub struct PrivateKeyOps {
elem_inv_squared: fn(a: &Elem<R>) -> Elem<R>,
point_mul_base_impl: fn(a: &Scalar) -> Point,
point_mul_impl: unsafe extern "C" fn(
r: *mut Limb, /* [3][num_limbs] */
p_scalar: *const Limb, /* [num_limbs] */
p_x: *const Limb, /* [num_limbs] */
p_y: *const Limb, /* [num_limbs] */
r: *mut Limb, // [3][num_limbs]
p_scalar: *const Limb, // [num_limbs]
p_x: *const Limb, // [num_limbs]
p_y: *const Limb, // [num_limbs]
),
}
@ -804,9 +804,9 @@ mod tests {
fn p256_point_sum_mixed_test() {
extern "C" {
fn GFp_nistz256_point_add_affine(
r: *mut Limb, /* [p256::COMMON_OPS.num_limbs*3] */
a: *const Limb, /* [p256::COMMON_OPS.num_limbs*3] */
b: *const Limb, /* [p256::COMMON_OPS.num_limbs*2] */
r: *mut Limb, // [p256::COMMON_OPS.num_limbs*3]
a: *const Limb, // [p256::COMMON_OPS.num_limbs*3]
b: *const Limb, // [p256::COMMON_OPS.num_limbs*2]
);
}
point_sum_mixed_test(
@ -821,9 +821,9 @@ mod tests {
fn point_sum_mixed_test(
ops: &PrivateKeyOps,
point_add_affine: unsafe extern "C" fn(
r: *mut Limb, /* [ops.num_limbs*3] */
a: *const Limb, /* [ops.num_limbs*3] */
b: *const Limb, /* [ops.num_limbs*2] */
r: *mut Limb, // [ops.num_limbs*3]
a: *const Limb, // [ops.num_limbs*3]
b: *const Limb, // [ops.num_limbs*2]
),
file_path: &str,
) {
@ -849,8 +849,8 @@ mod tests {
fn p256_point_double_test() {
extern "C" {
fn GFp_nistz256_point_double(
r: *mut Limb, /* [p256::COMMON_OPS.num_limbs*3] */
a: *const Limb, /* [p256::COMMON_OPS.num_limbs*3] */
r: *mut Limb, // [p256::COMMON_OPS.num_limbs*3]
a: *const Limb, // [p256::COMMON_OPS.num_limbs*3]
);
}
point_double_test(
@ -864,8 +864,8 @@ mod tests {
fn p384_point_double_test() {
extern "C" {
fn GFp_nistz384_point_double(
r: *mut Limb, /* [p384::COMMON_OPS.num_limbs*3] */
a: *const Limb, /* [p384::COMMON_OPS.num_limbs*3] */
r: *mut Limb, // [p384::COMMON_OPS.num_limbs*3]
a: *const Limb, // [p384::COMMON_OPS.num_limbs*3]
);
}
point_double_test(
@ -878,8 +878,8 @@ mod tests {
fn point_double_test(
ops: &PrivateKeyOps,
point_double: unsafe extern "C" fn(
r: *mut Limb, /* [ops.num_limbs*3] */
a: *const Limb, /* [ops.num_limbs*3] */
r: *mut Limb, // [ops.num_limbs*3]
a: *const Limb, // [ops.num_limbs*3]
),
file_path: &str,
) {

48
src/ec/suite_b/ops/p256.rs
View File

@ -293,48 +293,48 @@ fn p256_scalar_inv_to_mont(a: &Scalar<Unencoded>) -> Scalar<R> {
extern "C" {
fn GFp_nistz256_add(
r: *mut Limb, /* [COMMON_OPS.num_limbs] */
a: *const Limb, /* [COMMON_OPS.num_limbs] */
b: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [COMMON_OPS.num_limbs]
a: *const Limb, // [COMMON_OPS.num_limbs]
b: *const Limb, // [COMMON_OPS.num_limbs]
);
fn GFp_nistz256_mul_mont(
r: *mut Limb, /* [COMMON_OPS.num_limbs] */
a: *const Limb, /* [COMMON_OPS.num_limbs] */
b: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [COMMON_OPS.num_limbs]
a: *const Limb, // [COMMON_OPS.num_limbs]
b: *const Limb, // [COMMON_OPS.num_limbs]
);
fn GFp_nistz256_sqr_mont(
r: *mut Limb, /* [COMMON_OPS.num_limbs] */
a: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [COMMON_OPS.num_limbs]
a: *const Limb, // [COMMON_OPS.num_limbs]
);
fn GFp_nistz256_point_add(
r: *mut Limb, /* [3][COMMON_OPS.num_limbs] */
a: *const Limb, /* [3][COMMON_OPS.num_limbs] */
b: *const Limb, /* [3][COMMON_OPS.num_limbs] */
r: *mut Limb, // [3][COMMON_OPS.num_limbs]
a: *const Limb, // [3][COMMON_OPS.num_limbs]
b: *const Limb, // [3][COMMON_OPS.num_limbs]
);
fn GFp_nistz256_point_mul(
r: *mut Limb, /* [3][COMMON_OPS.num_limbs] */
p_scalar: *const Limb, /* [COMMON_OPS.num_limbs] */
p_x: *const Limb, /* [COMMON_OPS.num_limbs] */
p_y: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [3][COMMON_OPS.num_limbs]
p_scalar: *const Limb, // [COMMON_OPS.num_limbs]
p_x: *const Limb, // [COMMON_OPS.num_limbs]
p_y: *const Limb, // [COMMON_OPS.num_limbs]
);
fn GFp_nistz256_point_mul_base(
r: *mut Limb, /* [3][COMMON_OPS.num_limbs] */
g_scalar: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [3][COMMON_OPS.num_limbs]
g_scalar: *const Limb, // [COMMON_OPS.num_limbs]
);
fn GFp_p256_scalar_mul_mont(
r: *mut Limb, /* [COMMON_OPS.num_limbs] */
a: *const Limb, /* [COMMON_OPS.num_limbs] */
b: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [COMMON_OPS.num_limbs]
a: *const Limb, // [COMMON_OPS.num_limbs]
b: *const Limb, // [COMMON_OPS.num_limbs]
);
fn GFp_p256_scalar_sqr_mont(
r: *mut Limb, /* [COMMON_OPS.num_limbs] */
a: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [COMMON_OPS.num_limbs]
a: *const Limb, // [COMMON_OPS.num_limbs]
);
fn GFp_p256_scalar_sqr_rep_mont(
r: *mut Limb, /* [COMMON_OPS.num_limbs] */
a: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [COMMON_OPS.num_limbs]
a: *const Limb, // [COMMON_OPS.num_limbs]
rep: c::int,
);
}

36
src/ec/suite_b/ops/p384.rs
View File

@ -325,8 +325,8 @@ fn p384_scalar_inv_to_mont(a: &Scalar<Unencoded>) -> Scalar<R> {
}
unsafe extern "C" fn GFp_p384_elem_sqr_mont(
r: *mut Limb, /* [COMMON_OPS.num_limbs] */
a: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [COMMON_OPS.num_limbs]
a: *const Limb, // [COMMON_OPS.num_limbs]
) {
// XXX: Inefficient. TODO: Make a dedicated squaring routine.
GFp_p384_elem_mul_mont(r, a, a);
@ -339,32 +339,32 @@ const N_RR_LIMBS: [Limb; MAX_LIMBS] = p384_limbs![
extern "C" {
fn GFp_p384_elem_add(
r: *mut Limb, /* [COMMON_OPS.num_limbs] */
a: *const Limb, /* [COMMON_OPS.num_limbs] */
b: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [COMMON_OPS.num_limbs]
a: *const Limb, // [COMMON_OPS.num_limbs]
b: *const Limb, // [COMMON_OPS.num_limbs]
);
fn GFp_p384_elem_mul_mont(
r: *mut Limb, /* [COMMON_OPS.num_limbs] */
a: *const Limb, /* [COMMON_OPS.num_limbs] */
b: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [COMMON_OPS.num_limbs]
a: *const Limb, // [COMMON_OPS.num_limbs]
b: *const Limb, // [COMMON_OPS.num_limbs]
);
fn GFp_nistz384_point_add(
r: *mut Limb, /* [3][COMMON_OPS.num_limbs] */
a: *const Limb, /* [3][COMMON_OPS.num_limbs] */
b: *const Limb, /* [3][COMMON_OPS.num_limbs] */
r: *mut Limb, // [3][COMMON_OPS.num_limbs]
a: *const Limb, // [3][COMMON_OPS.num_limbs]
b: *const Limb, // [3][COMMON_OPS.num_limbs]
);
fn GFp_nistz384_point_mul(
r: *mut Limb, /* [3][COMMON_OPS.num_limbs] */
p_scalar: *const Limb, /* [COMMON_OPS.num_limbs] */
p_x: *const Limb, /* [COMMON_OPS.num_limbs] */
p_y: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [3][COMMON_OPS.num_limbs]
p_scalar: *const Limb, // [COMMON_OPS.num_limbs]
p_x: *const Limb, // [COMMON_OPS.num_limbs]
p_y: *const Limb, // [COMMON_OPS.num_limbs]
);
fn GFp_p384_scalar_mul_mont(
r: *mut Limb, /* [COMMON_OPS.num_limbs] */
a: *const Limb, /* [COMMON_OPS.num_limbs] */
b: *const Limb, /* [COMMON_OPS.num_limbs] */
r: *mut Limb, // [COMMON_OPS.num_limbs]
a: *const Limb, // [COMMON_OPS.num_limbs]
b: *const Limb, // [COMMON_OPS.num_limbs]
);
}