From 9a6649e5aff63183b8cd69995ee4a2d6a38c1d57 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 1 Jan 2009 06:42:15 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ ext/openssl/ossl_digest.c | 2 +- ext/openssl/ossl_pkey_ec.c | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5a8e0588..4a5026bad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Dec 31 14:52:33 2008 Tanaka Akira + + * 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 * ext/socket/mkconstants.rb: use sock_define_uconst for INADDR_* diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c index ecd52fec9..2776e786e 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 caa140dc4..edb5695fb 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) -- cgit