mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merges r21208 from trunk into ruby_1_9_1.
* ext/openssl/ossl_digest.c (GetDigestPtr): use StringValueCStr instead of STR2CSTR. * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto. (ossl_ec_group_initialize): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d3a86fe6bd
commit
d93187e815
3 changed files with 11 additions and 3 deletions
|
|
@ -1,3 +1,11 @@
|
|||
Wed Dec 31 14:52:33 2008 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/openssl/ossl_digest.c (GetDigestPtr): use StringValueCStr
|
||||
instead of STR2CSTR.
|
||||
|
||||
* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto.
|
||||
(ossl_ec_group_initialize): ditto.
|
||||
|
||||
Tue Dec 30 21:17:00 2008 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/socket/mkconstants.rb: use sock_define_uconst for INADDR_*
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ GetDigestPtr(VALUE obj)
|
|||
const EVP_MD *md;
|
||||
|
||||
if (TYPE(obj) == T_STRING) {
|
||||
const char *name = STR2CSTR(obj);
|
||||
const char *name = StringValueCStr(obj);
|
||||
|
||||
md = EVP_get_digestbyname(name);
|
||||
if (!md)
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
|
|||
BIO_free(in);
|
||||
|
||||
if (ec == NULL) {
|
||||
const char *name = STR2CSTR(arg);
|
||||
const char *name = StringValueCStr(arg);
|
||||
int nid = OBJ_sn2nid(name);
|
||||
|
||||
if (nid == NID_undef)
|
||||
|
|
@ -785,7 +785,7 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
|
|||
BIO_free(in);
|
||||
|
||||
if (!group) {
|
||||
const char *name = STR2CSTR(arg1);
|
||||
const char *name = StringValueCStr(arg1);
|
||||
int nid = OBJ_sn2nid(name);
|
||||
|
||||
if (nid == NID_undef)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue