diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-07-07 16:39:36 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-07-09 15:46:10 +0900 |
| commit | 333899460950905622de50cd11593d6034211745 (patch) | |
| tree | d061c4f8baaf4ce0e11025c8feeafee1a8079a4a /ext/openssl/ossl_pkcs5.c | |
| parent | f010efa753c7e892700926200713753db151b6c8 (diff) | |
| download | ruby-openssl-333899460950905622de50cd11593d6034211745.tar.gz | |
Fix RDoc styletopic/rdoc-fixes
Diffstat (limited to 'ext/openssl/ossl_pkcs5.c')
| -rw-r--r-- | ext/openssl/ossl_pkcs5.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c index 56ed65fb..47c5bfa3 100644 --- a/ext/openssl/ossl_pkcs5.c +++ b/ext/openssl/ossl_pkcs5.c @@ -18,7 +18,7 @@ VALUE ePKCS5; * * +keylen+ - integer * * +digest+ - a string or OpenSSL::Digest object. * - * Available in OpenSSL 0.9.4. + * Available in OpenSSL >= 1.0.0. * * Digests other than SHA1 may not be supported by other cryptography libraries. */ @@ -60,7 +60,7 @@ ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE key * * This method is available in almost any version of OpenSSL. * - * Conforms to rfc2898. + * Conforms to RFC 2898. */ static VALUE ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen) @@ -84,14 +84,10 @@ ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALU void Init_ossl_pkcs5(void) { - /* - * Password-based Encryption - * - */ - - #if 0 - mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */ - #endif +#if 0 + mOSSL = rb_define_module("OpenSSL"); + eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError); +#endif /* Document-class: OpenSSL::PKCS5 * @@ -104,7 +100,7 @@ Init_ossl_pkcs5(void) * * PKCS5 offers support for PBKDF2 with an OpenSSL::Digest::SHA1-based * HMAC, or an arbitrary Digest if the underlying version of OpenSSL - * already supports it (>= 0.9.4). + * already supports it (>= 1.0.0). * * === Parameters * ==== Password |