summaryrefslogtreecommitdiff
path: root/ext/openssl
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-14 11:03:22 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-14 11:03:22 +0000
commit19b24f499b00917c924b7e63049311de85a0a3fd (patch)
treee806f27e9608f4f4ac7ccf8493745e3800b16c86 /ext/openssl
parent4155811dc15e2868edf7cb6a7fefd8645c8337a0 (diff)
* include/ruby/ruby.h (rb_check_safe_str): deprecated.
* ext/openssl/ossl_x509store.c (ossl_x509store_add_{file,path}): replaced deprecated funtion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
-rw-r--r--ext/openssl/lib/openssl/digest.rb2
-rw-r--r--ext/openssl/ossl_x509store.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index 4810f0121b..e603c41de4 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -40,7 +40,7 @@ module OpenSSL
super(name, data.first)
}
}
- singleton = (class <<klass; self; end)
+ singleton = (class << klass; self; end)
singleton.class_eval{
define_method(:digest){|data| Digest.digest(name, data) }
define_method(:hexdigest){|data| Digest.hexdigest(name, data) }
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index 68fb372eaa..23fb952305 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -211,7 +211,7 @@ ossl_x509store_add_file(VALUE self, VALUE file)
char *path = NULL;
if(file != Qnil){
- Check_SafeStr(file);
+ SafeStringValue(file);
path = RSTRING_PTR(file);
}
GetX509Store(self, store);
@@ -232,7 +232,7 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
char *path = NULL;
if(dir != Qnil){
- Check_SafeStr(dir);
+ SafeStringValue(dir);
path = RSTRING_PTR(dir);
}
GetX509Store(self, store);