aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-26 13:01:54 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-26 13:01:54 +0000
commit12fdf4bc92f05d9b052d1d76fffaab940ea254dc (patch)
treeb2009144322d8a1c0ff39bf652ee9ff103e68d8d
parente59f453e880d5a9e400785122f30fc504a622c33 (diff)
downloadruby-12fdf4bc92f05d9b052d1d76fffaab940ea254dc.tar.gz
* ext/openssl/ossl.c: [DOC] typo in example by @zoranzaric
[Fixes GH-401] https://github.com/ruby/ruby/pull/401 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/openssl/ossl.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e2cdc3782b..89d2d23e9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 26 22:00:42 2013 Zachary Scott <e@zzak.io>
+
+ * ext/openssl/ossl.c: [DOC] typo in example by @zoranzaric
+ [Fixes GH-401] https://github.com/ruby/ruby/pull/401
+
Thu Sep 26 21:07:49 2013 Akinori MUSHA <knu@iDaemons.org>
* misc/ruby-electric.el (ruby-electric-delete-backward-char): Add
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 76fe3ea7fc..43ccf4c3fd 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -844,7 +844,7 @@ static void Init_ossl_locks(void)
* cipher = OpenSSL::Cipher::Cipher.new 'AES-128-CBC'
*
* open 'ca_key.pem', 'w', 0400 do |io|
- * io.write key.export(cipher, pass_phrase)
+ * io.write ca_key.export(cipher, pass_phrase)
* end
*
* === CA Certificate