milksad
/
rust-secp256k1-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #279 from TheBlueMatt/master 

Add a global-context-less-secure feature which skips randomization
This commit is contained in:
Andrew Poelstra 2021-06-08 02:09:25 +00:00 committed by GitHub
parent cf8921a338 ce930ab6b7
commit b686de76fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -23,7 +23,8 @@ std = ["secp256k1-sys/std"]
rand-std = ["rand/std"] rand-std = ["rand/std"]
recovery = ["secp256k1-sys/recovery"] recovery = ["secp256k1-sys/recovery"]
lowmemory = ["secp256k1-sys/lowmemory"] lowmemory = ["secp256k1-sys/lowmemory"]
global-context = ["std", "rand-std"] global-context = ["std", "rand-std", "global-context-less-secure"]
global-context-less-secure = []
[dependencies] [dependencies]
secp256k1-sys = { version = "0.4.0", default-features = false, path = "./secp256k1-sys" } secp256k1-sys = { version = "0.4.0", default-features = false, path = "./secp256k1-sys" }

10
src/context.rs
View File

@ -8,10 +8,12 @@ use Secp256k1;
#[cfg(feature = "std")] #[cfg(feature = "std")]
pub use self::std_only::*; pub use self::std_only::*;
#[cfg(feature = "global-context")] #[cfg(feature = "global-context-less-secure")]
/// Module implementing a singleton pattern for a global `Secp256k1` context /// Module implementing a singleton pattern for a global `Secp256k1` context
pub mod global { pub mod global {
#[cfg(feature = "global-context")]
use rand; use rand;
use std::ops::Deref; use std::ops::Deref;
use std::sync::Once; use std::sync::Once;
use {Secp256k1, All}; use {Secp256k1, All};
@ -22,6 +24,9 @@ pub mod global {
} }
/// A global, static context to avoid repeatedly creating contexts where one can't be passed /// A global, static context to avoid repeatedly creating contexts where one can't be passed
///
/// If the global-context feature is enabled (and not just the global-context-less-secure),
/// this will have been randomized.
pub static SECP256K1: &GlobalContext = &GlobalContext { __private: () }; pub static SECP256K1: &GlobalContext = &GlobalContext { __private: () };
impl Deref for GlobalContext { impl Deref for GlobalContext {
@ -32,7 +37,10 @@ pub mod global {
static mut CONTEXT: Option<Secp256k1<All>> = None; static mut CONTEXT: Option<Secp256k1<All>> = None;
ONCE.call_once(|| unsafe { ONCE.call_once(|| unsafe {
let mut ctx = Secp256k1::new(); let mut ctx = Secp256k1::new();
#[cfg(feature = "global-context")]
{
ctx.randomize(&mut rand::thread_rng()); ctx.randomize(&mut rand::thread_rng());
}
CONTEXT = Some(ctx); CONTEXT = Some(ctx);
}); });
unsafe { CONTEXT.as_ref().unwrap() } unsafe { CONTEXT.as_ref().unwrap() }

4
src/lib.rs
View File

@ -158,7 +158,7 @@ use core::ops::Deref;
use core::mem; use core::mem;
use ffi::{CPtr, types::AlignedType}; use ffi::{CPtr, types::AlignedType};
#[cfg(feature = "global-context")] #[cfg(feature = "global-context-less-secure")]
pub use context::global::SECP256K1; pub use context::global::SECP256K1;
#[cfg(feature = "bitcoin_hashes")] #[cfg(feature = "bitcoin_hashes")]
@ -1269,7 +1269,7 @@ mod tests {
} }
#[cfg(feature = "global-context")] #[cfg(feature = "global-context-less-secure")]
#[test] #[test]
fn test_global_context() { fn test_global_context() {
use super::SECP256K1; use super::SECP256K1;