1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ossl_pkey_ec.c: typed data

Browse Source 
* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_type): use typed data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-12 23:19:24 +00:00
parent 13448fdc6b
commit 2e78e44f59
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/openssl/ossl_pkey_ec.c
View File

@ -21,6 +21,7 @@ typedef struct {
#define EXPORT_DER 1 #define EXPORT_DER 1
static const rb_data_type_t ossl_ec_group_type; static const rb_data_type_t ossl_ec_group_type;
static const rb_data_type_t ossl_ec_point_type;
#define GetPKeyEC(obj, pkey) do { \ #define GetPKeyEC(obj, pkey) do { \
GetPKey((obj), (pkey)); \ GetPKey((obj), (pkey)); \
@ -72,7 +73,7 @@ static const rb_data_type_t ossl_ec_group_type;
#define Get_EC_POINT(obj, p) do { \ #define Get_EC_POINT(obj, p) do { \
ossl_ec_point *ec_point; \ ossl_ec_point *ec_point; \
Data_Get_Struct((obj), ossl_ec_point, ec_point); \ TypedData_Get_Struct((obj), ossl_ec_point, &ossl_ec_point_type, ec_point); \
if (ec_point == NULL) \ if (ec_point == NULL) \
ossl_raise(eEC_POINT, "missing ossl_ec_point structure"); \ ossl_raise(eEC_POINT, "missing ossl_ec_point structure"); \
(p) = ec_point->point; \ (p) = ec_point->point; \
@ -370,7 +371,7 @@ static VALUE ossl_ec_point_dup(const EC_POINT *point, VALUE group_v)
ossl_ec_point *new_point; ossl_ec_point *new_point;
obj = rb_obj_alloc(cEC_POINT); obj = rb_obj_alloc(cEC_POINT);
Data_Get_Struct(obj, ossl_ec_point, new_point); TypedData_Get_Struct(obj, ossl_ec_point, &ossl_ec_point_type, new_point);
SafeRequire_EC_GROUP(group_v, group); SafeRequire_EC_GROUP(group_v, group);
@ -1229,19 +1230,28 @@ static VALUE ossl_ec_group_to_text(VALUE self)
} }
static void ossl_ec_point_free(ossl_ec_point *ec_point) static void ossl_ec_point_free(void *ptr)
{ {
ossl_ec_point *ec_point = ptr;
if (!ec_point->dont_free && ec_point->point) if (!ec_point->dont_free && ec_point->point)
EC_POINT_clear_free(ec_point->point); EC_POINT_clear_free(ec_point->point);
ruby_xfree(ec_point); ruby_xfree(ec_point);
} }
static const rb_data_type_t ossl_ec_point_type = {
"OpenSSL/ec_point",
{
0, ossl_ec_point_free,
},
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
};
static VALUE ossl_ec_point_alloc(VALUE klass) static VALUE ossl_ec_point_alloc(VALUE klass)
{ {
ossl_ec_point *ec_point; ossl_ec_point *ec_point;
VALUE obj; VALUE obj;
obj = Data_Make_Struct(klass, ossl_ec_point, 0, ossl_ec_point_free, ec_point); obj = TypedData_Make_Struct(klass, ossl_ec_point, &ossl_ec_point_type, ec_point);
return obj; return obj;
} }
@ -1262,7 +1272,7 @@ static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
VALUE group_v = Qnil; VALUE group_v = Qnil;
const EC_GROUP *group = NULL; const EC_GROUP *group = NULL;
Data_Get_Struct(self, ossl_ec_point, ec_point); TypedData_Get_Struct(self, ossl_ec_point, &ossl_ec_point_type, ec_point);
if (ec_point->point) if (ec_point->point)
ossl_raise(eEC_POINT, "EC_POINT already initialized"); ossl_raise(eEC_POINT, "EC_POINT already initialized");