diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-19 09:29:39 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-19 09:29:39 +0000 |
| commit | 56c8f92e031febbf7bc84b06e8057bdeda8e41b7 (patch) | |
| tree | 51cebb5b528d6d834e02726a789ebc5d18a9221c | |
| parent | 62c3a35d4223c7fc9b3c588acfa26cfabc0852fc (diff) | |
* ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): Fix the type
of md; pointed out by Takahiro Kambe <taca at back-street.net>
in [ruby-dev:34748].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_pkcs5.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon May 19 18:22:35 2008 Akinori MUSHA <knu@iDaemons.org> + + * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): Fix the type + of md; pointed out by Takahiro Kambe <taca at back-street.net> + in [ruby-dev:34748]. + Mon May 19 14:20:13 2008 NAKAMURA Usaku <usa@ruby-lang.org> * sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0. diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c index ca02a18c67..007889fc94 100644 --- a/ext/openssl/ossl_pkcs5.c +++ b/ext/openssl/ossl_pkcs5.c @@ -27,7 +27,7 @@ ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE key { #ifdef HAVE_PKCS5_PBKDF2_HMAC VALUE str; - const EVP_MD md; + const EVP_MD *md; int len = NUM2INT(keylen); StringValue(pass); |