summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/openssl/ossl_digest.c2
-rw-r--r--ext/openssl/ossl_pkey_ec.c4
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e23fc1e67..e8765106fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
+
Wed Dec 31 13:49:06 2008 Tanaka Akira <akr@fsij.org>
* ext/openssl/lib/openssl/buffering.rb (Buffering#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 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)