aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-09-25 00:42:47 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-09-25 00:42:47 +0900
commit23f83bf39058d953fa5d5039745788c0f5ca95b1 (patch)
tree2b7dcbf81d3da3fc852a5708a8a44429617aed43
parentded62a0677931e29f2d16146ce93d90183b2e7df (diff)
parentb64fc1fa1228496b825955da5e2bd63fc6d6c2a6 (diff)
downloadruby-openssl-history-23f83bf39058d953fa5d5039745788c0f5ca95b1.tar.gz
Merge changes from Ruby trunk r56173..r56225
* ruby-trunk r56173..r56225: (1 commits) (r56225) fid typos [ci skip] Sync-with-trunk: r56225
-rw-r--r--ext/openssl/ossl_cipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index f1f3459..57bc3cf 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -304,7 +304,7 @@ ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
*
* === Parameters
* * +salt+ must be an 8 byte string if provided.
- * * +iterations+ is a integer with a default of 2048.
+ * * +iterations+ is an integer with a default of 2048.
* * +digest+ is a Digest object that defaults to 'MD5'
*
* A minimum of 1000 iterations is recommended.