Page MenuHomePhabricator
Differential D10072

[lib] Re-introduce `MemberInfo` (`[Legacy/MinimallyEncoded]MemberInfo`)
ClosedPublic
Actions

Authored by atul on Nov 28 2023, 7:56 AM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 28 2025, 7:38 PM
Unknown Object (File)
Feb 27 2025, 7:23 PM
Unknown Object (File)
Feb 27 2025, 7:14 PM
Unknown Object (File)
Feb 27 2025, 7:14 PM
Unknown Object (File)
Feb 26 2025, 8:19 AM
Unknown Object (File)
Feb 25 2025, 7:26 PM
Unknown Object (File)
Feb 16 2025, 5:51 PM
Unknown Object (File)
Feb 1 2025, 5:36 PM
View All 68 Files
Subscribers
ashoat
tomek

Details

Reviewers
ashoat
ginsu
tomek
rohan
Commits
rCOMM7509bb4723cd: [lib] Re-introduce `MemberInfo` (`[Legacy/MinimallyEncoded]MemberInfo`)
Summary

Replace usages of LegacyMemberInfo | MinimallyEncodedMemberInfo w/ re-introduced MemberInfo. Similar to D100068 but for MemberInfo.

Depends on D10071

Test Plan

flow/CI/etc

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

atul created this revision.Nov 28 2023, 7:56 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptNov 28 2023, 7:56 AM
atul published this revision for review.Nov 28 2023, 7:56 AM
atul added reviewers: ashoat, ginsu, tomek, rohan.
atul added a child revision: D10073: [lib] `RelativeMemberInfo` -> `LegacyRelativeMemberInfo`.Nov 28 2023, 9:00 AM
Harbormaster completed remote builds in B24573: Diff 33949.Nov 28 2023, 9:08 AM
atul mentioned this in D10074: [lib] Re-introduce `RelativeMemberInfo` (`[Legacy/MinimallyEncoded]RelativeMemberInfo`).Nov 28 2023, 9:48 AM
ashoat accepted this revision.Nov 28 2023, 12:56 PM
This revision is now accepted and ready to land.Nov 28 2023, 12:56 PM
atul mentioned this in D10078: [lib] Reintroduce `RawThreadInfo` (`[Legacy/MinimallyEncoded]RawThreadInfo`).Nov 28 2023, 1:36 PM
Closed by commit rCOMM7509bb4723cd: [lib] Re-introduce `MemberInfo` (`[Legacy/MinimallyEncoded]MemberInfo`) (authored by atul). · Explain WhyNov 29 2023, 3:20 PM
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMM7509bb4723cd: [lib] Re-introduce `MemberInfo` (`[Legacy/MinimallyEncoded]MemberInfo`).
atul mentioned this in rCOMM585efacdc7a5: [lib] Re-introduce `RelativeMemberInfo` (`….
atul mentioned this in rCOMMbfd6ef196960: [lib] Reintroduce `RawThreadInfo` (`[Legacy/MinimallyEncoded]RawThreadInfo`).

Revision Contents
Changeset List

PathSize
lib/
shared/
20 lines
types/
3 lines

Diff 34007

View Options

lib/shared/thread-utils.js

Show First 20 Lines • Show All 148 Lines • ▼ Show 20 Lines size_t decryptedSize = ::olm_decrypt(
decryptedMessage.data(), decryptedMessage.data(),
decryptedMessage.size()); decryptedMessage.size());
if (decryptedSize == -1) { if (decryptedSize == -1) {
throw std::runtime_error{ throw std::runtime_error{
"error decrypt => " + std::string{::olm_session_last_error(session)} + "error decrypt => " + std::string{::olm_session_last_error(session)} +
". Hash: " + ". Hash: " +
std::string{messageHashBuffer.begin(), messageHashBuffer.end()}}; std::string{messageHashBuffer.begin(), messageHashBuffer.end()}};
} }
return std::string{(char *)decryptedMessage.data(), decryptedSize}; return std::string{decryptedMessage.begin(), decryptedMessage.end()};
} }
std::string Session::decryptSequential(EncryptedData &encryptedData) { std::string Session::decryptSequential(EncryptedData &encryptedData) {
OlmSession *session = this->getOlmSession(); OlmSession *session = this->getOlmSession();
OlmBuffer utilityBuffer(::olm_utility_size()); OlmBuffer utilityBuffer(::olm_utility_size());
OlmUtility *olmUtility = ::olm_utility(utilityBuffer.data()); OlmUtility *olmUtility = ::olm_utility(utilityBuffer.data());
Show All 28 Lines size_t decryptedSize = ::olm_decrypt_sequential(
decryptedMessage.data(), decryptedMessage.data(),
decryptedMessage.size()); decryptedMessage.size());
if (decryptedSize == -1) { if (decryptedSize == -1) {
throw std::runtime_error{ throw std::runtime_error{
"error decrypt_sequential => " + "error decrypt_sequential => " +
std::string{::olm_session_last_error(session)} + ". Hash: " + std::string{::olm_session_last_error(session)} + ". Hash: " +
std::string{messageHashBuffer.begin(), messageHashBuffer.end()}}; std::string{messageHashBuffer.begin(), messageHashBuffer.end()}};
} }
return std::string{(char *)decryptedMessage.data(), decryptedSize}; return std::string{decryptedMessage.begin(), decryptedMessage.end()};
} }
int Session::getVersion() { int Session::getVersion() {
return this->version; return this->version;
} }
void Session::setVersion(int newVersion) { void Session::setVersion(int newVersion) {
this->version = newVersion; this->version = newVersion;
} }
} // namespace crypto } // namespace crypto
} // namespace comm } // namespace comm
View Options

lib/types/thread-types.js

Show First 20 Lines • Show All 148 Lines • ▼ Show 20 Lines size_t decryptedSize = ::olm_decrypt(
decryptedMessage.data(), decryptedMessage.data(),
decryptedMessage.size()); decryptedMessage.size());
if (decryptedSize == -1) { if (decryptedSize == -1) {
throw std::runtime_error{ throw std::runtime_error{
"error decrypt => " + std::string{::olm_session_last_error(session)} + "error decrypt => " + std::string{::olm_session_last_error(session)} +
". Hash: " + ". Hash: " +
std::string{messageHashBuffer.begin(), messageHashBuffer.end()}}; std::string{messageHashBuffer.begin(), messageHashBuffer.end()}};
} }
return std::string{(char *)decryptedMessage.data(), decryptedSize}; return std::string{decryptedMessage.begin(), decryptedMessage.end()};
} }
std::string Session::decryptSequential(EncryptedData &encryptedData) { std::string Session::decryptSequential(EncryptedData &encryptedData) {
OlmSession *session = this->getOlmSession(); OlmSession *session = this->getOlmSession();
OlmBuffer utilityBuffer(::olm_utility_size()); OlmBuffer utilityBuffer(::olm_utility_size());
OlmUtility *olmUtility = ::olm_utility(utilityBuffer.data()); OlmUtility *olmUtility = ::olm_utility(utilityBuffer.data());
Show All 28 Lines size_t decryptedSize = ::olm_decrypt_sequential(
decryptedMessage.data(), decryptedMessage.data(),
decryptedMessage.size()); decryptedMessage.size());
if (decryptedSize == -1) { if (decryptedSize == -1) {
throw std::runtime_error{ throw std::runtime_error{
"error decrypt_sequential => " + "error decrypt_sequential => " +
std::string{::olm_session_last_error(session)} + ". Hash: " + std::string{::olm_session_last_error(session)} + ". Hash: " +
std::string{messageHashBuffer.begin(), messageHashBuffer.end()}}; std::string{messageHashBuffer.begin(), messageHashBuffer.end()}};
} }
return std::string{(char *)decryptedMessage.data(), decryptedSize}; return std::string{decryptedMessage.begin(), decryptedMessage.end()};
} }
int Session::getVersion() { int Session::getVersion() {
return this->version; return this->version;
} }
void Session::setVersion(int newVersion) { void Session::setVersion(int newVersion) {
this->version = newVersion; this->version = newVersion;
} }
} // namespace crypto } // namespace crypto
} // namespace comm } // namespace comm