summaryrefslogtreecommitdiffstats
path: root/adenosine-pds/src
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2022-11-06 22:00:30 -0800
committerBryan Newbold <bnewbold@robocracy.org>2022-11-06 22:00:34 -0800
commit0699c3b08fe1e908966b4a3fa1e2c83aecc54576 (patch)
tree8f054a9363db3b5857dad4b197f9be6a2e49a5b9 /adenosine-pds/src
parent7f41d6e86b9def2f3b0e55f669b1e30663bbd320 (diff)
downloadadenosine-0699c3b08fe1e908966b4a3fa1e2c83aecc54576.tar.gz
adenosine-0699c3b08fe1e908966b4a3fa1e2c83aecc54576.zip
crypto: fix 'multibase' pubkey serialization for DID documents
See: https://medium.com/asecuritysite-when-bob-met-alice/02-03-or-04-so-what-are-compressed-and-uncompressed-public-keys-6abcb57efeb6 Thanks to folks in bluesky matrix dev channel for the tip.
Diffstat (limited to 'adenosine-pds/src')
-rw-r--r--adenosine-pds/src/crypto.rs27
1 files changed, 22 insertions, 5 deletions
diff --git a/adenosine-pds/src/crypto.rs b/adenosine-pds/src/crypto.rs
index ba69dc6..07119b1 100644
--- a/adenosine-pds/src/crypto.rs
+++ b/adenosine-pds/src/crypto.rs
@@ -119,13 +119,16 @@ impl PubKey {
.to_string()
}
- /// This public verification key encoded as base58btc multibase string
+ /// This public verification key encoded as base58btc multibase string, not 'compressed', as
+ /// included in DID documents ('publicKeyMultibase').
+ ///
+ /// Note that the did:key serialization does 'compress' the key into a smaller size.
pub fn to_multibase(&self) -> String {
let mut bytes: Vec<u8> = vec![];
match self {
PubKey::P256(key) => {
bytes.extend_from_slice(&MULTICODE_P256_BYTES);
- bytes.extend_from_slice(&key.to_encoded_point(true).to_bytes());
+ bytes.extend_from_slice(&key.to_encoded_point(false).to_bytes());
}
PubKey::K256(key) => {
bytes.extend_from_slice(&MULTICODE_K256_BYTES);
@@ -135,8 +138,23 @@ impl PubKey {
format!("{}", multibase::encode(multibase::Base::Base58Btc, &bytes))
}
+ /// Serializes as a 'did:key' string.
pub fn to_did_key(&self) -> String {
- format!("did:key:{}", self.to_multibase())
+ let mut bytes: Vec<u8> = vec![];
+ match self {
+ PubKey::P256(key) => {
+ bytes.extend_from_slice(&MULTICODE_P256_BYTES);
+ bytes.extend_from_slice(&key.to_encoded_point(true).to_bytes());
+ }
+ PubKey::K256(key) => {
+ bytes.extend_from_slice(&MULTICODE_K256_BYTES);
+ bytes.extend_from_slice(&key.to_bytes());
+ }
+ }
+ format!(
+ "did:key:{}",
+ multibase::encode(multibase::Base::Base58Btc, &bytes)
+ )
}
pub fn from_did_key(did_key: &str) -> Result<Self> {
@@ -180,9 +198,8 @@ impl PubKey {
}
impl std::fmt::Display for PubKey {
- // TODO: what should this actually be, instead of multibase? the did:key representation?
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(f, "{}", self.to_multibase())
+ write!(f, "{}", self.to_did_key())
}
}