Skip to content

Commit de4f687

Browse files
committed
Add temporary extra error debugging for retrieving old Kyber prekeys.
1 parent b3afcde commit de4f687

1 file changed

Lines changed: 18 additions & 6 deletions

File tree

crates/presage-store-bitpart/src/protocol.rs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -449,14 +449,26 @@ impl<T: BitpartTrees> KyberPreKeyStore for BitpartProtocolStore<T> {
449449
Ok(entry.record.0)
450450
} else {
451451
// Stored in the old format
452-
let buf: Vec<u8> = self
452+
match self
453453
.store
454-
.get(T::kyber_pre_keys(), kyber_prekey_id.store_key())
454+
.get::<[u8; 4], Vec<u8>>(T::kyber_pre_keys(), kyber_prekey_id.store_key())
455455
.await
456-
.ok()
457-
.flatten()
458-
.ok_or(SignalProtocolError::InvalidKyberPreKeyId)?;
459-
KyberPreKeyRecord::deserialize(&buf)
456+
{
457+
Ok(Some(buf)) => KyberPreKeyRecord::deserialize(&buf),
458+
Err(err) => {
459+
error!("Error deserializing old format kyber prekey: {:?}", err);
460+
Err(SignalProtocolError::InvalidKyberPreKeyId)
461+
}
462+
_ => Err(SignalProtocolError::InvalidKyberPreKeyId),
463+
}
464+
// let buf: Vec<u8> = self
465+
// .store
466+
// .get(T::kyber_pre_keys(), kyber_prekey_id.store_key())
467+
// .await
468+
// .ok()
469+
// .flatten()
470+
// .ok_or(SignalProtocolError::InvalidKyberPreKeyId)?;
471+
// KyberPreKeyRecord::deserialize(&buf)
460472
}
461473
}
462474

0 commit comments

Comments
 (0)