Comparing version 3.0.22 to 3.0.23
@@ -0,1 +1,6 @@ | ||
## 3.0.23 (2015-08-27) | ||
Bugfix: | ||
- Fix more issues in cloning, and also bugs in scrubbing derived keys | ||
## 3.0.22 (2015-08-27) | ||
@@ -2,0 +7,0 @@ |
@@ -48,3 +48,4 @@ // Generated by IcedCoffeeScript 1.8.0-d | ||
}, | ||
hmac_key_size: 768 / 8 | ||
hmac_key_size: 768 / 8, | ||
version: 1 | ||
}, | ||
@@ -65,3 +66,4 @@ "2": { | ||
}, | ||
hmac_key_size: 768 / 8 | ||
hmac_key_size: 768 / 8, | ||
version: 2 | ||
}, | ||
@@ -82,3 +84,4 @@ "3": { | ||
}, | ||
hmac_key_size: 768 / 8 | ||
hmac_key_size: 768 / 8, | ||
version: 3 | ||
} | ||
@@ -114,3 +117,3 @@ }; | ||
_this._check_scrubbed(_this.key, "in KDF", cb, __iced_deferrals.defer({ | ||
lineno: 94 | ||
lineno: 97 | ||
})); | ||
@@ -130,3 +133,3 @@ __iced_deferrals._fulfill(); | ||
_this._check_scrubbed(key, "KDF", cb, __iced_deferrals.defer({ | ||
lineno: 102 | ||
lineno: 105 | ||
})); | ||
@@ -168,3 +171,3 @@ __iced_deferrals._fulfill(); | ||
})(), | ||
lineno: 121 | ||
lineno: 124 | ||
})); | ||
@@ -232,3 +235,3 @@ __iced_deferrals._fulfill(); | ||
_this._check_scrubbed(key, "HMAC", cb, __iced_deferrals.defer({ | ||
lineno: 179 | ||
lineno: 182 | ||
})); | ||
@@ -256,3 +259,3 @@ __iced_deferrals._fulfill(); | ||
})(), | ||
lineno: 181 | ||
lineno: 184 | ||
})); | ||
@@ -281,3 +284,3 @@ __iced_deferrals._fulfill(); | ||
_this._check_scrubbed(key, "Salsa20", cb, __iced_deferrals.defer({ | ||
lineno: 197 | ||
lineno: 200 | ||
})); | ||
@@ -310,3 +313,3 @@ __iced_deferrals._fulfill(); | ||
})(), | ||
lineno: 209 | ||
lineno: 212 | ||
})); | ||
@@ -341,3 +344,3 @@ __iced_deferrals._fulfill(); | ||
_this._check_scrubbed(key, "TwoFish", cb, __iced_deferrals.defer({ | ||
lineno: 232 | ||
lineno: 235 | ||
})); | ||
@@ -367,3 +370,3 @@ __iced_deferrals._fulfill(); | ||
})(), | ||
lineno: 234 | ||
lineno: 237 | ||
})); | ||
@@ -392,3 +395,3 @@ __iced_deferrals._fulfill(); | ||
_this._check_scrubbed(key, "AES", cb, __iced_deferrals.defer({ | ||
lineno: 249 | ||
lineno: 252 | ||
})); | ||
@@ -418,3 +421,3 @@ __iced_deferrals._fulfill(); | ||
})(), | ||
lineno: 251 | ||
lineno: 254 | ||
})); | ||
@@ -431,3 +434,3 @@ __iced_deferrals._fulfill(); | ||
Base.prototype.scrub = function() { | ||
var key, key_ring, salt, _i, _len, _ref1; | ||
var algo, key, key_ring, salt, _ref1; | ||
if (this.key != null) { | ||
@@ -440,5 +443,7 @@ this.key.scrub(); | ||
key_ring = _ref1[salt]; | ||
for (_i = 0, _len = key_ring.length; _i < _len; _i++) { | ||
key = key_ring[_i]; | ||
key.scrub(); | ||
for (algo in key_ring) { | ||
key = key_ring[algo]; | ||
if (algo !== 'extra') { | ||
key.scrub(); | ||
} | ||
} | ||
@@ -456,3 +461,3 @@ } | ||
Base.prototype.clone_derived_keys = function() { | ||
var key, key_ring, ret, salt, _ref1; | ||
var algo, key, key_ring, ret, salt, _ref1; | ||
ret = null; | ||
@@ -464,11 +469,7 @@ if (this.derived_keys != null) { | ||
key_ring = _ref1[salt]; | ||
ret[salt] = (function() { | ||
var _i, _len, _results; | ||
_results = []; | ||
for (_i = 0, _len = key_ring.length; _i < _len; _i++) { | ||
key = key_ring[_i]; | ||
_results.push(key.clone()); | ||
} | ||
return _results; | ||
})(); | ||
ret[salt] = {}; | ||
for (algo in key_ring) { | ||
key = key_ring[algo]; | ||
ret[salt][algo] = Buffer.isBuffer(key) ? util.copy_buffer(key) : key.clone(); | ||
} | ||
} | ||
@@ -553,3 +554,3 @@ } | ||
})(ivs, k), | ||
lineno: 365 | ||
lineno: 375 | ||
})); | ||
@@ -590,3 +591,3 @@ __iced_deferrals._fulfill(); | ||
})(_this), | ||
lineno: 381 | ||
lineno: 391 | ||
})); | ||
@@ -620,3 +621,3 @@ __iced_deferrals._fulfill(); | ||
})(_this), | ||
lineno: 387 | ||
lineno: 397 | ||
})); | ||
@@ -655,3 +656,3 @@ __iced_deferrals._fulfill(); | ||
}, esc(__iced_deferrals.defer({ | ||
lineno: 418 | ||
lineno: 428 | ||
}))); | ||
@@ -680,3 +681,3 @@ __iced_deferrals._fulfill(); | ||
})(), | ||
lineno: 419 | ||
lineno: 429 | ||
})); | ||
@@ -704,3 +705,3 @@ __iced_deferrals._fulfill(); | ||
})(), | ||
lineno: 421 | ||
lineno: 431 | ||
}))); | ||
@@ -726,3 +727,3 @@ __iced_deferrals._fulfill(); | ||
})(), | ||
lineno: 422 | ||
lineno: 432 | ||
}))); | ||
@@ -748,3 +749,3 @@ __iced_deferrals._fulfill(); | ||
})(), | ||
lineno: 423 | ||
lineno: 433 | ||
}))); | ||
@@ -770,3 +771,3 @@ __iced_deferrals._fulfill(); | ||
})(), | ||
lineno: 424 | ||
lineno: 434 | ||
}))); | ||
@@ -788,7 +789,7 @@ __iced_deferrals._fulfill(); | ||
Encryptor.prototype.clone = function() { | ||
var ret, _ref1; | ||
var ret, _ref1, _ref2; | ||
ret = new Encryptor({ | ||
key: (_ref1 = this.key) != null ? _ref1.to_buffer() : void 0, | ||
rng: this.rng, | ||
version: this.version | ||
version: (_ref2 = this.version) != null ? _ref2.version : void 0 | ||
}); | ||
@@ -829,3 +830,3 @@ ret.derived_keys = this.clone_derived_keys(); | ||
})(), | ||
lineno: 463 | ||
lineno: 473 | ||
})); | ||
@@ -832,0 +833,0 @@ __iced_deferrals._fulfill(); |
@@ -1,2 +0,2 @@ | ||
// Generated by IcedCoffeeScript 1.7.1-f | ||
// Generated by IcedCoffeeScript 1.8.0-d | ||
(function() { | ||
@@ -31,2 +31,11 @@ var default_delay, iced, uint_max, __iced_k, __iced_k_noop; | ||
exports.copy_buffer = function(b) { | ||
var i, ret, _i, _ref; | ||
ret = new Buffer(b.length); | ||
for (i = _i = 0, _ref = b.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) { | ||
ret.writeUInt8(b.readUInt8(i), i); | ||
} | ||
return ret; | ||
}; | ||
exports.scrub_vec = function(v) { | ||
@@ -50,6 +59,6 @@ var i, _i, _ref; | ||
parent: ___iced_passed_deferral, | ||
filename: "/home/max/src/keybase/triplesec/src/util.iced" | ||
filename: "/Users/max/src/keybase/triplesec/src/util.iced" | ||
}); | ||
setImmediate(__iced_deferrals.defer({ | ||
lineno: 37 | ||
lineno: 45 | ||
})); | ||
@@ -62,6 +71,6 @@ __iced_deferrals._fulfill(); | ||
parent: ___iced_passed_deferral, | ||
filename: "/home/max/src/keybase/triplesec/src/util.iced" | ||
filename: "/Users/max/src/keybase/triplesec/src/util.iced" | ||
}); | ||
setTimeout(__iced_deferrals.defer({ | ||
lineno: 39 | ||
lineno: 47 | ||
}), 1); | ||
@@ -153,7 +162,7 @@ __iced_deferrals._fulfill(); | ||
parent: ___iced_passed_deferral, | ||
filename: "/home/max/src/keybase/triplesec/src/util.iced", | ||
filename: "/Users/max/src/keybase/triplesec/src/util.iced", | ||
funcname: "bulk" | ||
}); | ||
delay(i, total_words, __iced_deferrals.defer({ | ||
lineno: 97 | ||
lineno: 105 | ||
})); | ||
@@ -160,0 +169,0 @@ __iced_deferrals._fulfill(); |
{ | ||
"name": "triplesec", | ||
"version": "3.0.22", | ||
"version": "3.0.23", | ||
"description": "A CommonJS-compliant system for secure encryption of smallish secrets", | ||
@@ -5,0 +5,0 @@ "homepage": "https://github.com/keybase/triplesec", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
468384
5576