Skip to content

Commit

Permalink
chore: update a few dependencies (thiserror, subtle, base64*) (#77)
Browse files Browse the repository at this point in the history
* chore: remove some dead code

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

Unfortunately we can't yet update the sha2 or hkdf until
zkcrypto/bls12_381#139 is resolved.
  • Loading branch information
Stebalien authored Nov 22, 2024
1 parent 70bf663 commit 19af810
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
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
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

0 comments on commit 19af810

Please sign in to comment.