aboutsummaryrefslogtreecommitdiff
path: root/src/cljs/gnunet_web/filesharing.cljs
diff options
context:
space:
mode:
authorDavid Barksdale <amatus@amatus.name>2014-10-12 21:38:50 -0500
committerDavid Barksdale <amatus@amatus.name>2014-10-12 21:38:50 -0500
commit3f5b63f714eb312ddce96d7c01c6dca46e8197a7 (patch)
tree22b116df79d42b0705c9ffb3242fd8c5e4073217 /src/cljs/gnunet_web/filesharing.cljs
parent61e6eeddb6ab39e91c409cc5d76848f4d788f4ae (diff)
Use correct cipher padding mode
Diffstat (limited to 'src/cljs/gnunet_web/filesharing.cljs')
-rw-r--r--src/cljs/gnunet_web/filesharing.cljs18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/cljs/gnunet_web/filesharing.cljs b/src/cljs/gnunet_web/filesharing.cljs
index 825438b..24cc675 100644
--- a/src/cljs/gnunet_web/filesharing.cljs
+++ b/src/cljs/gnunet_web/filesharing.cljs
@@ -78,18 +78,20 @@
{:ciphertext (js/CryptoJS.lib.WordArray.create data)}))
twofish-key (js/CryptoJS.enc.Hex.parse "9A89B29A3896E200279ADC010D7F70F7F9A0582190881A17825B87754CA95B81")
twofish-iv (js/CryptoJS.enc.Hex.parse "9E71233934B556C9D9E97609CD22FBC1")
- plaintext (js/CryptoJS.TwoFish.decrypt ciphertext twofish-key
- (clj->js
- {:iv twofish-iv
- :mode js/CryptoJS.mode.CFB}))
+ plaintext (js/CryptoJS.TwoFish.decrypt
+ ciphertext twofish-key
+ (clj->js {:iv twofish-iv
+ :mode js/CryptoJS.mode.CFB
+ :padding js/CryptoJS.pad.NoPadding}))
ciphertext (js/CryptoJS.lib.CipherParams.create
(clj->js {:ciphertext plaintext}))
aes-key (js/CryptoJS.enc.Hex.parse "8D2E569BB26A7F45A933941996DC43C2F2C141F055AD2C863EE9A66379D59B61")
aes-iv (js/CryptoJS.enc.Hex.parse "FBE06BD519F62556BE465A67B80777EC")
- plaintext (js/CryptoJS.AES.decrypt ciphertext aes-key
- (clj->js
- {:iv aes-iv
- :mode js/CryptoJS.mode.CFB}))]
+ plaintext (js/CryptoJS.AES.decrypt
+ ciphertext aes-key
+ (clj->js {:iv aes-iv
+ :mode js/CryptoJS.mode.CFB
+ :padding js/CryptoJS.pad.NoPadding}))]
(unwords plaintext)))
(def parse-fs-put