diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2011-08-02 08:52:03 +0400 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2011-08-02 08:52:03 +0400 |
commit | 6d5218bc7d344b0f4e0a0cb50fdd25052946cc4f (patch) | |
tree | eee125b05ed537734d1f1ff44d1c6a987d035d61 /lib | |
parent | a6e0a91a70ed450166a2066fe2a7d6a0d3969ca9 (diff) | |
parent | c72223e2a9aae2d5c20825562657c50a644d8a59 (diff) |
Merge branch 'v0.4'
Conflicts:
doc/api/crypto.markdown
doc/api/modules.markdown
src/platform_win32.cc
Diffstat (limited to 'lib')
-rw-r--r-- | lib/crypto.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/crypto.js b/lib/crypto.js index d7f403ed100..83b2bb8122e 100644 --- a/lib/crypto.js +++ b/lib/crypto.js @@ -118,8 +118,8 @@ exports.createHmac = function(hmac, key) { exports.Cipher = Cipher; -exports.createCipher = function(cipher, key) { - return (new Cipher).init(cipher, key); +exports.createCipher = function(cipher, password) { + return (new Cipher).init(cipher, password); }; @@ -129,8 +129,8 @@ exports.createCipheriv = function(cipher, key, iv) { exports.Decipher = Decipher; -exports.createDecipher = function(cipher, key) { - return (new Decipher).init(cipher, key); +exports.createDecipher = function(cipher, password) { + return (new Decipher).init(cipher, password); }; |