diff options
| author | Brian Turek <brian.turek@gmail.com> | 2015-08-26 19:21:33 -0400 |
|---|---|---|
| committer | Brian Turek <brian.turek@gmail.com> | 2015-08-26 19:21:33 -0400 |
| commit | 74190d0f48f4ee637cf0086a1cc85e7b882af18b (patch) | |
| tree | 0572105e0ebd65eaa23e8f179df8616fee355a99 /src/sha_dev.js | |
| parent | a11967ec84b0f30097ddabf6280cbb8d52d81f65 (diff) | |
| download | jsSHA-74190d0f48f4ee637cf0086a1cc85e7b882af18b.zip jsSHA-74190d0f48f4ee637cf0086a1cc85e7b882af18b.tar.gz jsSHA-74190d0f48f4ee637cf0086a1cc85e7b882af18b.tar.bz2 | |
Fixed inability to have blank b64Pad (#32)
Diffstat (limited to 'src/sha_dev.js')
| -rw-r--r-- | src/sha_dev.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/sha_dev.js b/src/sha_dev.js index f16f15a..8222d1b 100644 --- a/src/sha_dev.js +++ b/src/sha_dev.js @@ -395,7 +395,11 @@ var SUPPORTED_ALGS = 4 | 2 | 1; outputOptions = options || {}; retVal["outputUpper"] = outputOptions["outputUpper"] || false; - retVal["b64Pad"] = outputOptions["b64Pad"] || "="; + + if (true === outputOptions.hasOwnProperty("b64Pad")) + { + retVal["b64Pad"] = outputOptions["b64Pad"]; + } if ("boolean" !== typeof(retVal["outputUpper"])) { @@ -1297,7 +1301,7 @@ var SUPPORTED_ALGS = 4 | 2 | 1; actually 72 (64 + 8) but the below math fails if remainderBinLen + 72 % 512 = 0. Since remainderBinLen % 8 = 0, "shorting" the addition is OK. */ - offset = (((remainderBinLen + 65) >>> 9) << 4) + 15;; + offset = (((remainderBinLen + 65) >>> 9) << 4) + 15; binaryStringInc = 16; } else if ((variant === "SHA-384" || variant === "SHA-512") && |