Skip to content

Commit eb930a8

Browse files
committed
fix: removed the nowMs for most of the decrypt functions
1 parent 5172855 commit eb930a8

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

src/encrypt_decrypt/encrypt_decrypt.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,6 @@ Napi::Value MultiEncryptWrapper::decryptFor1o1(const Napi::CallbackInfo& info) {
678678
// "messageHash": string,
679679
// }],
680680
// second: {
681-
// "nowMs": number,
682681
// "proBackendPubkeyHex": Hexstring,
683682
// "ed25519PrivateKeyHex": Hexstring,
684683
// }
@@ -698,7 +697,6 @@ Napi::Value MultiEncryptWrapper::decryptFor1o1(const Napi::CallbackInfo& info) {
698697
if (second.IsEmpty())
699698
throw std::invalid_argument("decryptFor1o1 second received empty");
700699

701-
auto nowMs = extractNowSysMs(second, "decryptFor1o1.second.nowMs");
702700
auto proBackendPubkeyHex =
703701
extractProBackendPubkeyHex(second, "decryptFor1o1.second.proBackendPubkeyHex");
704702

@@ -728,7 +726,7 @@ Napi::Value MultiEncryptWrapper::decryptFor1o1(const Napi::CallbackInfo& info) {
728726
auto envelopePayload =
729727
extractEnvelopePayload(obj, "decryptFor1o1.obj.envelopePayload");
730728
decrypted.push_back(session::decode_envelope(
731-
keys, envelopePayload, nowMs, proBackendPubkeyHex));
729+
keys, envelopePayload, proBackendPubkeyHex));
732730
decryptedMessageHashes.push_back(messageHash);
733731
} catch (const std::exception& e) {
734732
log::warning(
@@ -764,7 +762,6 @@ Napi::Value MultiEncryptWrapper::decryptForGroup(const Napi::CallbackInfo& info)
764762
// "messageHash": string,
765763
// }],
766764
// second: {
767-
// "nowMs": number,
768765
// "proBackendPubkeyHex": Hexstring,
769766
// "ed25519GroupPubkeyHex": Hexstring,
770767
// "groupEncKeys": Array<Uint8Array>,
@@ -785,7 +782,6 @@ Napi::Value MultiEncryptWrapper::decryptForGroup(const Napi::CallbackInfo& info)
785782
if (second.IsEmpty())
786783
throw std::invalid_argument("decryptForGroup second received empty");
787784

788-
auto nowMs = extractNowSysMs(second, "decryptForGroup.second.nowMs");
789785
auto proBackendPubkeyHex =
790786
extractProBackendPubkeyHex(second, "decryptForGroup.second.proBackendPubkeyHex");
791787

@@ -831,7 +827,7 @@ Napi::Value MultiEncryptWrapper::decryptForGroup(const Napi::CallbackInfo& info)
831827
auto envelopePayload =
832828
extractEnvelopePayload(obj, "decryptForGroup.obj.envelopePayload");
833829
decrypted.push_back(session::decode_envelope(
834-
keys, envelopePayload, nowMs, proBackendPubkeyHex));
830+
keys, envelopePayload, proBackendPubkeyHex));
835831
decryptedMessageHashes.push_back(messageHash);
836832
} catch (const std::exception& e) {
837833
log::warning(

types/multi_encrypt/multi_encrypt.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@ declare module 'libsession_util_nodejs' {
173173

174174
decryptFor1o1: (
175175
first: Array<WithEnvelopePayload & WithMessageHash>,
176-
second: WithNowMs & WithProBackendPubkey & WithEd25519PrivateKeyHex
176+
second: WithProBackendPubkey & WithEd25519PrivateKeyHex
177177
) => Array<WithDecodedEnvelope & WithMessageHash>;
178178

179179
decryptForGroup: (
180180
first: Array<WithEnvelopePayload & WithMessageHash>,
181-
second: WithNowMs & WithProBackendPubkey & WithEd25519GroupPubkeyHex & WithGroupEncryptionKeys
181+
second: WithProBackendPubkey & WithEd25519GroupPubkeyHex & WithGroupEncryptionKeys
182182
) => Array<WithDecodedEnvelope & WithMessageHash>;
183183
};
184184

0 commit comments

Comments
 (0)