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_ssl.c: check SSL method name

Browse source 
* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ssl_version): SSL method
  name must not contain NUL.  preserve the encoding of message.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-08-15 04:34:29 +00:00
parent 33e39a7657
commit 13f33b22e1
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/openssl/ossl_ssl.c
View file

@ -180,7 +180,7 @@ ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
SSL_CTX *ctx; SSL_CTX *ctx;
if (RB_TYPE_P(ssl_method, T_SYMBOL)) if (RB_TYPE_P(ssl_method, T_SYMBOL))
m = rb_sym2str(ssl_method); m = rb_sym2str(ssl_method);
s = StringValuePtr(m); s = StringValueCStr(m);
for (i = 0; i < numberof(ossl_ssl_method_tab); i++) { for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
if (strcmp(ossl_ssl_method_tab[i].name, s) == 0) { if (strcmp(ossl_ssl_method_tab[i].name, s) == 0) {
method = ossl_ssl_method_tab[i].func(); method = ossl_ssl_method_tab[i].func();
@ -188,7 +188,7 @@ ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
} }
} }
if (!method) { if (!method) {
ossl_raise(rb_eArgError, "unknown SSL method `%s'.", s); ossl_raise(rb_eArgError, "unknown SSL method `%"PRIsVALUE"'.", m);
} }
GetSSLCTX(self, ctx); GetSSLCTX(self, ctx);
if (SSL_CTX_set_ssl_version(ctx, method) != 1) { if (SSL_CTX_set_ssl_version(ctx, method) != 1) {

10
test/openssl/test_ssl.rb
View file

@ -10,6 +10,16 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
assert_equal(ctx.setup, nil) assert_equal(ctx.setup, nil)
end end
def test_ctx_setup_invalid
m = OpenSSL::SSL::SSLContext::METHODS.first
assert_raise_with_message(ArgumentError, /null/) {
OpenSSL::SSL::SSLContext.new("#{m}\0")
}
assert_raise_with_message(ArgumentError, /\u{ff33 ff33 ff2c}/) {
OpenSSL::SSL::SSLContext.new("\u{ff33 ff33 ff2c}")
}
end
def test_options_defaults_to_OP_ALL def test_options_defaults_to_OP_ALL
ctx = OpenSSL::SSL::SSLContext.new ctx = OpenSSL::SSL::SSLContext.new
assert_equal OpenSSL::SSL::OP_ALL, ctx.options assert_equal OpenSSL::SSL::OP_ALL, ctx.options