diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 06:42:15 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 06:42:15 +0000 |
| commit | d93187e81581bdcb7d2033c4c47ad33f7af9b966 (patch) | |
| tree | b717acf3254048b510352d78725b5b791682604d /ext | |
| parent | d3a86fe6bd0d5fe11f2b4f96a157b89d9842f8c1 (diff) | |
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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/ossl_digest.c | 2 | ||||
| -rw-r--r-- | ext/openssl/ossl_pkey_ec.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c index ecd52fec9c..2776e786e6 100644 --- a/ext/openssl/ossl_digest.c +++ b/ext/openssl/ossl_digest.c @@ -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) diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c index caa140dc4b..edb5695fb4 100644 --- a/ext/openssl/ossl_pkey_ec.c +++ b/ext/openssl/ossl_pkey_ec.c @@ -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) |