diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/lib/openssl/digest.rb | 2 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509store.c | 4 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 2 |
4 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Fri Aug 14 20:03:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/ruby.h (rb_check_safe_str): deprecated. + + * ext/openssl/ossl_x509store.c (ossl_x509store_add_{file,path}): + replaced deprecated funtion. + Fri Aug 14 17:59:12 2009 NARUSE, Yui <naruse@ruby-lang.org> * re.c (rb_reg_preprocess_dregexp): change Exception class to 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); diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 25459266a1..0df679791a 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -401,7 +401,7 @@ char *rb_string_value_cstr(volatile VALUE*); #define StringValueCStr(v) rb_string_value_cstr(&(v)) void rb_check_safe_obj(VALUE); -void rb_check_safe_str(VALUE); +DEPRECATED(void rb_check_safe_str(VALUE)); #define SafeStringValue(v) do {\ StringValue(v);\ rb_check_safe_obj(v);\ |