github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[ruby/openssl] pkey: inline {rsa,dsa,dh,ec}_instance() 

Merge the code into the callers so that the wrapping Ruby object is
allocated before the raw key object is allocated. This prevents possible
memory leak on Ruby object allocation failure, and also reduces the
lines of code.

https://github.com/ruby/openssl/commit/1eb1366615
This commit is contained in:
Kazuki Yamaguchi 2017-03-16 16:09:35 +09:00
Родитель 27859c09a6
Коммит c157f6e787
4 изменённых файлов: 78 добавлений и 158 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

67
ext/openssl/ossl_pkey_dh.c
Просмотреть файл

@ -29,31 +29,6 @@
VALUE cDH; VALUE cDH;
VALUE eDHError; VALUE eDHError;
/*
* Public
*/
static VALUE
dh_instance(VALUE klass, DH *dh)
{
EVP_PKEY *pkey;
VALUE obj;
if (!dh) {
return Qfalse;
}
obj = NewPKey(klass);
if (!(pkey = EVP_PKEY_new())) {
return Qfalse;
}
if (!EVP_PKEY_assign_DH(pkey, dh)) {
EVP_PKEY_free(pkey);
return Qfalse;
}
SetPKey(obj, pkey);
return obj;
}
/* /*
* Private * Private
*/ */
@ -84,7 +59,7 @@ dh_generate(int size, int gen)
if (!dh || !cb) { if (!dh || !cb) {
DH_free(dh); DH_free(dh);
BN_GENCB_free(cb); BN_GENCB_free(cb);
return NULL; ossl_raise(eDHError, "malloc failure");
} }
if (rb_block_given_p()) if (rb_block_given_p())
@ -110,12 +85,12 @@ dh_generate(int size, int gen)
ossl_clear_error(); ossl_clear_error();
rb_jump_tag(cb_arg.state); rb_jump_tag(cb_arg.state);
} }
return NULL; ossl_raise(eDHError, "DH_generate_parameters_ex");
} }
if (!DH_generate_key(dh)) { if (!DH_generate_key(dh)) {
DH_free(dh); DH_free(dh);
return NULL; ossl_raise(eDHError, "DH_generate_key");
} }
return dh; return dh;
@ -136,6 +111,7 @@ dh_generate(int size, int gen)
static VALUE static VALUE
ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass) ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
{ {
EVP_PKEY *pkey;
DH *dh ; DH *dh ;
int g = 2; int g = 2;
VALUE size, gen, obj; VALUE size, gen, obj;
@ -143,13 +119,14 @@ ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
if (rb_scan_args(argc, argv, "11", &size, &gen) == 2) { if (rb_scan_args(argc, argv, "11", &size, &gen) == 2) {
g = NUM2INT(gen); g = NUM2INT(gen);
} }
dh = dh_generate(NUM2INT(size), g); obj = rb_obj_alloc(klass);
obj = dh_instance(klass, dh); GetPKey(obj, pkey);
if (obj == Qfalse) {
DH_free(dh);
ossl_raise(eDHError, NULL);
}
dh = dh_generate(NUM2INT(size), g);
if (!EVP_PKEY_assign_DH(pkey, dh)) {
DH_free(dh);
ossl_raise(eDHError, "EVP_PKEY_assign_DH");
}
return obj; return obj;
} }
@ -195,9 +172,7 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
if (!NIL_P(gen)) { if (!NIL_P(gen)) {
g = NUM2INT(gen); g = NUM2INT(gen);
} }
if (!(dh = dh_generate(NUM2INT(arg), g))) { dh = dh_generate(NUM2INT(arg), g);
ossl_raise(eDHError, NULL);
}
} }
else { else {
arg = ossl_to_der_if_possible(arg); arg = ossl_to_der_if_possible(arg);
@ -434,17 +409,21 @@ ossl_dh_to_text(VALUE self)
static VALUE static VALUE
ossl_dh_to_public_key(VALUE self) ossl_dh_to_public_key(VALUE self)
{ {
EVP_PKEY *pkey;
DH *orig_dh, *dh; DH *orig_dh, *dh;
VALUE obj; VALUE obj;
GetDH(self, orig_dh); obj = rb_obj_alloc(rb_obj_class(self));
dh = DHparams_dup(orig_dh); /* err check perfomed by dh_instance */ GetPKey(obj, pkey);
obj = dh_instance(rb_obj_class(self), dh);
if (obj == Qfalse) {
DH_free(dh);
ossl_raise(eDHError, NULL);
}
GetDH(self, orig_dh);
dh = DHparams_dup(orig_dh);
if (!dh)
ossl_raise(eDHError, "DHparams_dup");
if (!EVP_PKEY_assign_DH(pkey, dh)) {
DH_free(dh);
ossl_raise(eDHError, "EVP_PKEY_assign_DH");
}
return obj; return obj;
} }

68
ext/openssl/ossl_pkey_dsa.c
Просмотреть файл

@ -43,31 +43,6 @@ DSA_PRIVATE(VALUE obj, DSA *dsa)
VALUE cDSA; VALUE cDSA;
VALUE eDSAError; VALUE eDSAError;
/*
* Public
*/
static VALUE
dsa_instance(VALUE klass, DSA *dsa)
{
EVP_PKEY *pkey;
VALUE obj;
if (!dsa) {
return Qfalse;
}
obj = NewPKey(klass);
if (!(pkey = EVP_PKEY_new())) {
return Qfalse;
}
if (!EVP_PKEY_assign_DSA(pkey, dsa)) {
EVP_PKEY_free(pkey);
return Qfalse;
}
SetPKey(obj, pkey);
return obj;
}
/* /*
* Private * Private
*/ */
@ -100,9 +75,9 @@ dsa_generate(int size)
unsigned long h; unsigned long h;
if (!dsa || !cb) { if (!dsa || !cb) {
DSA_free(dsa); DSA_free(dsa);
BN_GENCB_free(cb); BN_GENCB_free(cb);
return NULL; ossl_raise(eDSAError, "malloc failure");
} }
if (rb_block_given_p()) if (rb_block_given_p())
@ -132,12 +107,12 @@ dsa_generate(int size)
ossl_clear_error(); ossl_clear_error();
rb_jump_tag(cb_arg.state); rb_jump_tag(cb_arg.state);
} }
return NULL; ossl_raise(eDSAError, "DSA_generate_parameters_ex");
} }
if (!DSA_generate_key(dsa)) { if (!DSA_generate_key(dsa)) {
DSA_free(dsa); DSA_free(dsa);
return NULL; ossl_raise(eDSAError, "DSA_generate_key");
} }
return dsa; return dsa;
@ -157,14 +132,18 @@ dsa_generate(int size)
static VALUE static VALUE
ossl_dsa_s_generate(VALUE klass, VALUE size) ossl_dsa_s_generate(VALUE klass, VALUE size)
{ {
DSA *dsa = dsa_generate(NUM2INT(size)); /* err handled by dsa_instance */ EVP_PKEY *pkey;
VALUE obj = dsa_instance(klass, dsa); DSA *dsa;
VALUE obj;
if (obj == Qfalse) { obj = rb_obj_alloc(klass);
DSA_free(dsa); GetPKey(obj, pkey);
ossl_raise(eDSAError, NULL);
dsa = dsa_generate(NUM2INT(size));
if (!EVP_PKEY_assign_DSA(pkey, dsa)) {
DSA_free(dsa);
ossl_raise(eDSAError, "EVP_PKEY_assign_DSA");
} }
return obj; return obj;
} }
@ -460,20 +439,23 @@ ossl_dsa_to_text(VALUE self)
static VALUE static VALUE
ossl_dsa_to_public_key(VALUE self) ossl_dsa_to_public_key(VALUE self)
{ {
EVP_PKEY *pkey; EVP_PKEY *pkey, *pkey_new;
DSA *dsa; DSA *dsa;
VALUE obj; VALUE obj;
GetPKeyDSA(self, pkey); GetPKeyDSA(self, pkey);
/* err check performed by dsa_instance */ obj = rb_obj_alloc(rb_obj_class(self));
GetPKey(obj, pkey_new);
#define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup( \ #define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup( \
(i2d_of_void *)i2d_DSAPublicKey, (d2i_of_void *)d2i_DSAPublicKey, (char *)(dsa)) (i2d_of_void *)i2d_DSAPublicKey, (d2i_of_void *)d2i_DSAPublicKey, (char *)(dsa))
dsa = DSAPublicKey_dup(EVP_PKEY_get0_DSA(pkey)); dsa = DSAPublicKey_dup(EVP_PKEY_get0_DSA(pkey));
#undef DSAPublicKey_dup #undef DSAPublicKey_dup
obj = dsa_instance(rb_obj_class(self), dsa); if (!dsa)
if (obj == Qfalse) { ossl_raise(eDSAError, "DSAPublicKey_dup");
DSA_free(dsa); if (!EVP_PKEY_assign_DSA(pkey_new, dsa)) {
ossl_raise(eDSAError, NULL); DSA_free(dsa);
ossl_raise(eDSAError, "EVP_PKEY_assign_DSA");
} }
return obj; return obj;
} }

