wanabe	2010-09-26 22:24:52 +0900 (Sun, 26 Sep 2010)

  New Revision: 29346

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

  Log:
    * ext/openssl/ossl_hmac.c (ossl_hmac_hexdigest, ossl_hmac_s_hexdigest),
      ext/openssl/ossl_pkey_ec.c (ossl_ec_group_set_seed),
      ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der),
      ext/openssl/ossl_pkcs7.c (numberof): suppress warnings.
      [ruby-core:31932]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_hmac.c
    trunk/ext/openssl/ossl_pkcs7.c
    trunk/ext/openssl/ossl_pkey_ec.c
    trunk/ext/openssl/ossl_ssl_session.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29345)
+++ ChangeLog	(revision 29346)
@@ -1,3 +1,11 @@
+Sun Sep 26 22:21:07 2010  wanabe  <s.wanabe@g...>
+
+	* ext/openssl/ossl_hmac.c (ossl_hmac_hexdigest, ossl_hmac_s_hexdigest),
+	  ext/openssl/ossl_pkey_ec.c (ossl_ec_group_set_seed),
+	  ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der),
+	  ext/openssl/ossl_pkcs7.c (numberof): suppress warnings.
+	  [ruby-core:31932]
+
 Sun Sep 26 10:25:24 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* tool/config.{guess,sub}: updated to automake-1.11.1.
Index: ext/openssl/ossl_hmac.c
===================================================================
--- ext/openssl/ossl_hmac.c	(revision 29345)
+++ ext/openssl/ossl_hmac.c	(revision 29346)
@@ -159,7 +159,7 @@
 
     GetHMAC(self, ctx);
     hmac_final(ctx, &buf, &buf_len);
-    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
+    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * (int)buf_len) {
 	OPENSSL_free(buf);
 	ossl_raise(eHMACError, "Memory alloc error");
     }
@@ -222,7 +222,7 @@
 
     buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
 	       (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
-    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
+    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * (int)buf_len) {
 	ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
     }
     hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
Index: ext/openssl/ossl_pkey_ec.c
===================================================================
--- ext/openssl/ossl_pkey_ec.c	(revision 29345)
+++ ext/openssl/ossl_pkey_ec.c	(revision 29346)
@@ -1107,7 +1107,7 @@
     Require_EC_GROUP(self, group);
     StringValue(seed);
 
-    if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
+    if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != (size_t)RSTRING_LEN(seed))
         ossl_raise(eEC_GROUP, "EC_GROUP_set_seed");
 
     return seed;
Index: ext/openssl/ossl_ssl_session.c
===================================================================
--- ext/openssl/ossl_ssl_session.c	(revision 29345)
+++ ext/openssl/ossl_ssl_session.c	(revision 29346)
@@ -205,7 +205,7 @@
 
 	if (len <= 0)
 		ossl_raise(eSSLSession, "i2d_SSL_SESSION");
-	else if (len >= sizeof(buf))
+	else if (len >= (int)sizeof(buf))
 		ossl_raise(eSSLSession, "i2d_SSL_SESSION too large");
 
 	return rb_str_new((const char *) p, len);
Index: ext/openssl/ossl_pkcs7.c
===================================================================
--- ext/openssl/ossl_pkcs7.c	(revision 29345)
+++ ext/openssl/ossl_pkcs7.c	(revision 29346)
@@ -61,7 +61,7 @@
     GetPKCS7ri(obj, p7ri); \
 } while (0)
 
-#define numberof(ary) (sizeof(ary)/sizeof(ary[0]))
+#define numberof(ary) (int)(sizeof(ary)/sizeof(ary[0]))
 
 #define ossl_pkcs7_set_data(o,v)       rb_iv_set((o), "@data", (v))
 #define ossl_pkcs7_get_data(o)         rb_iv_get((o), "@data")

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