Skip to content
This repository was archived by the owner on Aug 5, 2021. It is now read-only.

fillMessageKeys: allow for SessionCipher creator to specify limit #29

Merged
merged 1 commit into from
Aug 4, 2017
Merged

fillMessageKeys: allow for SessionCipher creator to specify limit #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions dist/libsignal-protocol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36032,7 +36032,14 @@ libsignal.SessionBuilder = function (storage, remoteAddress) {
this.processV3 = builder.processV3.bind(builder);
};

function SessionCipher(storage, remoteAddress) {
function SessionCipher(storage, remoteAddress, options) {
options = options || {};

if (typeof options.messageKeysLimit === 'undefined') {
options.messageKeysLimit = 1000;
}

this.messageKeysLimit = options.messageKeysLimit;
this.remoteAddress = remoteAddress;
this.storage = storage;
}
Expand Down Expand Up @@ -36305,7 +36312,7 @@ SessionCipher.prototype = {
});
},
fillMessageKeys: function(chain, counter) {
if (Object.keys(chain.messageKeys).length >= 1000) {
if (this.messageKeysLimit && Object.keys(chain.messageKeys).length >= this.messageKeysLimit) {
console.log("Too many message keys for chain");
return Promise.resolve(); // Stalker, much?
}
Expand Down Expand Up @@ -36428,8 +36435,8 @@ SessionCipher.prototype = {
}
};

libsignal.SessionCipher = function(storage, remoteAddress) {
var cipher = new SessionCipher(storage, remoteAddress);
libsignal.SessionCipher = function(storage, remoteAddress, options) {
var cipher = new SessionCipher(storage, remoteAddress, options);

// returns a Promise that resolves to a ciphertext object
this.encrypt = cipher.encrypt.bind(cipher);
Expand Down
15 changes: 11 additions & 4 deletions src/SessionCipher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
function SessionCipher(storage, remoteAddress) {
function SessionCipher(storage, remoteAddress, options) {
options = options || {};

if (typeof options.messageKeysLimit === 'undefined') {
options.messageKeysLimit = 1000;
}

this.messageKeysLimit = options.messageKeysLimit;
this.remoteAddress = remoteAddress;
this.storage = storage;
}
Expand Down Expand Up @@ -271,7 +278,7 @@ SessionCipher.prototype = {
});
},
fillMessageKeys: function(chain, counter) {
if (Object.keys(chain.messageKeys).length >= 1000) {
if (this.messageKeysLimit && Object.keys(chain.messageKeys).length >= this.messageKeysLimit) {
console.log("Too many message keys for chain");
return Promise.resolve(); // Stalker, much?
}
Expand Down Expand Up @@ -394,8 +401,8 @@ SessionCipher.prototype = {
}
};

libsignal.SessionCipher = function(storage, remoteAddress) {
var cipher = new SessionCipher(storage, remoteAddress);
libsignal.SessionCipher = function(storage, remoteAddress, options) {
var cipher = new SessionCipher(storage, remoteAddress, options);

// returns a Promise that resolves to a ciphertext object
this.encrypt = cipher.encrypt.bind(cipher);
Expand Down