diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/lib/openssl/cipher.rb | 2 | ||||
| -rw-r--r-- | ext/openssl/ossl_cipher.c | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Mon Jun 20 18:46:02 2011 Hiroshi Nakamura <nahi@ruby-lang.org> + + * ext/openssl/ossl_cipher.c, ext/openssl/lib/openssl/cipher.rb: + Documentation fix by Ippei Obayashi. See #4419. + Mon Jun 20 15:41:33 2011 Hiroshi Nakamura <nahi@ruby-lang.org> * lib/webrick/cookie.rb (WEBrick::Cookie.parse): Revert r31228. diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb index 14362ea86f..d9aac755cd 100644 --- a/ext/openssl/lib/openssl/cipher.rb +++ b/ext/openssl/lib/openssl/cipher.rb @@ -53,7 +53,7 @@ module OpenSSL return str end - # This class is only provided for backwards compatibility. Use OpenSSL::Digest in the future. + # This class is only provided for backwards compatibility. Use OpenSSL::Cipher in the future. class Cipher < Cipher # add warning end diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c index f1ab47816c..c95b2d3444 100644 --- a/ext/openssl/ossl_cipher.c +++ b/ext/openssl/ossl_cipher.c @@ -444,7 +444,7 @@ ossl_cipher_set_iv(VALUE self, VALUE iv) /* * call-seq: - * cipher.key_length = integer -> integer + * cipher.key_len = integer -> integer * * Sets the key length of the cipher. If the cipher is a fixed length cipher then attempting to set the key * length to any value other than the fixed value is an error. @@ -507,13 +507,13 @@ CIPHER_0ARG_INT(block_size) #if 0 /* * call-seq: - * cipher.key_length -> integer + * cipher.key_len -> integer * */ static VALUE ossl_cipher_key_length() { } /* * call-seq: - * cipher.iv_length -> integer + * cipher.iv_len -> integer * */ static VALUE ossl_cipher_iv_length() { } |