[前][次][番号順一覧][スレッド一覧]

ruby-changes:23377

From: nobu <ko1@a...>
Date: Sun, 22 Apr 2012 21:46:13 +0900 (JST)
Subject: [ruby-changes:23377] nobu:r35428 (trunk): * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): suppress warnings.

nobu	2012-04-22 21:43:53 +0900 (Sun, 22 Apr 2012)

  New Revision: 35428

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35428

  Log:
    * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): suppress warnings.

  Modified files:
    trunk/ext/openssl/ossl_pkcs5.c

Index: ext/openssl/ossl_pkcs5.c
===================================================================
--- ext/openssl/ossl_pkcs5.c	(revision 35427)
+++ ext/openssl/ossl_pkcs5.c	(revision 35428)
@@ -36,8 +36,8 @@
 
     str = rb_str_new(0, len);
 
-    if (PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LEN(pass),
-			  (unsigned char *)RSTRING_PTR(salt), RSTRING_LEN(salt),
+    if (PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LENINT(pass),
+			  (unsigned char *)RSTRING_PTR(salt), RSTRING_LENINT(salt),
 			  NUM2INT(iter), md, len,
 			  (unsigned char *)RSTRING_PTR(str)) != 1)
         ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC");

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]