aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBrian White <mscdex@gmail.com>2011-05-24 21:26:57 -0700
committerRyan Dahl <ry@tinyclouds.org>2011-05-24 23:35:18 -0700
commit9b3472637e37da3d5e93356a4ea0de6a53800226 (patch)
tree602b794d447f218eff7cf031b397ca2b512aed59 /doc
parent2b91256c6185fbcaaa5fc49a3a541e5ed0ec0e75 (diff)
downloadandroid-node-v8-9b3472637e37da3d5e93356a4ea0de6a53800226.tar.gz
android-node-v8-9b3472637e37da3d5e93356a4ea0de6a53800226.tar.bz2
android-node-v8-9b3472637e37da3d5e93356a4ea0de6a53800226.zip
Crypto documentation fixes
Fixes #1104.
Diffstat (limited to 'doc')
-rw-r--r--doc/api/crypto.markdown4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index 78284b35ac..cefbd7b3a4 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -93,7 +93,7 @@ Returns the enciphered contents, and can be called many times with new data as i
### cipher.final(output_encoding='binary')
-Returns any remaining enciphered contents, with `output_encoding` being one of: `'binary'`, `'ascii'` or `'utf8'`.
+Returns any remaining enciphered contents, with `output_encoding` being one of: `'binary'`, `'base64'` or `'hex'`.
### crypto.createDecipher(algorithm, key)
@@ -142,7 +142,7 @@ This can be called many times with new data as it is streamed.
### verifier.verify(cert, signature, signature_format='binary')
Verifies the signed data by using the `cert` which is a string containing
-the PEM encoded certificate, and `signature`, which is the previously calculates
+the PEM encoded certificate, and `signature`, which is the previously calculated
signature for the data, in the `signature_format` which can be `'binary'`, `'hex'` or `'base64'`.
Returns true or false depending on the validity of the signature for the data and public key.