diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-19 09:27:55 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-19 09:27:55 +0000 |
| commit | 131f1321179768a28193fce18f661617870aac3f (patch) | |
| tree | 7fe59d1d4ed594e7737052fc6d12f536e054ec77 | |
| parent | 7ea0a46e32a1dba0e16b79ce42dbf7d9c5b8d7fb (diff) | |
| download | ruby-131f1321179768a28193fce18f661617870aac3f.tar.gz ruby-131f1321179768a28193fce18f661617870aac3f.tar.xz ruby-131f1321179768a28193fce18f661617870aac3f.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@16478 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 17:23:55 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * regparse.c (PINC): use optimized enclen() instead of diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c index ca02a18c6..007889fc9 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); |