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

* ossl_config.c (ossl_config_add_value_m, ossl_config_set_section): Check if frozen (or untrusted for $SECURE >= 4) [ruby-core:18377]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2009-09-21 16:12:46 +00:00
parent 2d8a79fa47
commit cf69eeab9c
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Sep 22 01:10:02 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* ossl_config.c (ossl_config_add_value_m, ossl_config_set_section):
Check if frozen (or untrusted for $SECURE >= 4) [ruby-core:18377]
Mon Sep 21 17:12:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (proc_binding): allow proc from method. [ruby-core:25589]

10
ext/openssl/ossl_config.c
View file

@ -192,10 +192,19 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
#endif
}
static void
rb_ossl_config_modify_check(VALUE config)
{
if (OBJ_FROZEN(config)) rb_error_frozen("OpenSSL::Config");
if (!OBJ_UNTRUSTED(config) && rb_safe_level() >= 4)
rb_raise(rb_eSecurityError, "Insecure: can't modify OpenSSL config");
}
#if !defined(OSSL_NO_CONF_API)
static VALUE
ossl_config_add_value_m(VALUE self, VALUE section, VALUE name, VALUE value)
{
rb_ossl_config_modify_check(self);
return ossl_config_add_value(self, section, name, value);
}
#else
@ -257,6 +266,7 @@ ossl_config_set_section(VALUE self, VALUE section, VALUE hash)
{
VALUE arg[2];
rb_ossl_config_modify_check(self);
arg[0] = self;
arg[1] = section;
rb_block_call(hash, rb_intern("each"), 0, 0, set_conf_section_i, (VALUE)arg);