knu	2008-05-19 18:30:25 +0900 (Mon, 19 May 2008)

  New Revision: 16480

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/openssl/ossl_pkcs5.c

  Log:
    Merge from ruby_1_8.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ext/openssl/ossl_pkcs5.c?r1=16480&r2=16479&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=16480&r2=16479&diff_format=u

Index: ruby_1_8_7/ext/openssl/ossl_pkcs5.c
===================================================================
--- ruby_1_8_7/ext/openssl/ossl_pkcs5.c	(revision 16479)
+++ ruby_1_8_7/ext/openssl/ossl_pkcs5.c	(revision 16480)
@@ -27,7 +27,7 @@
 {
 #ifdef HAVE_PKCS5_PBKDF2_HMAC
     VALUE str;
-    const EVP_MD md;
+    const EVP_MD *md;
     int len = NUM2INT(keylen);
 
     StringValue(pass);
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 16479)
+++ ruby_1_8_7/ChangeLog	(revision 16480)
@@ -1,3 +1,9 @@
+Mon May 19 18:22:35 2008  Akinori MUSHA  <knu@i...>
+
+	* 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@r...>
 
 	* sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0.

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