Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update a few dependencies (thiserror, subtle, base64*) #77

Merged
merged 2 commits into from
Nov 22, 2024
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
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ readme = "README.md"
[dependencies]
rayon = { version = "1", optional = true }
rand_core = "0.6.0"
thiserror = "1.0"
subtle = "2.2.1"
thiserror = "2.0"
subtle = "2.6.1"

ff = "0.13"
group = "0.13"
Expand All @@ -39,10 +39,10 @@ blst-portable = [ "blst_lib", "blst_lib/portable", "blstrs/portable" ]

[dev-dependencies]
rand = "0.8"
base64 = "0.13.0"
base64 = "0.22.1"
serde = { version = "1.0.106", features = ["derive"] }
serde_json = "1.0.52"
base64-serde = "0.6.1"
base64-serde = "0.8.0"
rand_chacha = "0.3.1"

[[example]]
Expand Down
14 changes: 0 additions & 14 deletions src/key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ use blstrs::{G1Affine, G1Projective, G2Affine, Scalar};
#[cfg(feature = "blst")]
use group::prime::PrimeCurveAffine;

pub(crate) struct ScalarRepr(<Scalar as PrimeFieldBits>::ReprBits);

use crate::error::Error;
use crate::signature::*;

Expand Down Expand Up @@ -52,18 +50,6 @@ impl From<PrivateKey> for Scalar {
}
}

impl From<PrivateKey> for ScalarRepr {
fn from(val: PrivateKey) -> Self {
ScalarRepr(val.0.to_le_bits().into_inner())
}
}

impl<'a> From<&'a PrivateKey> for ScalarRepr {
fn from(val: &'a PrivateKey) -> Self {
(*val).into()
}
}

pub trait Serialize: ::std::fmt::Debug + Sized {
/// Writes the key to the given writer.
fn write_bytes(&self, dest: &mut impl io::Write) -> io::Result<()>;
Expand Down
18 changes: 12 additions & 6 deletions src/signature.rs
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,8 @@ pub fn verify_messages(
mod tests {
use super::*;

use base64::STANDARD;
use base64::engine::general_purpose::STANDARD as BASE64_STANDARD;
use base64::Engine as _;
use ff::Field;
use rand::{Rng, SeedableRng};
use rand_chacha::ChaCha8Rng;
Expand Down Expand Up @@ -490,7 +491,7 @@ mod tests {
assert_eq!(Signature::from_bytes(&signature_bytes).unwrap(), signature);
}

base64_serde_type!(Base64Standard, STANDARD);
base64_serde_type!(Base64Standard, BASE64_STANDARD);

#[derive(Debug, Clone, Deserialize)]
struct Case {
Expand Down Expand Up @@ -564,12 +565,17 @@ mod tests {
);

if case.ciphersuite.as_bytes() == CSUITE {
let pub_key =
PublicKey::from_bytes(&base64::decode(case.pub_key.as_ref().unwrap()).unwrap())
.unwrap();
let pub_key = PublicKey::from_bytes(
&BASE64_STANDARD
.decode(case.pub_key.as_ref().unwrap())
.unwrap(),
)
.unwrap();
let priv_key = PrivateKey::from_string(case.priv_key.as_ref().unwrap()).unwrap();
let signature = Signature::from_bytes(
&base64::decode(case.signature.as_ref().unwrap()).unwrap(),
&BASE64_STANDARD
.decode(case.signature.as_ref().unwrap())
.unwrap(),
)
.unwrap();

Expand Down
Loading