kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/openssl] Remove taint support

Browse source 
Ruby 2.7 deprecates taint and it no longer has an effect.
The lack of taint support should not cause a problem in
previous Ruby versions.
This commit is contained in:
Jeremy Evans 2019-10-18 12:28:44 -07:00
parent 17e8a6eff4
commit afbd8f384a
Notes: git 2019-11-18 08:01:12 +09:00
3 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/openssl/ossl_rand.c
View file

@ -67,8 +67,6 @@ ossl_rand_add(VALUE self, VALUE str, VALUE entropy)
static VALUE static VALUE
ossl_rand_load_file(VALUE self, VALUE filename) ossl_rand_load_file(VALUE self, VALUE filename)
{ {
rb_check_safe_obj(filename);
if(!RAND_load_file(StringValueCStr(filename), -1)) { if(!RAND_load_file(StringValueCStr(filename), -1)) {
ossl_raise(eRandomError, NULL); ossl_raise(eRandomError, NULL);
} }
@ -86,8 +84,6 @@ ossl_rand_load_file(VALUE self, VALUE filename)
static VALUE static VALUE
ossl_rand_write_file(VALUE self, VALUE filename) ossl_rand_write_file(VALUE self, VALUE filename)
{ {
rb_check_safe_obj(filename);
if (RAND_write_file(StringValueCStr(filename)) == -1) { if (RAND_write_file(StringValueCStr(filename)) == -1) {
ossl_raise(eRandomError, NULL); ossl_raise(eRandomError, NULL);
} }
@ -164,8 +160,6 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len)
static VALUE static VALUE
ossl_rand_egd(VALUE self, VALUE filename) ossl_rand_egd(VALUE self, VALUE filename)
{ {
rb_check_safe_obj(filename);
if (RAND_egd(StringValueCStr(filename)) == -1) { if (RAND_egd(StringValueCStr(filename)) == -1) {
ossl_raise(eRandomError, NULL); ossl_raise(eRandomError, NULL);
} }
@ -186,8 +180,6 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
{ {
int n = NUM2INT(len); int n = NUM2INT(len);
rb_check_safe_obj(filename);
if (RAND_egd_bytes(StringValueCStr(filename), n) == -1) { if (RAND_egd_bytes(StringValueCStr(filename), n) == -1) {
ossl_raise(eRandomError, NULL); ossl_raise(eRandomError, NULL);
} }

1
ext/openssl/ossl_ssl.c
View file

@ -1828,7 +1828,6 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
else else
rb_str_modify_expand(str, ilen - RSTRING_LEN(str)); rb_str_modify_expand(str, ilen - RSTRING_LEN(str));
} }
OBJ_TAINT(str);
rb_str_set_len(str, 0); rb_str_set_len(str, 0);
if (ilen == 0) if (ilen == 0)
return str; return str;

2
ext/openssl/ossl_x509store.c
View file

@ -304,7 +304,6 @@ ossl_x509store_add_file(VALUE self, VALUE file)
char *path = NULL; char *path = NULL;
if(file != Qnil){ if(file != Qnil){
rb_check_safe_obj(file);
path = StringValueCStr(file); path = StringValueCStr(file);
} }
GetX509Store(self, store); GetX509Store(self, store);
@ -340,7 +339,6 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
char *path = NULL; char *path = NULL;
if(dir != Qnil){ if(dir != Qnil){
rb_check_safe_obj(dir);
path = StringValueCStr(dir); path = StringValueCStr(dir);
} }
GetX509Store(self, store); GetX509Store(self, store);