ruby-changes:18313
From: nobu <ko1@a...>
Date: Sat, 25 Dec 2010 10:50:07 +0900 (JST)
Subject: [ruby-changes:18313] Ruby:r30336 (trunk): * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): add casts.
nobu 2010-12-25 10:49:59 +0900 (Sat, 25 Dec 2010) New Revision: 30336 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30336 Log: * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): add casts. Modified files: trunk/ChangeLog trunk/ext/openssl/ossl_pkcs5.c Index: ChangeLog =================================================================== --- ChangeLog (revision 30335) +++ ChangeLog (revision 30336) @@ -1,3 +1,7 @@ +Sat Dec 25 10:49:56 2010 Nobuyoshi Nakada <nobu@r...> + + * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): add casts. + Fri Dec 24 08:46:04 2010 Tanaka Akira <akr@f...> * process.c: parenthesize macro arguments. Index: ext/openssl/ossl_pkcs5.c =================================================================== --- ext/openssl/ossl_pkcs5.c (revision 30335) +++ ext/openssl/ossl_pkcs5.c (revision 30336) @@ -36,7 +36,10 @@ str = rb_str_new(0, len); - if (PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LEN(pass), RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter), md, len, RSTRING_PTR(str)) != 1) + if (PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LEN(pass), + (unsigned char *)RSTRING_PTR(salt), RSTRING_LEN(salt), + NUM2INT(iter), md, len, + (unsigned char *)RSTRING_PTR(str)) != 1) ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC"); return str; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/