Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #524 from notmasteryet/tree-25

Browse Source 
Changing the calculateMD5 function name (ref #523)
This commit is contained in:
Andreas Gal 2011-09-24 12:46:15 -07:00
commit 9e19966a83
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto.js
View File

@ -45,7 +45,7 @@ var ARCFourCipher = (function aRCFourCipher() {
return constructor; return constructor;
})(); })();
var md5 = (function md5Md5() { var calculateMD5 = (function calculateMD5() {
var r = new Uint8Array([ var r = new Uint8Array([
7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
@ -452,11 +452,11 @@ var CipherTransformFactory = (function cipherTransformFactory() {
hashData[i++] = 0xFF; hashData[i++] = 0xFF;
hashData[i++] = 0xFF; hashData[i++] = 0xFF;
} }
var hash = md5(hashData, 0, i); var hash = calculateMD5(hashData, 0, i);
var keyLengthInBytes = keyLength >> 3; var keyLengthInBytes = keyLength >> 3;
if (revision >= 3) { if (revision >= 3) {
for (j = 0; j < 50; ++j) { for (j = 0; j < 50; ++j) {
hash = md5(hash, 0, keyLengthInBytes); hash = calculateMD5(hash, 0, keyLengthInBytes);
} }
} }
var encryptionKey = hash.subarray(0, keyLengthInBytes); var encryptionKey = hash.subarray(0, keyLengthInBytes);
@ -469,7 +469,7 @@ var CipherTransformFactory = (function cipherTransformFactory() {
for (j = 0, n = fileId.length; j < n; ++j) for (j = 0, n = fileId.length; j < n; ++j)
hashData[i++] = fileId[j]; hashData[i++] = fileId[j];
cipher = new ARCFourCipher(encryptionKey); cipher = new ARCFourCipher(encryptionKey);
var checkData = cipher.encryptBlock(md5(hashData, 0, i)); var checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
n = encryptionKey.length; n = encryptionKey.length;
var derrivedKey = new Uint8Array(n), k; var derrivedKey = new Uint8Array(n), k;
for (j = 1; j <= 19; ++j) { for (j = 1; j <= 19; ++j) {
@ -544,7 +544,7 @@ var CipherTransformFactory = (function cipherTransformFactory() {
key[i++] = 0x6C; key[i++] = 0x6C;
key[i++] = 0x54; key[i++] = 0x54;
} }
var hash = md5(key, 0, i); var hash = calculateMD5(key, 0, i);
return hash.subarray(0, Math.min(encryptionKey.length + 5, 16)); return hash.subarray(0, Math.min(encryptionKey.length + 5, 16));
} }