Skip to content

Commit 55bad33

Browse files
Angloimotoisislovecruft
authored andcommitted
Rename subtle::arrays_equal_ct() to subtle::arrays_equal().
It's already obvious that it's constant-time because it's in the subtle module.
1 parent 350b9c3 commit 55bad33

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/curve.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ use core::ops::Index;
9090
use constants;
9191
use field::FieldElement;
9292
use scalar::Scalar;
93-
use subtle::arrays_equal_ct;
93+
use subtle::arrays_equal;
9494
use subtle::bytes_equal_ct;
9595
use subtle::CTAssignable;
9696
use subtle::CTEq;
@@ -518,8 +518,8 @@ impl CTAssignable for ExtendedPoint {
518518

519519
impl CTEq for ExtendedPoint {
520520
fn ct_eq(&self, other: &ExtendedPoint) -> u8 {
521-
arrays_equal_ct( self.compress_edwards().as_bytes(),
522-
other.compress_edwards().as_bytes())
521+
arrays_equal( self.compress_edwards().as_bytes(),
522+
other.compress_edwards().as_bytes())
523523
}
524524
}
525525

src/field.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use core::ops::{Index, IndexMut};
2323
use core::cmp::{Eq, PartialEq};
2424
use core::ops::Neg;
2525

26-
use subtle::arrays_equal_ct;
26+
use subtle::arrays_equal;
2727
use subtle::byte_is_nonzero;
2828
use subtle::CTAssignable;
2929
use subtle::CTEq;
@@ -96,7 +96,7 @@ impl CTEq for FieldElement {
9696
///
9797
/// `1u8` if the two `FieldElement`s are equal, and `0u8` otherwise.
9898
fn ct_eq(&self, other: &FieldElement) -> u8 {
99-
arrays_equal_ct(&self.to_bytes(), &other.to_bytes())
99+
arrays_equal(&self.to_bytes(), &other.to_bytes())
100100
}
101101
}
102102

src/scalar.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use constants;
4747
use utils::{load3, load4};
4848
use subtle::CTAssignable;
4949
use subtle::CTEq;
50-
use subtle::arrays_equal_ct;
50+
use subtle::arrays_equal;
5151

5252
/// The `Scalar` struct represents an element in ℤ/lℤ, where
5353
///
@@ -76,7 +76,7 @@ impl PartialEq for Scalar {
7676
///
7777
/// True if they are equal, and false otherwise.
7878
fn eq(&self, other: &Self) -> bool {
79-
arrays_equal_ct(&self.0, &other.0) == 1u8
79+
arrays_equal(&self.0, &other.0) == 1u8
8080
}
8181
}
8282

@@ -87,7 +87,7 @@ impl CTEq for Scalar {
8787
///
8888
/// `1u8` if they are equal, and `0u8` otherwise.
8989
fn ct_eq(&self, other: &Self) -> u8 {
90-
arrays_equal_ct(&self.0, &other.0)
90+
arrays_equal(&self.0, &other.0)
9191
}
9292
}
9393

src/subtle.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,25 +101,25 @@ pub fn byte_is_nonzero(b: u8) -> u8 {
101101
///
102102
/// ```
103103
/// # extern crate curve25519_dalek;
104-
/// # use curve25519_dalek::subtle::arrays_equal_ct;
104+
/// # use curve25519_dalek::subtle::arrays_equal;
105105
/// # fn main() {
106106
/// let a: [u8; 3] = [0, 1, 2];
107107
/// let b: [u8; 3] = [1, 2, 3];
108108
///
109-
/// assert!(arrays_equal_ct(&a, &b) == 0);
109+
/// assert!(arrays_equal(&a, &b) == 0);
110110
/// # }
111111
/// ```
112112
///
113113
/// If the contents *do* match, `1u8` is returned:
114114
///
115115
/// ```
116116
/// # extern crate curve25519_dalek;
117-
/// # use curve25519_dalek::subtle::arrays_equal_ct;
117+
/// # use curve25519_dalek::subtle::arrays_equal;
118118
/// # fn main() {
119119
/// let a: [u8; 3] = [0, 1, 2];
120120
/// let b: [u8; 3] = [0, 1, 2];
121121
///
122-
/// assert!(arrays_equal_ct(&a, &b) == 1);
122+
/// assert!(arrays_equal(&a, &b) == 1);
123123
/// # }
124124
/// ```
125125
///
@@ -131,7 +131,7 @@ pub fn byte_is_nonzero(b: u8) -> u8 {
131131
///
132132
/// Returns `1u8` if `a == b` and `0u8` otherwise.
133133
#[inline(always)]
134-
pub fn arrays_equal_ct(a: &[u8; 32], b: &[u8; 32]) -> u8 {
134+
pub fn arrays_equal(a: &[u8; 32], b: &[u8; 32]) -> u8 {
135135
let mut x: u8 = 0;
136136

137137
for i in 0..32 {

0 commit comments

Comments
 (0)