suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add var declaration to des.js and use strict mode

Browse Source
This commit is contained in:
Tankred Hase 2016-01-23 17:27:45 +07:00
parent 05e441b8ad
commit bc5eb03ccd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/crypto/cipher/des.js
View File

@ -25,6 +25,7 @@
* @module crypto/cipher/des * @module crypto/cipher/des
*/ */
'use strict';
function des(keys, message, encrypt, mode, iv, padding) { function des(keys, message, encrypt, mode, iv, padding) {
//declaring this locally speeds things up a bit //declaring this locally speeds things up a bit
@ -154,7 +155,7 @@ function des(keys, message, encrypt, mode, iv, padding) {
for (j = 0; j < iterations; j += 3) { for (j = 0; j < iterations; j += 3) {
endloop = looping[j + 1]; endloop = looping[j + 1];
loopinc = looping[j + 2]; loopinc = looping[j + 2];
//now go through and perform the encryption or decryption //now go through and perform the encryption or decryption
for (i = looping[j]; i != endloop; i += loopinc) { //for efficiency for (i = looping[j]; i != endloop; i += loopinc) { //for efficiency
right1 = right ^ keys[i]; right1 = right ^ keys[i];
right2 = ((right >>> 4) | (right << 28)) ^ keys[i + 1]; right2 = ((right >>> 4) | (right << 28)) ^ keys[i + 1];
@ -303,7 +304,7 @@ function des_createKeys(key) {
right = temp; right = temp;
//now go through and perform these shifts on the left and right keys //now go through and perform these shifts on the left and right keys
for (i = 0; i < shifts.length; i++) { for (var i = 0; i < shifts.length; i++) {
//shift the keys either one or two bits to the left //shift the keys either one or two bits to the left
if (shifts[i]) { if (shifts[i]) {
left = (left << 2) | (left >>> 26); left = (left << 2) | (left >>> 26);
@ -317,7 +318,7 @@ function des_createKeys(key) {
//now apply PC-2, in such a way that E is easier when encrypting or decrypting //now apply PC-2, in such a way that E is easier when encrypting or decrypting
//this conversion will look like PC-2 except only the last 6 bits of each byte are used //this conversion will look like PC-2 except only the last 6 bits of each byte are used
//rather than 48 consecutive bits and the order of lines will be according to //rather than 48 consecutive bits and the order of lines will be according to
//how the S selection functions will be applied: S2, S4, S6, S8, S1, S3, S5, S7 //how the S selection functions will be applied: S2, S4, S6, S8, S1, S3, S5, S7
lefttemp = pc2bytes0[left >>> 28] | pc2bytes1[(left >>> 24) & 0xf] | pc2bytes2[(left >>> 20) & 0xf] | pc2bytes3[( lefttemp = pc2bytes0[left >>> 28] | pc2bytes1[(left >>> 24) & 0xf] | pc2bytes2[(left >>> 20) & 0xf] | pc2bytes3[(
left >>> 16) & 0xf] | pc2bytes4[(left >>> 12) & 0xf] | pc2bytes5[(left >>> 8) & 0xf] | pc2bytes6[(left >>> 4) & left >>> 16) & 0xf] | pc2bytes4[(left >>> 12) & 0xf] | pc2bytes5[(left >>> 8) & 0xf] | pc2bytes6[(left >>> 4) &