crypto: replace aranya-buggy with buggy (#28)

Fixes #27

Signed-off-by: Eric Lagergren <[email protected]>

crates/crypto/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "spideroak-crypto"
 description = "SpiderOak's cryptography library"
-version = "0.1.0"
+version = "0.2.0"
 authors.workspace = true
 edition.workspace = true
 license = "BSD-3-Clause"
@@ -23,7 +23,7 @@ default = [
 # Enable allocations.
 alloc = [
 	"aes-gcm/alloc",
-	"aranya-buggy/alloc",
+	"buggy/alloc",
 	"der/alloc",
 	"ecdsa/alloc",
 	"postcard/alloc",
@@ -98,7 +98,7 @@ std = [
 	"dep:rand",
 
 	"aes-gcm/std",
-	"aranya-buggy/std",
+	"buggy/std",
 	"crypto-common/std",
 	"der/std",
 	"der/std",
@@ -141,10 +141,10 @@ trng = [
 ]
 
 [dependencies]
-aranya-buggy = { version = "0.1.0", default-features = false }
 spideroak-crypto-derive = { version = "0.1.0", path = "../crypto-derive" }
 
 aranya-bearssl-sys = { version = "0.1.0", optional = true }
+buggy = { version = "0.1.0", default-features = false }
 
 aes = { version = "0.8", default-features = false, features = ["zeroize"], optional = true }
 aes-gcm = { version = "0.10", default-features = false, features = ["aes"] }

crates/crypto/src/aead.rs

@@ -12,7 +12,7 @@ use core::{
     result::Result,
 };
 
-use aranya_buggy::{Bug, BugExt};
+use buggy::{Bug, BugExt};
 use generic_array::{ArrayLength, GenericArray, IntoArrayLength};
 use serde::{Deserialize, Serialize};
 use subtle::{Choice, ConstantTimeEq};
@@ -834,7 +834,7 @@ pub trait Cmt4Aead: Cmt3Aead {}
 mod committing {
     use core::{fmt, marker::PhantomData, num::NonZeroU64, result::Result};
 
-    use aranya_buggy::{Bug, BugExt};
+    use buggy::{Bug, BugExt};
     use generic_array::{ArrayLength, GenericArray};
     use typenum::{
         type_operators::{IsGreaterOrEqual, IsLess},
@@ -1109,7 +1109,7 @@ mod committing {
                         additional_data,
                     )?;
 
-                    let (dst, cx) = $crate::aranya_buggy::BugExt::assume(
+                    let (dst, cx) = $crate::buggy::BugExt::assume(
                         dst.split_last_chunk_mut::<{Self::COMMITMENT_SIZE}>(),
                         "`COMMITMENT_SIZE` fits in `out`",
                     )?;
@@ -1142,7 +1142,7 @@ mod committing {
                         additional_data,
                     )?;
 
-                    let (tag, cx) = $crate::aranya_buggy::BugExt::assume(
+                    let (tag, cx) = $crate::buggy::BugExt::assume(
                         overhead.split_last_chunk_mut::<{Self::COMMITMENT_SIZE}>(),
                         "`COMMITMENT_SIZE` fits in `overhead`",
                     )?;
@@ -1175,7 +1175,7 @@ mod committing {
                         additional_data,
                     )?;
 
-                    let (ciphertext, got_cx) = $crate::aranya_buggy::BugExt::assume(
+                    let (ciphertext, got_cx) = $crate::buggy::BugExt::assume(
                         ciphertext.split_last_chunk::<{Self::COMMITMENT_SIZE}>(),
                         "`COMMITMENT_SIZE` fits in `ciphertext`",
                     )?;
@@ -1214,7 +1214,7 @@ mod committing {
                         additional_data,
                     )?;
 
-                    let (overhead, got_cx) = $crate::aranya_buggy::BugExt::assume(
+                    let (overhead, got_cx) = $crate::buggy::BugExt::assume(
                         overhead.split_last_chunk::<{Self::COMMITMENT_SIZE}>(),
                         "`COMMITMENT_SIZE` fits in `overhead`",
                     )?;

crates/crypto/src/asn1.rs

@@ -10,7 +10,7 @@ use core::{
     result::Result,
 };
 
-use aranya_buggy::{Bug, BugExt};
+use buggy::{Bug, BugExt};
 use der::{asn1::UintRef, Decode, Encode, Header, Reader, SliceReader, SliceWriter, Tag};
 
 use crate::{

crates/crypto/src/hex.rs

@@ -8,7 +8,7 @@ use core::{
     str,
 };
 
-use aranya_buggy::Bug;
+use buggy::Bug;
 use generic_array::{functional::FunctionalSequence, ArrayLength, GenericArray};
 use subtle::{Choice, ConditionallySelectable};
 use typenum::{

crates/crypto/src/hkdf.rs

@@ -6,7 +6,7 @@
 
 use core::marker::PhantomData;
 
-use aranya_buggy::BugExt;
+use buggy::BugExt;
 use generic_array::GenericArray;
 use typenum::{Prod, U255};
 

crates/crypto/src/hpke.rs

@@ -22,7 +22,7 @@ use core::{
     result::Result,
 };
 
-use aranya_buggy::{bug, Bug, BugExt};
+use buggy::{bug, Bug, BugExt};
 use generic_array::ArrayLength;
 use subtle::{Choice, ConstantTimeEq};
 

crates/crypto/src/import.rs

@@ -6,7 +6,7 @@ use core::{
     result::Result,
 };
 
-use aranya_buggy::Bug;
+use buggy::Bug;
 use generic_array::{ArrayLength, GenericArray};
 
 use crate::signer::PkError;

crates/crypto/src/kdf.rs

@@ -4,7 +4,7 @@
 
 use core::{fmt, iter::IntoIterator, mem, result::Result};
 
-use aranya_buggy::Bug;
+use buggy::Bug;
 use generic_array::{ArrayLength, ConstArrayLength, GenericArray, IntoArrayLength};
 use subtle::{Choice, ConstantTimeEq};
 use typenum::{

crates/crypto/src/lib.rs

@@ -37,7 +37,7 @@ pub mod test_util;
 mod util;
 pub mod zeroize;
 
-pub use aranya_buggy;
+pub use buggy;
 pub use generic_array;
 pub use subtle;
 pub use typenum;

crates/crypto/src/signer.rs

@@ -9,7 +9,7 @@ use core::{
     result::Result,
 };
 
-use aranya_buggy::Bug;
+use buggy::Bug;
 
 use crate::{
     asn1::EncodingError,

deny.toml

@@ -113,7 +113,6 @@ confidence-threshold = 0.8
 # Allow 1 or more licenses on a per-crate basis, so that particular licenses
 # aren't accepted for every possible crate as with the normal allow list
 exceptions = [
-    { allow = ["AGPL-3.0"], crate = "aranya-buggy" },
 ]
 
 # Some crates don't have (easily) machine readable licensing information,

supply-chain/audits.toml

@@ -20,7 +20,7 @@ user-id = 293722 # aranya-project-bot
 start = "2024-10-15"
 end = "2026-01-23"
 
-[[trusted.aranya-buggy]]
+[[trusted.buggy]]
 criteria = ["safe-to-deploy", "does-not-implement-crypto"]
 user-id = 293722 # aranya-project-bot
 start = "2024-10-16"

supply-chain/imports.lock

@@ -7,9 +7,9 @@ when = "2024-10-15"
 user-id = 293722
 user-login = "aranya-project-bot"
 
-[[publisher.aranya-buggy]]
+[[publisher.buggy]]
 version = "0.1.0"
-when = "2024-10-16"
+when = "2025-01-24"
 user-id = 293722
 user-login = "aranya-project-bot"