Skip to content

Commit

Permalink
fix serialization
Browse files Browse the repository at this point in the history 
Signed-off-by: Dave Huseby <dwh@linuxprogrammer.org>
  • Loading branch information
@dhuseby
dhuseby committed May 11, 2024
1 parent f73dfef commit 19238d9
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 64 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "multikey"
version = "1.0.4"
version = "1.0.5"
edition = "2021"
authors = ["Dave Grantham <dwg@linuxprogrammer.org>"]
description = "Multikey self-describing cryptographic key data"
Expand Down
5 changes: 3 additions & 2 deletions src/mk.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1178,8 +1178,9 @@ mod tests {

let signmk = shares[0].sign_view().unwrap();
let signature = signmk.sign(msg.as_slice(), false, Some(2_u8)).unwrap();
let s: Vec<u8> = signature.into();
println!("{}", hex::encode(&s));
let ms: EncodedMultisig = BaseEncoded::new(Base::Base32Z, signature);
let s = ms.to_string();
println!("Bls Sig Share: {}", s);

let mut builder = Builder::new(Codec::Bls12381G1Priv).with_comment("test key");
for share in &shares {
Expand Down
12 changes: 3 additions & 9 deletions src/serde/de.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
};
use core::fmt;
use multicodec::Codec;
use multiutil::{EncodedVarbytes, Varbytes};
use multiutil::EncodedVarbytes;
use serde::{
de::{Error, MapAccess, Visitor},
Deserialize, Deserializer,
Expand Down Expand Up @@ -59,14 +59,8 @@ impl<'de> Deserialize<'de> for Nonce {
if deserializer.is_human_readable() {
deserializer.deserialize_struct(nonce::SIGIL.as_str(), FIELDS, NonceVisitor)
} else {
let (sigil, nonce): (Codec, Varbytes) = Deserialize::deserialize(deserializer)?;

if sigil != nonce::SIGIL {
return Err(Error::custom("deserialized sigil is not a Nonce sigil"));
}
let nonce = nonce.to_inner();

Ok(Self { nonce })
let b: &'de [u8] = Deserialize::deserialize(deserializer)?;
Ok(Self::try_from(b).map_err(|e| Error::custom(e.to_string()))?)
}
}
}
Expand Down
98 changes: 47 additions & 51 deletions src/serde/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ mod tests {

assert_tokens(
&pk.readable(),
&[Token::BorrowedStr(
&[Token::Str(
"zVCYiTqf3RfiqqE4RxExy5XEvCWJKnHH4P67PLC1VuAuA1N8X1qQhM3Y3Bp1xmTQ5",
)],
);
Expand Down Expand Up @@ -137,15 +137,15 @@ mod tests {
name: "multikey",
len: 3,
},
Token::BorrowedStr("codec"),
Token::BorrowedStr("ed25519-pub"),
Token::BorrowedStr("comment"),
Token::BorrowedStr("test key"),
Token::BorrowedStr("attributes"),
Token::Str("codec"),
Token::Str("ed25519-pub"),
Token::Str("comment"),
Token::Str("test key"),
Token::Str("attributes"),
Token::Seq { len: Some(1) },
Token::Tuple { len: 2 },
Token::BorrowedStr("key-data"), // AttrId::KeyData
Token::BorrowedStr(
Token::Str("key-data"), // AttrId::KeyData
Token::Str(
"f2013e1e6e8c353672b759c93c397956927e1503c6edd73f240ccff2b7dd04558b6",
),
Token::TupleEnd,
Expand Down Expand Up @@ -305,43 +305,43 @@ mod tests {
name: "multikey",
len: 3,
},
Token::BorrowedStr("codec"),
Token::BorrowedStr("ed25519-priv"),
Token::BorrowedStr("comment"),
Token::BorrowedStr("test key"),
Token::BorrowedStr("attributes"),
Token::Str("codec"),
Token::Str("ed25519-priv"),
Token::Str("comment"),
Token::Str("test key"),
Token::Str("attributes"),
Token::Seq { len: Some(8) },
Token::Tuple { len: 2 },
Token::BorrowedStr("key-is-encrypted"),
Token::BorrowedStr("f0101"),
Token::Str("key-is-encrypted"),
Token::Str("f0101"),
Token::TupleEnd,
Token::Tuple { len: 2 },
Token::BorrowedStr("key-data"),
Token::BorrowedStr("f30b7a928df6568bf6cbecc2e1e9afeb835be69083e3fe25f5738ad16575435b4ab6a679e08696b1fc4637fbbad85d0529a"),
Token::Str("key-data"),
Token::Str("f30b7a928df6568bf6cbecc2e1e9afeb835be69083e3fe25f5738ad16575435b4ab6a679e08696b1fc4637fbbad85d0529a"),
Token::TupleEnd,
Token::Tuple { len: 2 },
Token::BorrowedStr("cipher-codec"),
Token::BorrowedStr("f02a501"),
Token::Str("cipher-codec"),
Token::Str("f02a501"),
Token::TupleEnd,
Token::Tuple { len: 2 },
Token::BorrowedStr("cipher-key-len"),
Token::BorrowedStr("f0120"),
Token::Str("cipher-key-len"),
Token::Str("f0120"),
Token::TupleEnd,
Token::Tuple { len: 2 },
Token::BorrowedStr("cipher-nonce"),
Token::BorrowedStr("f08714e5abf0f7beae8"),
Token::Str("cipher-nonce"),
Token::Str("f08714e5abf0f7beae8"),
Token::TupleEnd,
Token::Tuple { len: 2 },
Token::BorrowedStr("kdf-codec"),
Token::BorrowedStr("f038da003"),
Token::Str("kdf-codec"),
Token::Str("f038da003"),
Token::TupleEnd,
Token::Tuple { len: 2 },
Token::BorrowedStr("kdf-salt"),
Token::BorrowedStr("f20621f20cfda140bd8bf83a899167428462929a41e9b68a8467bfc2455e9f98406"),
Token::Str("kdf-salt"),
Token::Str("f20621f20cfda140bd8bf83a899167428462929a41e9b68a8467bfc2455e9f98406"),
Token::TupleEnd,
Token::Tuple { len: 2 },
Token::BorrowedStr("kdf-rounds"),
Token::BorrowedStr("f010a"),
Token::Str("kdf-rounds"),
Token::Str("f010a"),
Token::TupleEnd,
Token::SeqEnd,
Token::StructEnd,
Expand Down Expand Up @@ -501,14 +501,13 @@ mod tests {
assert_tokens(
&n.compact(),
&[
Token::Tuple { len: 2 },
Token::BorrowedBytes(&[0x3b]), // Nonce sigil as varuint
Token::BorrowedBytes(&[
// Nonce data as varbytes
32, 118, 137, 82, 114, 197, 206, 92, 12, 114, 181, 236, 84, 148, 78, 173, 115,
148, 130, 248, 112, 72, 219, 191, 193, 59, 135, 48, 8, 179, 29, 89, 149,
59, 32, 118, 137, 82, 114, 197, 206,
92, 12, 114, 181, 236, 84, 148, 78,
173, 115, 148, 130, 248, 112, 72, 219,
191, 193, 59, 135, 48, 8, 179, 29,
89, 149
]),
Token::TupleEnd,
],
);
}
Expand All @@ -523,7 +522,7 @@ mod tests {

assert_tokens(
&n.readable(),
&[Token::BorrowedStr(
&[Token::Str(
"f3b2076895272c5ce5c0c72b5ec54944ead739482f87048dbbfc13b873008b31d5995",
)],
);
Expand All @@ -542,8 +541,8 @@ mod tests {
name: "nonce",
len: 1,
},
Token::BorrowedStr("nonce"),
Token::BorrowedStr(
Token::Str("nonce"),
Token::Str(
"f2076895272c5ce5c0c72b5ec54944ead739482f87048dbbfc13b873008b31d5995",
),
Token::StructEnd,
Expand All @@ -569,11 +568,11 @@ mod tests {
&mk.readable(),
&[
Token::Struct { name: "multikey", len: 3, },
Token::BorrowedStr("codec"),
Token::BorrowedStr("identity"),
Token::BorrowedStr("comment"),
Token::BorrowedStr(""),
Token::BorrowedStr("attributes"),
Token::Str("codec"),
Token::Str("identity"),
Token::Str("comment"),
Token::Str(""),
Token::Str("attributes"),
Token::Seq { len: Some(0), },
Token::SeqEnd,
Token::StructEnd,
Expand All @@ -587,7 +586,7 @@ mod tests {
assert_tokens(
&mk.readable(),
&[
Token::BorrowedStr("f3a000000"),
Token::Str("f3a000000"),
]
);
}
Expand All @@ -598,10 +597,7 @@ mod tests {
assert_tokens(
&n.compact(),
&[
Token::Tuple { len: 2 },
Token::BorrowedBytes(&[0x3b]),
Token::BorrowedBytes(&[0x0]),
Token::TupleEnd,
Token::BorrowedBytes(&[59, 0]),
]
);
}
Expand All @@ -613,8 +609,8 @@ mod tests {
&n.readable(),
&[
Token::Struct { name: "nonce", len: 1, },
Token::BorrowedStr("nonce"),
Token::BorrowedStr("f00"),
Token::Str("nonce"),
Token::Str("f00"),
Token::StructEnd,
]
);
Expand All @@ -626,7 +622,7 @@ mod tests {
assert_tokens(
&n.readable(),
&[
Token::BorrowedStr("f3b00"),
Token::Str("f3b00"),
]
);
}
Expand Down
3 changes: 2 additions & 1 deletion src/serde/ser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ impl ser::Serialize for Nonce {
)?;
ss.end()
} else {
(nonce::SIGIL, Varbytes(self.nonce.clone())).serialize(serializer)
let v: Vec<u8> = self.clone().into();
serializer.serialize_bytes(v.as_slice())
}
}
}
Expand Down

0 comments on commit 19238d9

Please sign in to comment.