diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-20 09:04:43 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-20 09:04:43 +0000 |
| commit | 69ca9dc5dbdea7b07035751093bfc6ab1209f176 (patch) | |
| tree | c3a7bb259f37d4a3e2b28c7c03db99e228a5b341 | |
| parent | df19ebffd58dbfa1d726ad76a509a0e22ab61e27 (diff) | |
* 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_8@23015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/openssl/ossl_digest.c | 2 | ||||
| -rw-r--r-- | ext/openssl/ossl_pkey_ec.c | 4 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Fri Mar 20 18:01:12 2009 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. + Thu Mar 19 23:18:44 2009 Tanaka Akira <akr@fsij.org> * ext/openssl/ossl_ssl.c: revert incomplete read_nonblock 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 3273700f10..8ef5c53300 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) @@ -774,7 +774,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) |