summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Hamburg <mike@shiftleft.org>2011-06-25 16:53:15 -0700
committerMike Hamburg <mike@shiftleft.org>2011-06-25 16:53:15 -0700
commit1b407a322e9169cf4239c195f15138ca8144ad8c (patch)
treeaacf5704a6cceb051ad7fd0007db921d3a7784fd
parent2d09d79fe513d42c7c4dcfa53d66aac354fd76bb (diff)
downloadsjcl-1b407a322e9169cf4239c195f15138ca8144ad8c.zip
sjcl-1b407a322e9169cf4239c195f15138ca8144ad8c.tar.gz
sjcl-1b407a322e9169cf4239c195f15138ca8144ad8c.tar.bz2
fix ts -> tag
-rw-r--r--core/convenience.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/convenience.js b/core/convenience.js
index 2a7a3f2..de94940 100644
--- a/core/convenience.js
+++ b/core/convenience.js
@@ -56,7 +56,7 @@
rp.key = password;
/* do the encryption */
- p.ct = sjcl.mode[p.mode].encrypt(prp, plaintext, p.iv, p.adata, p.tag);
+ p.ct = sjcl.mode[p.mode].encrypt(prp, plaintext, p.iv, p.adata, p.ts);
return j.encode(j._subtract(p, j.defaults));
},
@@ -100,7 +100,7 @@
prp = new sjcl.cipher[p.cipher](password);
/* do the decryption */
- ct = sjcl.mode[p.mode].decrypt(prp, p.ct, p.iv, p.adata, p.tag);
+ ct = sjcl.mode[p.mode].decrypt(prp, p.ct, p.iv, p.adata, p.ts);
/* return the json data */
j._add(rp, p);