Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Cargo-minimal.lock
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,15 @@ dependencies = [
"getrandom",
]

[[package]]
name = "rand_xoshiro"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41"
dependencies = [
"rand_core",
]

[[package]]
name = "rustversion"
version = "1.0.20"
Expand All @@ -204,7 +213,7 @@ dependencies = [
"getrandom",
"hex_lit",
"rand",
"rand_core",
"rand_xoshiro",
"secp256k1-sys",
"serde",
"serde_cbor",
Expand Down
11 changes: 10 additions & 1 deletion Cargo-recent.lock
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,15 @@ dependencies = [
"getrandom",
]

[[package]]
name = "rand_xoshiro"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41"
dependencies = [
"rand_core",
]

[[package]]
name = "rustversion"
version = "1.0.20"
Expand All @@ -195,7 +204,7 @@ dependencies = [
"getrandom",
"hex_lit",
"rand",
"rand_core",
"rand_xoshiro",
"secp256k1-sys",
"serde",
"serde_cbor",
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ rand = { version = "0.9", default-features = false, optional = true }
serde = { version = "1.0.103", default-features = false, optional = true }

[dev-dependencies]
rand_core = "0.9"
rand_xoshiro = { version = "0.7.0", default-features = false }
serde_cbor = "0.10.0"
serde_test = "1.0.19"
bincode = "1.3.3"
Expand Down
2 changes: 1 addition & 1 deletion examples/sign_verify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn sign<C: Signing>(
seckey: [u8; 32],
) -> Result<ecdsa::Signature, Error> {
let msg = Message::from_digest(msg_digest);
let seckey = SecretKey::from_byte_array(seckey)?;
let seckey = SecretKey::from_secret_bytes(seckey)?;
Ok(secp.sign_ecdsa(msg, &seckey))
}

Expand Down
2 changes: 1 addition & 1 deletion examples/sign_verify_recovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fn sign_recovery(
seckey: [u8; 32],
) -> Result<ecdsa::RecoverableSignature, Error> {
let msg = Message::from_digest(msg_digest);
let seckey = SecretKey::from_byte_array(seckey)?;
let seckey = SecretKey::from_secret_bytes(seckey)?;
Ok(ecdsa::RecoverableSignature::sign_ecdsa_recoverable(msg, &seckey))
}

Expand Down
6 changes: 3 additions & 3 deletions src/ecdsa/recovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ impl RecoverableSignature {
let mut ret = ffi::RecoverableSignature::new();
// xor the secret key and message together to get a rerandomization seed
// for timing analysis defense-in-depth
let mut rerandomize = sk.secret_bytes();
let mut rerandomize = sk.to_secret_bytes();
for (rera, byte) in rerandomize.iter_mut().zip(msg[..].iter()) {
*rera ^= *byte;
}
Expand Down Expand Up @@ -272,7 +272,7 @@ mod tests {
#[cfg(not(secp256k1_fuzz))] // fixed sig vectors can't work with fuzz-sigs
#[rustfmt::skip]
fn sign() {
let sk = SecretKey::from_byte_array(ONE).unwrap();
let sk = SecretKey::from_secret_bytes(ONE).unwrap();
let msg = Message::from_digest(ONE);
let sig = RecoverableSignature::sign_ecdsa_recoverable(msg, &sk);

Expand All @@ -292,7 +292,7 @@ mod tests {
#[cfg(not(secp256k1_fuzz))] // fixed sig vectors can't work with fuzz-sigs
#[rustfmt::skip]
fn sign_with_noncedata() {
let sk = SecretKey::from_byte_array(ONE).unwrap();
let sk = SecretKey::from_secret_bytes(ONE).unwrap();
let noncedata = [42u8; 32];
let msg = Message::from_digest(ONE);

Expand Down
16 changes: 8 additions & 8 deletions src/ellswift.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ impl ElligatorSwift {
/// # #[cfg(feature = "alloc")] {
/// use secp256k1::{ellswift::ElligatorSwift, PublicKey, Secp256k1, SecretKey};
/// let secp = Secp256k1::new();
/// let sk = SecretKey::from_slice(&[1; 32]).unwrap();
/// let sk = SecretKey::from_secret_bytes([1; 32]).unwrap();
/// let es = ElligatorSwift::from_seckey(&secp, sk, None);
/// # }
/// ```
Expand Down Expand Up @@ -140,7 +140,7 @@ impl ElligatorSwift {
/// # #[cfg(feature = "alloc")] {
/// use secp256k1::{ellswift::ElligatorSwift, PublicKey, Secp256k1, SecretKey};
/// let secp = Secp256k1::new();
/// let sk = SecretKey::from_slice(&[1; 32]).unwrap();
/// let sk = SecretKey::from_secret_bytes([1; 32]).unwrap();
/// let pk = PublicKey::from_secret_key(&secp, &sk);
/// let es = ElligatorSwift::from_pubkey(pk);
/// # }
Expand Down Expand Up @@ -377,7 +377,7 @@ mod tests {
// Test that we can round trip an ElligatorSwift encoding
let secp = crate::Secp256k1::new();
let public_key =
PublicKey::from_secret_key(&secp, &SecretKey::from_byte_array([1u8; 32]).unwrap());
PublicKey::from_secret_key(&secp, &SecretKey::from_secret_bytes([1u8; 32]).unwrap());

let ell = ElligatorSwift::from_pubkey(public_key);
let pk = PublicKey::from_ellswift(ell);
Expand All @@ -391,10 +391,10 @@ mod tests {
let rand32 = [1u8; 32];
let priv32 = [1u8; 32];
let ell =
ElligatorSwift::from_seckey(&secp, SecretKey::from_byte_array(rand32).unwrap(), None);
ElligatorSwift::from_seckey(&secp, SecretKey::from_secret_bytes(rand32).unwrap(), None);
let pk = PublicKey::from_ellswift(ell);
let expected =
PublicKey::from_secret_key(&secp, &SecretKey::from_byte_array(priv32).unwrap());
PublicKey::from_secret_key(&secp, &SecretKey::from_secret_bytes(priv32).unwrap());

assert_eq!(pk, expected);
}
Expand All @@ -407,13 +407,13 @@ mod tests {
let priv32 = [2u8; 32];
let ell = ElligatorSwift::from_seckey(
&secp,
SecretKey::from_byte_array(rand32).unwrap(),
SecretKey::from_secret_bytes(rand32).unwrap(),
Some(rand32),
);
let pk = ElligatorSwift::shared_secret_with_hasher(
ell,
ell,
SecretKey::from_byte_array(priv32).unwrap(),
SecretKey::from_secret_bytes(priv32).unwrap(),
Party::Initiator,
|_, _, _| ElligatorSwiftSharedSecret([0xff; 32]),
);
Expand Down Expand Up @@ -627,7 +627,7 @@ mod tests {
ElligatorSwift::from_array(ellswift_theirs),
)
};
let sec_key = SecretKey::from_byte_array(my_secret).unwrap();
let sec_key = SecretKey::from_secret_bytes(my_secret).unwrap();
let initiator = if initiator == 0 { Party::Responder } else { Party::Initiator };

let shared = ElligatorSwift::shared_secret(el_a, el_b, sec_key, initiator);
Expand Down
Loading
Loading