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

Use small Curve25519 for wasm32 & other non-{aarch64,x86_64}.

Browse Source 
Enable `ring::agreement` for wasm32 targets using the small
implementation of Curve25519.

Use the small Curve25519 implementation of Curve25519 (and
P-256) for all targets except for Aarch64 and x86-64.

Besides being smaller, the small implementations are likely
more resistant to compiler-introduced side-channels, which
is especially important for the wasm32 virtual machine and
other targets that we don't QA as thoroughly as AAarch64
and x86-64.

Bring in the previously-removed definition of `fe_mul_llt`
from BoringSSL as of commit
8d71d244c0debac4079beeb02b5802fde59b94bd.
This commit is contained in:
Brian Smith 2023-10-14 14:06:27 -07:00
parent 0f8386dce2
commit da23dc037e
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/curve25519/curve25519.c
View File

@ -240,9 +240,11 @@ static void fe_mul_ltt(fe_loose *h, const fe *f, const fe *g) {
fe_mul_impl(h->v, f->v, g->v);
}
// static void fe_mul_llt(fe_loose *h, const fe_loose *f, const fe *g) was
// removed. This comment is here to make diffs vs. BoringSSL easier to read.
#if defined(OPENSSL_SMALL)
static void fe_mul_llt(fe_loose *h, const fe_loose *f, const fe *g) {
fe_mul_impl(h->v, f->v, g->v);
}
#endif
static void fe_mul_ttt(fe *h, const fe *f, const fe *g) {
fe_mul_impl(h->v, f->v, g->v);

4
include/ring-core/target.h
View File

@ -152,4 +152,8 @@
#endif
#endif // OPENSSL_ASM_INCOMPATIBLE
#if !defined(OPENSSL_X86_64) && !defined(OPENSSL_AARCH64)
#define OPENSSL_SMALL
#endif
#endif // OPENSSL_HEADER_TARGET_H

1
src/ec.rs
View File

@ -36,7 +36,6 @@ derive_debug_via_id!(Curve);
#[derive(Clone, Copy, Debug, PartialEq)]
pub enum CurveID {
#[cfg(not(target_arch = "wasm32"))]
Curve25519,
P256,
P384,

1
src/ec/curve25519.rs
View File

@ -16,7 +16,6 @@
pub mod ed25519;
#[cfg(not(target_arch = "wasm32"))]
pub mod x25519;
mod ops;

1
src/ec/suite_b.rs
View File

@ -229,7 +229,6 @@ pub(crate) fn key_pair_from_bytes(
pub mod curve;
#[cfg(not(target_arch = "wasm32"))]
pub mod ecdh;
pub mod ecdsa;

1
src/lib.rs
View File

@ -75,7 +75,6 @@ mod polyfill;
pub mod aead;
#[cfg(not(target_arch = "wasm32"))]
pub mod agreement;
mod bits;

6
tests/agreement_tests.rs
View File

@ -12,7 +12,11 @@
// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#![cfg(not(target_arch = "wasm32"))]
#[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
#[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
wasm_bindgen_test_configure!(run_in_browser);
extern crate alloc;