usa	2012-07-11 12:46:37 +0900 (Wed, 11 Jul 2012)

  New Revision: 36364

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

  Log:
    * ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): nonstatic initializer 
      of an aggregate type is a C99ism.
    
    * ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): get rid of VC++
      warnings.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_pkey_ec.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36363)
+++ ChangeLog	(revision 36364)
@@ -1,3 +1,11 @@
+Wed Jul 11 12:38:20 2012  NAKAMURA Usaku  <usa@r...>
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): nonstatic initializer 
+	  of an aggregate type is a C99ism.
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): get rid of VC++
+	  warnings.
+
 Mon Jul  9 16:11:30 2012  Yuki Yugui Sonoda  <yugui@g...>
 
 	* vm_eval.c (rb_eval_string_from_file,
Index: ext/openssl/ossl_pkey_ec.c
===================================================================
--- ext/openssl/ossl_pkey_ec.c	(revision 36363)
+++ ext/openssl/ossl_pkey_ec.c	(revision 36364)
@@ -1482,7 +1482,6 @@
     EC_POINT *point1, *point2;
     const EC_GROUP *group;
     VALUE group_v = rb_iv_get(self, "@group");
-    VALUE args[1] = {group_v};
     VALUE bn_v1, bn_v2, r, points_v;
     BIGNUM *bn1 = NULL, *bn2 = NULL;
 
@@ -1490,7 +1489,7 @@
     SafeRequire_EC_GROUP(group_v, group);
 
     r = rb_obj_alloc(cEC_POINT);
-    ossl_ec_point_initialize(1, args, r);
+    ossl_ec_point_initialize(1, &group_v, r);
     Require_EC_POINT(r, point2);
 
     argc = rb_scan_args(argc, argv, "12", &bn_v1, &points_v, &bn_v2);
@@ -1516,7 +1515,7 @@
         }
 
         if (!rb_obj_is_kind_of(points_v, rb_cArray)) {
-            OPENSSL_free(bignums);
+            OPENSSL_free((void *)bignums);
             rb_raise(rb_eTypeError, "Argument2 must be an array");
         }
 
@@ -1532,12 +1531,12 @@
             bn2 = GetBNPtr(bn_v2);
         }
         if (EC_POINTs_mul(group, point2, bn2, points_len, points, bignums, ossl_bn_ctx) != 1) {
-            OPENSSL_free(bignums);
-            OPENSSL_free(points);
+            OPENSSL_free((void *)bignums);
+            OPENSSL_free((void *)points);
             ossl_raise(eEC_POINT, "Multiplication failed");
         }
-        OPENSSL_free(bignums);
-        OPENSSL_free(points);
+        OPENSSL_free((void *)bignums);
+        OPENSSL_free((void *)points);
     }
 
     return r;

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