34
ext/openssl/ossl_pkey_ec.c
Просмотреть файл

@ -63,27 +63,6 @@ static ID id_i_group;
static VALUE ec_group_new(const EC_GROUP *group); static VALUE ec_group_new(const EC_GROUP *group);
static VALUE ec_point_new(const EC_POINT *point, const EC_GROUP *group); static VALUE ec_point_new(const EC_POINT *point, const EC_GROUP *group);
static VALUE ec_instance(VALUE klass, EC_KEY *ec)
{
EVP_PKEY *pkey;
VALUE obj;
if (!ec) {
return Qfalse;
}
obj = NewPKey(klass);
if (!(pkey = EVP_PKEY_new())) {
return Qfalse;
}
if (!EVP_PKEY_assign_EC_KEY(pkey, ec)) {
EVP_PKEY_free(pkey);
return Qfalse;
}
SetPKey(obj, pkey);
return obj;
}
/* /*
* Creates a new EC_KEY on the EC group obj. arg can be an EC::Group or a String * Creates a new EC_KEY on the EC group obj. arg can be an EC::Group or a String
* representing an OID. * representing an OID.
@ -130,17 +109,18 @@ ec_key_new_from_group(VALUE arg)
static VALUE static VALUE
ossl_ec_key_s_generate(VALUE klass, VALUE arg) ossl_ec_key_s_generate(VALUE klass, VALUE arg)
{ {
EVP_PKEY *pkey;
EC_KEY *ec; EC_KEY *ec;
VALUE obj; VALUE obj;
obj = rb_obj_alloc(klass);
GetPKey(obj, pkey);
ec = ec_key_new_from_group(arg); ec = ec_key_new_from_group(arg);
if (!EVP_PKEY_assign_EC_KEY(pkey, ec)) {
obj = ec_instance(klass, ec); EC_KEY_free(ec);
if (obj == Qfalse) { ossl_raise(eECError, "EVP_PKEY_assign_EC_KEY");
EC_KEY_free(ec);
ossl_raise(eECError, NULL);
} }
if (!EC_KEY_generate_key(ec)) if (!EC_KEY_generate_key(ec))
ossl_raise(eECError, "EC_KEY_generate_key"); ossl_raise(eECError, "EC_KEY_generate_key");

67
ext/openssl/ossl_pkey_rsa.c
Просмотреть файл

@ -44,31 +44,6 @@ RSA_PRIVATE(VALUE obj, RSA *rsa)
VALUE cRSA; VALUE cRSA;
VALUE eRSAError; VALUE eRSAError;
/*
* Public
*/
static VALUE
rsa_instance(VALUE klass, RSA *rsa)
{
EVP_PKEY *pkey;
VALUE obj;
if (!rsa) {
return Qfalse;
}
obj = NewPKey(klass);
if (!(pkey = EVP_PKEY_new())) {
return Qfalse;
}
if (!EVP_PKEY_assign_RSA(pkey, rsa)) {
EVP_PKEY_free(pkey);
return Qfalse;
}
SetPKey(obj, pkey);
return obj;
}
/* /*
* Private * Private
*/ */
@ -102,7 +77,7 @@ rsa_generate(int size, unsigned long exp)
RSA_free(rsa); RSA_free(rsa);
BN_free(e); BN_free(e);
BN_GENCB_free(cb); BN_GENCB_free(cb);
return NULL; ossl_raise(eRSAError, "malloc failure");
} }
for (i = 0; i < (int)sizeof(exp) * 8; ++i) { for (i = 0; i < (int)sizeof(exp) * 8; ++i) {
if (exp & (1UL << i)) { if (exp & (1UL << i)) {
@ -110,7 +85,7 @@ rsa_generate(int size, unsigned long exp)
BN_free(e); BN_free(e);
RSA_free(rsa); RSA_free(rsa);
BN_GENCB_free(cb); BN_GENCB_free(cb);
return NULL; ossl_raise(eRSAError, "BN_set_bit");
} }
} }
} }
@ -139,7 +114,7 @@ rsa_generate(int size, unsigned long exp)
ossl_clear_error(); ossl_clear_error();
rb_jump_tag(cb_arg.state); rb_jump_tag(cb_arg.state);
} }
return NULL; ossl_raise(eRSAError, "RSA_generate_key_ex");
} }
return rsa; return rsa;
@ -158,26 +133,26 @@ static VALUE
ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass) ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
{ {
/* why does this method exist? why can't initialize take an optional exponent? */ /* why does this method exist? why can't initialize take an optional exponent? */
EVP_PKEY *pkey;
RSA *rsa; RSA *rsa;
VALUE size, exp; VALUE size, exp;
VALUE obj; VALUE obj;
rb_scan_args(argc, argv, "11", &size, &exp); rb_scan_args(argc, argv, "11", &size, &exp);
obj = rb_obj_alloc(klass);
GetPKey(obj, pkey);
rsa = rsa_generate(NUM2INT(size), NIL_P(exp) ? RSA_F4 : NUM2ULONG(exp)); /* err handled by rsa_instance */ rsa = rsa_generate(NUM2INT(size), NIL_P(exp) ? RSA_F4 : NUM2ULONG(exp));
obj = rsa_instance(klass, rsa); if (!EVP_PKEY_assign_RSA(pkey, rsa)) {
RSA_free(rsa);
if (obj == Qfalse) { ossl_raise(eRSAError, "EVP_PKEY_assign_RSA");
RSA_free(rsa);
ossl_raise(eRSAError, NULL);
} }
return obj; return obj;
} }
/* /*
* call-seq: * call-seq:
* RSA.new(key_size) => RSA instance * RSA.new(size [, exponent]) => RSA instance
* RSA.new(encoded_key) => RSA instance * RSA.new(encoded_key) => RSA instance
* RSA.new(encoded_key, pass_phrase) => RSA instance * RSA.new(encoded_key, pass_phrase) => RSA instance
* *
@ -206,10 +181,11 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
GetPKey(self, pkey); GetPKey(self, pkey);
if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) { if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
rsa = RSA_new(); rsa = RSA_new();
if (!rsa)
ossl_raise(eRSAError, "RSA_new");
} }
else if (RB_INTEGER_TYPE_P(arg)) { else if (RB_INTEGER_TYPE_P(arg)) {
rsa = rsa_generate(NUM2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2ULONG(pass)); rsa = rsa_generate(NUM2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2ULONG(pass));
if (!rsa) ossl_raise(eRSAError, NULL);
} }
else { else {
pass = ossl_pem_passwd_value(pass); pass = ossl_pem_passwd_value(pass);
@ -243,7 +219,7 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
} }
if (!EVP_PKEY_assign_RSA(pkey, rsa)) { if (!EVP_PKEY_assign_RSA(pkey, rsa)) {
RSA_free(rsa); RSA_free(rsa);
ossl_raise(eRSAError, NULL); ossl_raise(eRSAError, "EVP_PKEY_assign_RSA");
} }
return self; return self;
@ -787,17 +763,20 @@ ossl_rsa_to_text(VALUE self)
static VALUE static VALUE
ossl_rsa_to_public_key(VALUE self) ossl_rsa_to_public_key(VALUE self)
{ {
EVP_PKEY *pkey; EVP_PKEY *pkey, *pkey_new;
RSA *rsa; RSA *rsa;
VALUE obj; VALUE obj;
GetPKeyRSA(self, pkey); GetPKeyRSA(self, pkey);
/* err check performed by rsa_instance */ obj = rb_obj_alloc(rb_obj_class(self));
GetPKey(obj, pkey_new);
rsa = RSAPublicKey_dup(EVP_PKEY_get0_RSA(pkey)); rsa = RSAPublicKey_dup(EVP_PKEY_get0_RSA(pkey));
obj = rsa_instance(rb_obj_class(self), rsa); if (!rsa)
if (obj == Qfalse) { ossl_raise(eRSAError, "RSAPublicKey_dup");
RSA_free(rsa); if (!EVP_PKEY_assign_RSA(pkey_new, rsa)) {
ossl_raise(eRSAError, NULL); RSA_free(rsa);
ossl_raise(eRSAError, "EVP_PKEY_assign_RSA");
} }
return obj; return obj;
} }