summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/openssl/ossl.c20
2 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 77936181e61..3c6db2e1425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 20 01:06:06 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * ext/openssl/ossl.c: use encryptor instead of encrypter in doc.
+ contributed from @vipulnsward. [fix GH-663]
+
Sun Jul 20 00:32:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_initialize): [DOC] fix rdoc of append mode. it does
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 3f09ce7d6f4..8b25c02990b 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -748,27 +748,27 @@ static void Init_ossl_locks(void)
*
* First set up the cipher for encryption
*
- * encrypter = OpenSSL::Cipher.new 'AES-128-CBC'
- * encrypter.encrypt
- * encrypter.pkcs5_keyivgen pass_phrase, salt
+ * encryptor = OpenSSL::Cipher.new 'AES-128-CBC'
+ * encryptor.encrypt
+ * encryptor.pkcs5_keyivgen pass_phrase, salt
*
* Then pass the data you want to encrypt through
*
- * encrypted = encrypter.update 'top secret document'
- * encrypted << encrypter.final
+ * encrypted = encryptor.update 'top secret document'
+ * encrypted << encryptor.final
*
* === Decryption
*
* Use a new Cipher instance set up for decryption
*
- * decrypter = OpenSSL::Cipher.new 'AES-128-CBC'
- * decrypter.decrypt
- * decrypter.pkcs5_keyivgen pass_phrase, salt
+ * decryptor = OpenSSL::Cipher.new 'AES-128-CBC'
+ * decryptor.decrypt
+ * decryptor.pkcs5_keyivgen pass_phrase, salt
*
* Then pass the data you want to decrypt through
*
- * plain = decrypter.update encrypted
- * plain << decrypter.final
+ * plain = decryptor.update encrypted
+ * plain << decryptor.final
*
* == X509 Certificates
*