2003-07-23 12:12:24 -04:00
|
|
|
/*
|
|
|
|
* $Id$
|
|
|
|
* 'OpenSSL for Ruby' project
|
|
|
|
* Copyright (C) 2000-2002 GOTOU Yuuzou <gotoyuzo@notwork.org>
|
|
|
|
* Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
|
|
* All rights reserved.
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
* This program is licenced under the same licence as Ruby.
|
|
|
|
* (See the file 'LICENCE'.)
|
|
|
|
*/
|
|
|
|
#include "ossl.h"
|
|
|
|
#include <rubysig.h>
|
|
|
|
#include <rubyio.h>
|
|
|
|
|
|
|
|
#if defined(HAVE_UNISTD_H)
|
|
|
|
# include <unistd.h> /* for read(), and write() */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define numberof(ary) (sizeof(ary)/sizeof(ary[0]))
|
|
|
|
|
2003-07-26 08:27:04 -04:00
|
|
|
#ifdef _WIN32
|
2003-07-25 12:40:26 -04:00
|
|
|
# define TO_SOCKET(s) _get_osfhandle(s)
|
|
|
|
#else
|
|
|
|
# define TO_SOCKET(s) s
|
|
|
|
#endif
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
VALUE mSSL;
|
|
|
|
VALUE eSSLError;
|
|
|
|
VALUE cSSLContext;
|
|
|
|
VALUE cSSLSocket;
|
|
|
|
|
|
|
|
#define ossl_sslctx_set_cert(o,v) rb_iv_set((o),"@cert",(v))
|
|
|
|
#define ossl_sslctx_set_key(o,v) rb_iv_set((o),"@key",(v))
|
|
|
|
#define ossl_sslctx_set_client_ca(o,v) rb_iv_set((o),"@client_ca",(v))
|
|
|
|
#define ossl_sslctx_set_ca_file(o,v) rb_iv_set((o),"@ca_file",(v))
|
|
|
|
#define ossl_sslctx_set_ca_path(o,v) rb_iv_set((o),"@ca_path",(v))
|
|
|
|
#define ossl_sslctx_set_timeout(o,v) rb_iv_set((o),"@timeout",(v))
|
|
|
|
#define ossl_sslctx_set_verify_mode(o,v) rb_iv_set((o),"@verify_mode",(v))
|
|
|
|
#define ossl_sslctx_set_verify_dep(o,v) rb_iv_set((o),"@verify_depth",(v))
|
|
|
|
#define ossl_sslctx_set_verify_cb(o,v) rb_iv_set((o),"@verify_callback",(v))
|
|
|
|
#define ossl_sslctx_set_options(o,v) rb_iv_set((o),"@options",(v))
|
|
|
|
#define ossl_sslctx_set_cert_store(o,v) rb_iv_set((o),"@cert_store",(v))
|
2003-10-29 12:27:59 -05:00
|
|
|
#define ossl_sslctx_set_extra_cert(o,v) rb_iv_set((o),"@extra_chain_cert",(v))
|
2005-03-09 05:45:42 -05:00
|
|
|
#define ossl_sslctx_set_client_cert_cb(o,v) rb_iv_set((o),"@client_cert_cb",(v))
|
|
|
|
#define ossl_sslctx_set_tmp_dh_cb(o,v) rb_iv_set((o),"@tmp_dh_callback",(v))
|
2005-05-22 06:18:41 -04:00
|
|
|
#define ossl_sslctx_set_sess_id_ctx(o, v) rb_iv_get((o),"@session_id_context"(v))
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
#define ossl_sslctx_get_cert(o) rb_iv_get((o),"@cert")
|
|
|
|
#define ossl_sslctx_get_key(o) rb_iv_get((o),"@key")
|
|
|
|
#define ossl_sslctx_get_client_ca(o) rb_iv_get((o),"@client_ca")
|
|
|
|
#define ossl_sslctx_get_ca_file(o) rb_iv_get((o),"@ca_file")
|
|
|
|
#define ossl_sslctx_get_ca_path(o) rb_iv_get((o),"@ca_path")
|
|
|
|
#define ossl_sslctx_get_timeout(o) rb_iv_get((o),"@timeout")
|
|
|
|
#define ossl_sslctx_get_verify_mode(o) rb_iv_get((o),"@verify_mode")
|
|
|
|
#define ossl_sslctx_get_verify_dep(o) rb_iv_get((o),"@verify_depth")
|
|
|
|
#define ossl_sslctx_get_verify_cb(o) rb_iv_get((o),"@verify_callback")
|
|
|
|
#define ossl_sslctx_get_options(o) rb_iv_get((o),"@options")
|
|
|
|
#define ossl_sslctx_get_cert_store(o) rb_iv_get((o),"@cert_store")
|
2003-10-29 12:27:59 -05:00
|
|
|
#define ossl_sslctx_get_extra_cert(o) rb_iv_get((o),"@extra_chain_cert")
|
2005-03-09 05:45:42 -05:00
|
|
|
#define ossl_sslctx_get_client_cert_cb(o) rb_iv_get((o),"@client_cert_cb")
|
|
|
|
#define ossl_sslctx_get_tmp_dh_cb(o) rb_iv_get((o),"@tmp_dh_callback")
|
2005-05-22 06:18:41 -04:00
|
|
|
#define ossl_sslctx_get_sess_id_ctx(o) rb_iv_get((o),"@session_id_context")
|
2003-07-23 12:12:24 -04:00
|
|
|
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
static const char *ossl_sslctx_attrs[] = {
|
2003-07-23 12:12:24 -04:00
|
|
|
"cert", "key", "client_ca", "ca_file", "ca_path",
|
|
|
|
"timeout", "verify_mode", "verify_depth",
|
2005-03-09 05:45:42 -05:00
|
|
|
"verify_callback", "options", "cert_store", "extra_chain_cert",
|
2005-05-22 06:18:41 -04:00
|
|
|
"client_cert_cb", "tmp_dh_callback", "session_id_context",
|
2003-07-23 12:12:24 -04:00
|
|
|
};
|
|
|
|
|
2005-03-09 05:45:42 -05:00
|
|
|
#define ossl_ssl_get_io(o) rb_iv_get((o),"@io")
|
|
|
|
#define ossl_ssl_get_ctx(o) rb_iv_get((o),"@context")
|
|
|
|
#define ossl_ssl_get_sync_close(o) rb_iv_get((o),"@sync_close")
|
|
|
|
#define ossl_ssl_get_x509(o) rb_iv_get((o),"@x509")
|
|
|
|
#define ossl_ssl_get_key(o) rb_iv_get((o),"@key")
|
|
|
|
#define ossl_ssl_get_tmp_dh(o) rb_iv_get((o),"@tmp_dh")
|
|
|
|
|
|
|
|
#define ossl_ssl_set_io(o,v) rb_iv_set((o),"@io",(v))
|
|
|
|
#define ossl_ssl_set_ctx(o,v) rb_iv_set((o),"@context",(v))
|
|
|
|
#define ossl_ssl_set_sync_close(o,v) rb_iv_set((o),"@sync_close",(v))
|
|
|
|
#define ossl_ssl_set_x509(o,v) rb_iv_set((o),"@x509",(v))
|
|
|
|
#define ossl_ssl_set_key(o,v) rb_iv_set((o),"@key",(v))
|
|
|
|
#define ossl_ssl_set_tmp_dh(o,v) rb_iv_set((o),"@tmp_dh",(v))
|
|
|
|
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
static const char *ossl_ssl_attr_readers[] = { "io", "context", };
|
|
|
|
static const char *ossl_ssl_attrs[] = { "sync_close", };
|
2005-03-09 05:45:42 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* SSLContext class
|
|
|
|
*/
|
2003-07-23 12:12:24 -04:00
|
|
|
struct {
|
|
|
|
const char *name;
|
|
|
|
SSL_METHOD *(*func)(void);
|
|
|
|
} ossl_ssl_method_tab[] = {
|
|
|
|
#define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method }
|
|
|
|
OSSL_SSL_METHOD_ENTRY(TLSv1),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(TLSv1_server),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(TLSv1_client),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(SSLv2),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(SSLv2_server),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(SSLv2_client),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(SSLv3),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(SSLv3_server),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(SSLv3_client),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(SSLv23),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(SSLv23_server),
|
|
|
|
OSSL_SSL_METHOD_ENTRY(SSLv23_client),
|
|
|
|
#undef OSSL_SSL_METHOD_ENTRY
|
|
|
|
};
|
|
|
|
|
|
|
|
int ossl_ssl_ex_vcb_idx;
|
|
|
|
int ossl_ssl_ex_store_p;
|
2005-03-09 05:45:42 -05:00
|
|
|
int ossl_ssl_ex_ptr_idx;
|
|
|
|
int ossl_ssl_ex_client_cert_cb_idx;
|
|
|
|
int ossl_ssl_ex_tmp_dh_callback_idx;
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
static void
|
|
|
|
ossl_sslctx_free(SSL_CTX *ctx)
|
|
|
|
{
|
|
|
|
if(ctx && SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_store_p)== (void*)1)
|
|
|
|
ctx->cert_store = NULL;
|
|
|
|
SSL_CTX_free(ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_sslctx_s_alloc(VALUE klass)
|
|
|
|
{
|
|
|
|
SSL_CTX *ctx;
|
|
|
|
|
|
|
|
ctx = SSL_CTX_new(SSLv23_method());
|
|
|
|
if (!ctx) {
|
|
|
|
ossl_raise(eSSLError, "SSL_CTX_new:");
|
|
|
|
}
|
2003-08-09 21:54:05 -04:00
|
|
|
SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
|
2003-07-23 12:12:24 -04:00
|
|
|
SSL_CTX_set_options(ctx, SSL_OP_ALL);
|
|
|
|
return Data_Wrap_Struct(klass, 0, ossl_sslctx_free, ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
|
|
|
|
{
|
|
|
|
VALUE ssl_method;
|
|
|
|
SSL_METHOD *method = NULL;
|
|
|
|
SSL_CTX *ctx;
|
|
|
|
int i;
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
const char *s;
|
2003-07-23 12:12:24 -04:00
|
|
|
|
2003-07-30 02:58:43 -04:00
|
|
|
for(i = 0; i < numberof(ossl_sslctx_attrs); i++){
|
|
|
|
char buf[32];
|
|
|
|
snprintf(buf, sizeof(buf), "@%s", ossl_sslctx_attrs[i]);
|
|
|
|
rb_iv_set(self, buf, Qnil);
|
|
|
|
}
|
2003-07-23 12:12:24 -04:00
|
|
|
if (rb_scan_args(argc, argv, "01", &ssl_method) == 0){
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
if(TYPE(ssl_method) == T_SYMBOL)
|
|
|
|
s = rb_id2name(SYM2ID(ssl_method));
|
|
|
|
else
|
|
|
|
s = StringValuePtr(ssl_method);
|
|
|
|
for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
|
|
|
|
if (strcmp(ossl_ssl_method_tab[i].name, s) == 0) {
|
|
|
|
method = ossl_ssl_method_tab[i].func();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!method) {
|
|
|
|
ossl_raise(rb_eArgError, "unknown SSL method `%s'.", s);
|
|
|
|
}
|
2004-12-15 01:35:55 -05:00
|
|
|
Data_Get_Struct(self, SSL_CTX, ctx);
|
2003-07-23 12:12:24 -04:00
|
|
|
if (SSL_CTX_set_ssl_version(ctx, method) != 1) {
|
|
|
|
ossl_raise(eSSLError, "SSL_CTX_set_ssl_version:");
|
|
|
|
}
|
|
|
|
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2005-03-09 05:45:42 -05:00
|
|
|
static VALUE
|
|
|
|
ossl_call_client_cert_cb(VALUE obj)
|
|
|
|
{
|
|
|
|
VALUE cb, ary, cert, key;
|
|
|
|
SSL *ssl;
|
|
|
|
|
|
|
|
Data_Get_Struct(obj, SSL, ssl);
|
|
|
|
cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_client_cert_cb_idx);
|
|
|
|
if (NIL_P(cb)) return Qfalse;
|
|
|
|
ary = rb_funcall(cb, rb_intern("call"), 1, obj);
|
|
|
|
Check_Type(ary, T_ARRAY);
|
|
|
|
GetX509CertPtr(cert = rb_ary_entry(ary, 0));
|
|
|
|
GetPKeyPtr(key = rb_ary_entry(ary, 1));
|
|
|
|
ossl_ssl_set_x509(obj, cert);
|
|
|
|
ossl_ssl_set_key(obj, key);
|
|
|
|
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ossl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
|
|
|
|
{
|
|
|
|
VALUE obj;
|
|
|
|
int status, success;
|
|
|
|
|
|
|
|
obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
|
|
|
|
success = rb_protect((VALUE(*)_((VALUE)))ossl_call_client_cert_cb,
|
|
|
|
obj, &status);
|
|
|
|
if (status || !success) return 0;
|
|
|
|
*x509 = DupX509CertPtr(ossl_ssl_get_x509(obj));
|
|
|
|
*pkey = DupPKeyPtr(ossl_ssl_get_key(obj));
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if !defined(OPENSSL_NO_DH)
|
|
|
|
static VALUE
|
|
|
|
ossl_call_tmp_dh_callback(VALUE *args)
|
|
|
|
{
|
|
|
|
SSL *ssl;
|
|
|
|
VALUE cb, dh;
|
|
|
|
EVP_PKEY *pkey;
|
|
|
|
|
|
|
|
Data_Get_Struct(args[0], SSL, ssl);
|
|
|
|
cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx);
|
|
|
|
if (NIL_P(cb)) return Qfalse;
|
|
|
|
dh = rb_funcall(cb, rb_intern("call"), 3, args[0], args[1], args[2]);
|
|
|
|
pkey = GetPKeyPtr(dh);
|
|
|
|
if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) return Qfalse;
|
2005-03-12 12:15:29 -05:00
|
|
|
ossl_ssl_set_tmp_dh(args[0], dh);
|
2005-03-09 05:45:42 -05:00
|
|
|
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
|
|
|
static DH*
|
|
|
|
ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
|
|
|
|
{
|
2005-03-12 12:38:37 -05:00
|
|
|
VALUE args[3];
|
2005-03-09 05:45:42 -05:00
|
|
|
int status, success;
|
|
|
|
|
|
|
|
args[0] = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
|
|
|
|
args[1] = INT2FIX(is_export);
|
|
|
|
args[2] = INT2FIX(keylength);
|
|
|
|
success = rb_protect((VALUE(*)_((VALUE)))ossl_call_tmp_dh_callback,
|
|
|
|
(VALUE)args, &status);
|
|
|
|
if (status || !success) return NULL;
|
|
|
|
|
2005-03-12 12:38:37 -05:00
|
|
|
return GetPKeyPtr(ossl_ssl_get_tmp_dh(args[0]))->pkey.dh;
|
2005-03-09 05:45:42 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static DH*
|
|
|
|
ossl_default_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
|
|
|
|
{
|
|
|
|
switch(keylength){
|
|
|
|
case 512:
|
|
|
|
return OSSL_DEFAULT_DH_512;
|
|
|
|
case 1024:
|
|
|
|
return OSSL_DEFAULT_DH_1024;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif /* OPENSSL_NO_DH */
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
static int
|
|
|
|
ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
|
|
|
|
{
|
|
|
|
VALUE cb;
|
|
|
|
SSL *ssl;
|
|
|
|
|
|
|
|
ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
|
|
|
|
cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_vcb_idx);
|
|
|
|
X509_STORE_CTX_set_ex_data(ctx, ossl_verify_cb_idx, (void*)cb);
|
|
|
|
return ossl_verify_cb(preverify_ok, ctx);
|
|
|
|
}
|
|
|
|
|
2003-10-29 12:27:59 -05:00
|
|
|
static VALUE
|
|
|
|
ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
|
|
|
|
{
|
|
|
|
X509 *x509;
|
|
|
|
SSL_CTX *ctx;
|
|
|
|
|
|
|
|
Data_Get_Struct(arg, SSL_CTX, ctx);
|
|
|
|
x509 = DupX509CertPtr(i);
|
|
|
|
if(!SSL_CTX_add_extra_chain_cert(ctx, x509)){
|
|
|
|
ossl_raise(eSSLError, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
static VALUE
|
|
|
|
ossl_sslctx_setup(VALUE self)
|
|
|
|
{
|
|
|
|
SSL_CTX *ctx;
|
|
|
|
X509 *cert = NULL, *client_ca = NULL;
|
|
|
|
X509_STORE *store;
|
|
|
|
EVP_PKEY *key = NULL;
|
|
|
|
char *ca_path = NULL, *ca_file = NULL;
|
|
|
|
int i, verify_mode;
|
|
|
|
VALUE val;
|
|
|
|
|
|
|
|
if(OBJ_FROZEN(self)) return Qnil;
|
|
|
|
Data_Get_Struct(self, SSL_CTX, ctx);
|
|
|
|
|
2005-03-09 05:45:42 -05:00
|
|
|
#if !defined(OPENSSL_NO_DH)
|
|
|
|
if (RTEST(ossl_sslctx_get_tmp_dh_cb(self))){
|
|
|
|
SSL_CTX_set_tmp_dh_callback(ctx, ossl_tmp_dh_callback);
|
|
|
|
}
|
|
|
|
else{
|
|
|
|
rb_warning("using default DH parameters.");
|
|
|
|
SSL_CTX_set_tmp_dh_callback(ctx, ossl_default_tmp_dh_callback);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
val = ossl_sslctx_get_cert_store(self);
|
|
|
|
if(!NIL_P(val)){
|
|
|
|
/*
|
|
|
|
* WORKAROUND:
|
|
|
|
* X509_STORE can count references, but
|
|
|
|
* X509_STORE_free() doesn't care it.
|
|
|
|
* So we won't increment it but mark it by ex_data.
|
|
|
|
*/
|
|
|
|
store = GetX509StorePtr(val); /* NO NEED TO DUP */
|
|
|
|
SSL_CTX_set_cert_store(ctx, store);
|
|
|
|
SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_store_p, (void*)1);
|
|
|
|
}
|
|
|
|
|
2003-10-29 12:27:59 -05:00
|
|
|
val = ossl_sslctx_get_extra_cert(self);
|
|
|
|
if(!NIL_P(val)){
|
2006-02-03 04:15:42 -05:00
|
|
|
rb_block_call(val, rb_intern("each"), 0, 0, ossl_sslctx_add_extra_chain_cert_i, self);
|
2003-10-29 12:27:59 -05:00
|
|
|
}
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
/* private key may be bundled in certificate file. */
|
|
|
|
val = ossl_sslctx_get_cert(self);
|
|
|
|
cert = NIL_P(val) ? NULL : GetX509CertPtr(val); /* NO DUP NEEDED */
|
|
|
|
val = ossl_sslctx_get_key(self);
|
|
|
|
key = NIL_P(val) ? NULL : GetPKeyPtr(val); /* NO DUP NEEDED */
|
|
|
|
if (cert && key) {
|
|
|
|
if (!SSL_CTX_use_certificate(ctx, cert)) {
|
|
|
|
/* Adds a ref => Safe to FREE */
|
|
|
|
ossl_raise(eSSLError, "SSL_CTX_use_certificate:");
|
|
|
|
}
|
|
|
|
if (!SSL_CTX_use_PrivateKey(ctx, key)) {
|
|
|
|
/* Adds a ref => Safe to FREE */
|
|
|
|
ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey:");
|
|
|
|
}
|
|
|
|
if (!SSL_CTX_check_private_key(ctx)) {
|
|
|
|
ossl_raise(eSSLError, "SSL_CTX_check_private_key:");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
val = ossl_sslctx_get_client_ca(self);
|
|
|
|
if(!NIL_P(val)){
|
|
|
|
if(TYPE(val) == T_ARRAY){
|
2006-09-02 10:42:08 -04:00
|
|
|
for(i = 0; i < RARRAY_LEN(val); i++){
|
|
|
|
client_ca = GetX509CertPtr(RARRAY_PTR(val)[i]);
|
2003-07-23 12:12:24 -04:00
|
|
|
if (!SSL_CTX_add_client_CA(ctx, client_ca)){
|
|
|
|
/* Copies X509_NAME => FREE it. */
|
|
|
|
ossl_raise(eSSLError, "SSL_CTX_add_client_CA");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else{
|
|
|
|
client_ca = GetX509CertPtr(val); /* NO DUP NEEDED. */
|
|
|
|
if (!SSL_CTX_add_client_CA(ctx, client_ca)){
|
|
|
|
/* Copies X509_NAME => FREE it. */
|
|
|
|
ossl_raise(eSSLError, "SSL_CTX_add_client_CA");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
val = ossl_sslctx_get_ca_file(self);
|
|
|
|
ca_file = NIL_P(val) ? NULL : StringValuePtr(val);
|
|
|
|
val = ossl_sslctx_get_ca_path(self);
|
|
|
|
ca_path = NIL_P(val) ? NULL : StringValuePtr(val);
|
|
|
|
if(ca_file || ca_path){
|
|
|
|
if (!SSL_CTX_load_verify_locations(ctx, ca_file, ca_path))
|
|
|
|
rb_warning("can't set verify locations");
|
|
|
|
}
|
|
|
|
|
|
|
|
val = ossl_sslctx_get_verify_mode(self);
|
|
|
|
verify_mode = NIL_P(val) ? SSL_VERIFY_NONE : NUM2INT(val);
|
|
|
|
SSL_CTX_set_verify(ctx, verify_mode, ossl_ssl_verify_callback);
|
2005-03-09 05:45:42 -05:00
|
|
|
if (RTEST(ossl_sslctx_get_client_cert_cb(self)))
|
|
|
|
SSL_CTX_set_client_cert_cb(ctx, ossl_client_cert_cb);
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
val = ossl_sslctx_get_timeout(self);
|
|
|
|
if(!NIL_P(val)) SSL_CTX_set_timeout(ctx, NUM2LONG(val));
|
|
|
|
|
|
|
|
val = ossl_sslctx_get_verify_dep(self);
|
|
|
|
if(!NIL_P(val)) SSL_CTX_set_verify_depth(ctx, NUM2LONG(val));
|
|
|
|
|
|
|
|
val = ossl_sslctx_get_options(self);
|
|
|
|
if(!NIL_P(val)) SSL_CTX_set_options(ctx, NUM2LONG(val));
|
|
|
|
rb_obj_freeze(self);
|
|
|
|
|
2005-05-22 06:18:41 -04:00
|
|
|
val = ossl_sslctx_get_sess_id_ctx(self);
|
|
|
|
if (!NIL_P(val)){
|
|
|
|
StringValue(val);
|
2006-08-31 06:30:33 -04:00
|
|
|
if (!SSL_CTX_set_session_id_context(ctx, RSTRING_PTR(val),
|
|
|
|
RSTRING_LEN(val))){
|
2005-05-22 06:18:41 -04:00
|
|
|
ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
|
|
|
|
{
|
|
|
|
VALUE ary;
|
|
|
|
int bits, alg_bits;
|
|
|
|
|
|
|
|
ary = rb_ary_new2(4);
|
|
|
|
rb_ary_push(ary, rb_str_new2(SSL_CIPHER_get_name(cipher)));
|
|
|
|
rb_ary_push(ary, rb_str_new2(SSL_CIPHER_get_version(cipher)));
|
|
|
|
bits = SSL_CIPHER_get_bits(cipher, &alg_bits);
|
|
|
|
rb_ary_push(ary, INT2FIX(bits));
|
|
|
|
rb_ary_push(ary, INT2FIX(alg_bits));
|
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_sslctx_get_ciphers(VALUE self)
|
|
|
|
{
|
|
|
|
SSL_CTX *ctx;
|
|
|
|
STACK_OF(SSL_CIPHER) *ciphers;
|
|
|
|
SSL_CIPHER *cipher;
|
|
|
|
VALUE ary;
|
|
|
|
int i, num;
|
|
|
|
|
|
|
|
Data_Get_Struct(self, SSL_CTX, ctx);
|
|
|
|
if(!ctx){
|
|
|
|
rb_warning("SSL_CTX is not initialized.");
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
ciphers = ctx->cipher_list;
|
|
|
|
|
|
|
|
if (!ciphers)
|
|
|
|
return rb_ary_new();
|
|
|
|
|
|
|
|
num = sk_num((STACK*)ciphers);
|
|
|
|
ary = rb_ary_new2(num);
|
|
|
|
for(i = 0; i < num; i++){
|
|
|
|
cipher = (SSL_CIPHER*)sk_value((STACK*)ciphers, i);
|
|
|
|
rb_ary_push(ary, ossl_ssl_cipher_to_ary(cipher));
|
|
|
|
}
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_sslctx_set_ciphers(VALUE self, VALUE v)
|
|
|
|
{
|
|
|
|
SSL_CTX *ctx;
|
|
|
|
VALUE str, elem;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
rb_check_frozen(self);
|
2005-03-09 05:45:42 -05:00
|
|
|
if (NIL_P(v))
|
|
|
|
return v;
|
|
|
|
else if (TYPE(v) == T_ARRAY) {
|
2006-03-15 02:42:00 -05:00
|
|
|
str = rb_str_new(0, 0);
|
2006-09-02 10:42:08 -04:00
|
|
|
for (i = 0; i < RARRAY_LEN(v); i++) {
|
2003-07-23 12:12:24 -04:00
|
|
|
elem = rb_ary_entry(v, i);
|
|
|
|
if (TYPE(elem) == T_ARRAY) elem = rb_ary_entry(elem, 0);
|
|
|
|
elem = rb_String(elem);
|
|
|
|
rb_str_append(str, elem);
|
2006-09-02 10:42:08 -04:00
|
|
|
if (i < RARRAY_LEN(v)-1) rb_str_cat2(str, ":");
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
str = v;
|
|
|
|
StringValue(str);
|
|
|
|
}
|
|
|
|
|
2004-12-15 01:35:55 -05:00
|
|
|
Data_Get_Struct(self, SSL_CTX, ctx);
|
|
|
|
if(!ctx){
|
|
|
|
ossl_raise(eSSLError, "SSL_CTX is not initialized.");
|
|
|
|
return Qnil;
|
|
|
|
}
|
2006-08-31 06:30:33 -04:00
|
|
|
if (!SSL_CTX_set_cipher_list(ctx, RSTRING_PTR(str))) {
|
2005-08-22 16:47:55 -04:00
|
|
|
ossl_raise(eSSLError, "SSL_CTX_set_cipher_list:");
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
2005-03-09 05:45:42 -05:00
|
|
|
|
|
|
|
return v;
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* SSLSocket class
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
ossl_ssl_shutdown(SSL *ssl)
|
|
|
|
{
|
|
|
|
if (ssl) {
|
|
|
|
SSL_shutdown(ssl);
|
|
|
|
SSL_clear(ssl);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ossl_ssl_free(SSL *ssl)
|
|
|
|
{
|
|
|
|
ossl_ssl_shutdown(ssl);
|
|
|
|
SSL_free(ssl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_ssl_s_alloc(VALUE klass)
|
|
|
|
{
|
|
|
|
return Data_Wrap_Struct(klass, 0, ossl_ssl_free, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
|
|
|
|
{
|
|
|
|
VALUE io, ctx;
|
|
|
|
|
|
|
|
if (rb_scan_args(argc, argv, "11", &io, &ctx) == 1) {
|
|
|
|
ctx = rb_funcall(cSSLContext, rb_intern("new"), 0);
|
|
|
|
}
|
|
|
|
OSSL_Check_Kind(ctx, cSSLContext);
|
|
|
|
Check_Type(io, T_FILE);
|
|
|
|
ossl_ssl_set_io(self, io);
|
|
|
|
ossl_ssl_set_ctx(self, ctx);
|
2003-08-18 18:49:48 -04:00
|
|
|
ossl_ssl_set_sync_close(self, Qfalse);
|
2003-07-23 12:12:24 -04:00
|
|
|
ossl_sslctx_setup(ctx);
|
2003-10-29 12:27:59 -05:00
|
|
|
rb_call_super(0, 0);
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_ssl_setup(VALUE self)
|
|
|
|
{
|
2005-03-09 05:45:42 -05:00
|
|
|
VALUE io, v_ctx, cb;
|
2003-07-23 12:12:24 -04:00
|
|
|
SSL_CTX *ctx;
|
|
|
|
SSL *ssl;
|
* file.c, gc.c, io.c, ruby.h, rubyio.h, win32/win32.h (rb_io_t):
renamed from OpenFile.
* ext/dl/cptr.c, ext/io/wait/wait.c, ext/openssl/ossl.h,
ext/openssl/ossl_bio.c, ext/openssl/ossl_ssl.c, ext/pty/pty.c,
ext/readline/readline.c, ext/socket/socket.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-24 05:30:50 -05:00
|
|
|
rb_io_t *fptr;
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
|
|
|
if(!ssl){
|
|
|
|
v_ctx = ossl_ssl_get_ctx(self);
|
|
|
|
Data_Get_Struct(v_ctx, SSL_CTX, ctx);
|
|
|
|
|
|
|
|
ssl = SSL_new(ctx);
|
|
|
|
if (!ssl) {
|
|
|
|
ossl_raise(eSSLError, "SSL_new:");
|
|
|
|
}
|
|
|
|
DATA_PTR(self) = ssl;
|
|
|
|
|
|
|
|
io = ossl_ssl_get_io(self);
|
|
|
|
GetOpenFile(io, fptr);
|
|
|
|
rb_io_check_readable(fptr);
|
|
|
|
rb_io_check_writable(fptr);
|
2007-04-02 15:00:23 -04:00
|
|
|
SSL_set_fd(ssl, TO_SOCKET(FPTR_TO_FD(fptr)));
|
2005-03-09 05:45:42 -05:00
|
|
|
SSL_set_ex_data(ssl, ossl_ssl_ex_ptr_idx, (void*)self);
|
|
|
|
cb = ossl_sslctx_get_verify_cb(v_ctx);
|
|
|
|
SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void*)cb);
|
|
|
|
cb = ossl_sslctx_get_client_cert_cb(v_ctx);
|
|
|
|
SSL_set_ex_data(ssl, ossl_ssl_ex_client_cert_cb_idx, (void*)cb);
|
|
|
|
cb = ossl_sslctx_get_tmp_dh_cb(v_ctx);
|
|
|
|
SSL_set_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx, (void*)cb);
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2005-03-07 02:47:40 -05:00
|
|
|
#ifdef _WIN32
|
2005-03-07 04:30:06 -05:00
|
|
|
#define ssl_get_error(ssl, ret) (errno = WSAGetLastError(), SSL_get_error(ssl, ret))
|
2005-03-07 02:47:40 -05:00
|
|
|
#else
|
|
|
|
#define ssl_get_error(ssl, ret) SSL_get_error(ssl, ret)
|
|
|
|
#endif
|
|
|
|
|
2005-03-05 16:36:11 -05:00
|
|
|
static VALUE
|
|
|
|
ossl_start_ssl(VALUE self, int (*func)())
|
2003-12-06 08:59:31 -05:00
|
|
|
{
|
2005-03-05 16:36:11 -05:00
|
|
|
SSL *ssl;
|
* file.c, gc.c, io.c, ruby.h, rubyio.h, win32/win32.h (rb_io_t):
renamed from OpenFile.
* ext/dl/cptr.c, ext/io/wait/wait.c, ext/openssl/ossl.h,
ext/openssl/ossl_bio.c, ext/openssl/ossl_ssl.c, ext/pty/pty.c,
ext/readline/readline.c, ext/socket/socket.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-24 05:30:50 -05:00
|
|
|
rb_io_t *fptr;
|
2003-12-06 08:59:31 -05:00
|
|
|
int ret;
|
|
|
|
|
2005-03-05 16:36:11 -05:00
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
|
|
|
GetOpenFile(ossl_ssl_get_io(self), fptr);
|
2003-12-06 08:59:31 -05:00
|
|
|
for(;;){
|
|
|
|
if((ret = func(ssl)) > 0) break;
|
2005-03-07 02:47:40 -05:00
|
|
|
switch(ssl_get_error(ssl, ret)){
|
2003-12-06 08:59:31 -05:00
|
|
|
case SSL_ERROR_WANT_WRITE:
|
2007-04-02 15:00:23 -04:00
|
|
|
rb_io_wait_writable(FPTR_TO_FD(fptr));
|
2005-03-05 16:36:11 -05:00
|
|
|
continue;
|
2003-12-06 08:59:31 -05:00
|
|
|
case SSL_ERROR_WANT_READ:
|
2007-04-02 15:00:23 -04:00
|
|
|
rb_io_wait_readable(FPTR_TO_FD(fptr));
|
2005-03-05 16:36:11 -05:00
|
|
|
continue;
|
|
|
|
case SSL_ERROR_SYSCALL:
|
2005-03-09 05:45:42 -05:00
|
|
|
if (errno) rb_sys_fail(0);
|
2003-12-06 08:59:31 -05:00
|
|
|
default:
|
2003-12-06 09:33:52 -05:00
|
|
|
ossl_raise(eSSLError, NULL);
|
2003-12-06 08:59:31 -05:00
|
|
|
}
|
|
|
|
}
|
2005-03-05 16:36:11 -05:00
|
|
|
|
|
|
|
return self;
|
2003-12-06 08:59:31 -05:00
|
|
|
}
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
static VALUE
|
|
|
|
ossl_ssl_connect(VALUE self)
|
|
|
|
{
|
|
|
|
ossl_ssl_setup(self);
|
2005-03-05 16:36:11 -05:00
|
|
|
return ossl_start_ssl(self, SSL_connect);
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_ssl_accept(VALUE self)
|
|
|
|
{
|
|
|
|
ossl_ssl_setup(self);
|
2005-03-05 16:36:11 -05:00
|
|
|
return ossl_start_ssl(self, SSL_accept);
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2004-05-26 14:11:29 -04:00
|
|
|
ossl_ssl_read(int argc, VALUE *argv, VALUE self)
|
2003-07-23 12:12:24 -04:00
|
|
|
{
|
|
|
|
SSL *ssl;
|
|
|
|
int ilen, nread = 0;
|
2004-05-26 14:11:29 -04:00
|
|
|
VALUE len, str;
|
* file.c, gc.c, io.c, ruby.h, rubyio.h, win32/win32.h (rb_io_t):
renamed from OpenFile.
* ext/dl/cptr.c, ext/io/wait/wait.c, ext/openssl/ossl.h,
ext/openssl/ossl_bio.c, ext/openssl/ossl_ssl.c, ext/pty/pty.c,
ext/readline/readline.c, ext/socket/socket.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-24 05:30:50 -05:00
|
|
|
rb_io_t *fptr;
|
2003-07-23 12:12:24 -04:00
|
|
|
|
2004-05-26 14:11:29 -04:00
|
|
|
rb_scan_args(argc, argv, "11", &len, &str);
|
2003-07-23 12:12:24 -04:00
|
|
|
ilen = NUM2INT(len);
|
2004-05-26 14:11:29 -04:00
|
|
|
if(NIL_P(str)) str = rb_str_new(0, ilen);
|
|
|
|
else{
|
|
|
|
StringValue(str);
|
|
|
|
rb_str_modify(str);
|
|
|
|
rb_str_resize(str, ilen);
|
|
|
|
}
|
2004-08-22 03:28:45 -04:00
|
|
|
if(ilen == 0) return str;
|
2003-07-23 12:12:24 -04:00
|
|
|
|
2004-12-15 01:35:55 -05:00
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
|
|
|
GetOpenFile(ossl_ssl_get_io(self), fptr);
|
2003-07-23 12:12:24 -04:00
|
|
|
if (ssl) {
|
2004-08-22 03:28:45 -04:00
|
|
|
if(SSL_pending(ssl) <= 0)
|
2007-04-02 15:00:23 -04:00
|
|
|
rb_thread_wait_fd(FPTR_TO_FD(fptr));
|
2003-12-24 02:29:40 -05:00
|
|
|
for (;;){
|
2006-08-31 06:30:33 -04:00
|
|
|
nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
|
2005-03-07 02:47:40 -05:00
|
|
|
switch(ssl_get_error(ssl, nread)){
|
2003-12-24 02:29:40 -05:00
|
|
|
case SSL_ERROR_NONE:
|
|
|
|
goto end;
|
|
|
|
case SSL_ERROR_ZERO_RETURN:
|
2004-08-22 03:28:45 -04:00
|
|
|
rb_eof_error();
|
2003-12-24 02:29:40 -05:00
|
|
|
case SSL_ERROR_WANT_WRITE:
|
2007-04-02 15:00:23 -04:00
|
|
|
rb_io_wait_writable(FPTR_TO_FD(fptr));
|
2005-03-05 16:36:11 -05:00
|
|
|
continue;
|
2003-12-24 02:29:40 -05:00
|
|
|
case SSL_ERROR_WANT_READ:
|
2007-04-02 15:00:23 -04:00
|
|
|
rb_io_wait_readable(FPTR_TO_FD(fptr));
|
2003-12-24 02:29:40 -05:00
|
|
|
continue;
|
2004-08-22 03:28:45 -04:00
|
|
|
case SSL_ERROR_SYSCALL:
|
|
|
|
if(ERR_peek_error() == 0 && nread == 0) rb_eof_error();
|
2005-02-15 12:50:47 -05:00
|
|
|
rb_sys_fail(0);
|
2003-12-24 02:29:40 -05:00
|
|
|
default:
|
|
|
|
ossl_raise(eSSLError, "SSL_read:");
|
|
|
|
}
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2004-08-22 03:28:45 -04:00
|
|
|
ID id_sysread = rb_intern("sysread");
|
2003-07-23 12:12:24 -04:00
|
|
|
rb_warning("SSL session is not started yet.");
|
2004-08-22 03:28:45 -04:00
|
|
|
return rb_funcall(ossl_ssl_get_io(self), id_sysread, 2, len, str);
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
|
2003-12-24 02:29:40 -05:00
|
|
|
end:
|
2006-08-31 06:30:33 -04:00
|
|
|
rb_str_set_len(str, nread);
|
2003-07-23 12:12:24 -04:00
|
|
|
OBJ_TAINT(str);
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_ssl_write(VALUE self, VALUE str)
|
|
|
|
{
|
|
|
|
SSL *ssl;
|
|
|
|
int nwrite = 0;
|
* file.c, gc.c, io.c, ruby.h, rubyio.h, win32/win32.h (rb_io_t):
renamed from OpenFile.
* ext/dl/cptr.c, ext/io/wait/wait.c, ext/openssl/ossl.h,
ext/openssl/ossl_bio.c, ext/openssl/ossl_ssl.c, ext/pty/pty.c,
ext/readline/readline.c, ext/socket/socket.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-24 05:30:50 -05:00
|
|
|
rb_io_t *fptr;
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
StringValue(str);
|
2004-12-15 01:35:55 -05:00
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
2005-03-05 16:36:11 -05:00
|
|
|
GetOpenFile(ossl_ssl_get_io(self), fptr);
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
if (ssl) {
|
2003-12-24 02:29:40 -05:00
|
|
|
for (;;){
|
2006-08-31 06:30:33 -04:00
|
|
|
nwrite = SSL_write(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
|
2005-03-07 02:47:40 -05:00
|
|
|
switch(ssl_get_error(ssl, nwrite)){
|
2003-12-24 02:29:40 -05:00
|
|
|
case SSL_ERROR_NONE:
|
|
|
|
goto end;
|
|
|
|
case SSL_ERROR_WANT_WRITE:
|
2007-04-02 15:00:23 -04:00
|
|
|
rb_io_wait_writable(FPTR_TO_FD(fptr));
|
2005-03-05 16:36:11 -05:00
|
|
|
continue;
|
2003-12-24 02:29:40 -05:00
|
|
|
case SSL_ERROR_WANT_READ:
|
2007-04-02 15:00:23 -04:00
|
|
|
rb_io_wait_readable(FPTR_TO_FD(fptr));
|
2005-03-05 16:36:11 -05:00
|
|
|
continue;
|
2005-02-15 12:50:47 -05:00
|
|
|
case SSL_ERROR_SYSCALL:
|
2005-03-09 05:45:42 -05:00
|
|
|
if (errno) rb_sys_fail(0);
|
2003-12-24 02:29:40 -05:00
|
|
|
default:
|
|
|
|
ossl_raise(eSSLError, "SSL_write:");
|
|
|
|
}
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2004-08-22 03:28:45 -04:00
|
|
|
ID id_syswrite = rb_intern("syswrite");
|
2003-07-23 12:12:24 -04:00
|
|
|
rb_warning("SSL session is not started yet.");
|
2004-08-22 03:28:45 -04:00
|
|
|
return rb_funcall(ossl_ssl_get_io(self), id_syswrite, 1, str);
|
2003-07-23 12:12:24 -04:00
|
|
|
}
|
|
|
|
|
2003-12-24 02:29:40 -05:00
|
|
|
end:
|
2003-07-23 12:12:24 -04:00
|
|
|
return INT2NUM(nwrite);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_ssl_close(VALUE self)
|
|
|
|
{
|
|
|
|
SSL *ssl;
|
|
|
|
|
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
|
|
|
ossl_ssl_shutdown(ssl);
|
2003-08-18 18:49:48 -04:00
|
|
|
if (RTEST(ossl_ssl_get_sync_close(self)))
|
|
|
|
rb_funcall(ossl_ssl_get_io(self), rb_intern("close"), 0);
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_ssl_get_cert(VALUE self)
|
|
|
|
{
|
|
|
|
SSL *ssl;
|
|
|
|
X509 *cert = NULL;
|
|
|
|
|
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
|
|
|
if (ssl) {
|
|
|
|
rb_warning("SSL session is not started yet.");
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Is this OpenSSL bug? Should add a ref?
|
|
|
|
* TODO: Ask for.
|
|
|
|
*/
|
|
|
|
cert = SSL_get_certificate(ssl); /* NO DUPs => DON'T FREE. */
|
|
|
|
|
|
|
|
if (!cert) {
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
return ossl_x509_new(cert);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_ssl_get_peer_cert(VALUE self)
|
|
|
|
{
|
|
|
|
SSL *ssl;
|
|
|
|
X509 *cert = NULL;
|
|
|
|
VALUE obj;
|
|
|
|
|
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
|
|
|
|
|
|
|
if (!ssl){
|
|
|
|
rb_warning("SSL session is not started yet.");
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
cert = SSL_get_peer_certificate(ssl); /* Adds a ref => Safe to FREE. */
|
|
|
|
|
|
|
|
if (!cert) {
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
obj = ossl_x509_new(cert);
|
|
|
|
X509_free(cert);
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2003-11-01 04:24:55 -05:00
|
|
|
static VALUE
|
|
|
|
ossl_ssl_get_peer_cert_chain(VALUE self)
|
|
|
|
{
|
|
|
|
SSL *ssl;
|
|
|
|
STACK_OF(X509) *chain;
|
|
|
|
X509 *cert;
|
|
|
|
VALUE ary;
|
|
|
|
int i, num;
|
|
|
|
|
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
|
|
|
if(!ssl){
|
|
|
|
rb_warning("SSL session is not started yet.");
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
chain = SSL_get_peer_cert_chain(ssl);
|
2003-11-04 18:48:13 -05:00
|
|
|
if(!chain) return Qnil;
|
2003-11-01 04:24:55 -05:00
|
|
|
num = sk_num(chain);
|
|
|
|
ary = rb_ary_new2(num);
|
|
|
|
for (i = 0; i < num; i++){
|
|
|
|
cert = (X509*)sk_value(chain, i);
|
|
|
|
rb_ary_push(ary, ossl_x509_new(cert));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
static VALUE
|
|
|
|
ossl_ssl_get_cipher(VALUE self)
|
|
|
|
{
|
|
|
|
SSL *ssl;
|
|
|
|
SSL_CIPHER *cipher;
|
|
|
|
|
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
|
|
|
if (!ssl) {
|
|
|
|
rb_warning("SSL session is not started yet.");
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
cipher = SSL_get_current_cipher(ssl);
|
|
|
|
|
|
|
|
return ossl_ssl_cipher_to_ary(cipher);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ossl_ssl_get_state(VALUE self)
|
|
|
|
{
|
|
|
|
SSL *ssl;
|
|
|
|
VALUE ret;
|
|
|
|
|
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
|
|
|
if (!ssl) {
|
|
|
|
rb_warning("SSL session is not started yet.");
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
ret = rb_str_new2(SSL_state_string(ssl));
|
|
|
|
if (ruby_verbose) {
|
|
|
|
rb_str_cat2(ret, ": ");
|
|
|
|
rb_str_cat2(ret, SSL_state_string_long(ssl));
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2004-08-22 03:28:45 -04:00
|
|
|
static VALUE
|
|
|
|
ossl_ssl_pending(VALUE self)
|
|
|
|
{
|
|
|
|
SSL *ssl;
|
|
|
|
|
|
|
|
Data_Get_Struct(self, SSL, ssl);
|
|
|
|
if (!ssl) {
|
|
|
|
rb_warning("SSL session is not started yet.");
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
return INT2NUM(SSL_pending(ssl));
|
|
|
|
}
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
void
|
|
|
|
Init_ossl_ssl()
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2007-03-11 22:01:19 -04:00
|
|
|
#if 0 /* let rdoc know about mOSSL */
|
|
|
|
mOSSL = rb_define_module("OpenSSL");
|
|
|
|
#endif
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_vcb_idx",0,0,0);
|
|
|
|
ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,"ossl_ssl_ex_store_p",0,0,0);
|
2005-03-09 05:45:42 -05:00
|
|
|
ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_ptr_idx",0,0,0);
|
|
|
|
ossl_ssl_ex_client_cert_cb_idx =
|
|
|
|
SSL_get_ex_new_index(0,"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
|
|
|
|
ossl_ssl_ex_tmp_dh_callback_idx =
|
|
|
|
SSL_get_ex_new_index(0,"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
mSSL = rb_define_module_under(mOSSL, "SSL");
|
|
|
|
eSSLError = rb_define_class_under(mSSL, "SSLError", eOSSLError);
|
|
|
|
|
|
|
|
/* class SSLContext */
|
|
|
|
cSSLContext = rb_define_class_under(mSSL, "SSLContext", rb_cObject);
|
|
|
|
rb_define_alloc_func(cSSLContext, ossl_sslctx_s_alloc);
|
|
|
|
for(i = 0; i < numberof(ossl_sslctx_attrs); i++)
|
|
|
|
rb_attr(cSSLContext, rb_intern(ossl_sslctx_attrs[i]), 1, 1, Qfalse);
|
|
|
|
rb_define_method(cSSLContext, "initialize", ossl_sslctx_initialize, -1);
|
|
|
|
rb_define_method(cSSLContext, "ciphers", ossl_sslctx_get_ciphers, 0);
|
|
|
|
rb_define_method(cSSLContext, "ciphers=", ossl_sslctx_set_ciphers, 1);
|
|
|
|
|
|
|
|
/* class SSLSocket */
|
|
|
|
cSSLSocket = rb_define_class_under(mSSL, "SSLSocket", rb_cObject);
|
|
|
|
rb_define_alloc_func(cSSLSocket, ossl_ssl_s_alloc);
|
2003-08-18 18:49:48 -04:00
|
|
|
for(i = 0; i < numberof(ossl_ssl_attr_readers); i++)
|
|
|
|
rb_attr(cSSLSocket, rb_intern(ossl_ssl_attr_readers[i]), 1, 0, Qfalse);
|
2003-07-23 12:12:24 -04:00
|
|
|
for(i = 0; i < numberof(ossl_ssl_attrs); i++)
|
2003-08-18 18:49:48 -04:00
|
|
|
rb_attr(cSSLSocket, rb_intern(ossl_ssl_attrs[i]), 1, 1, Qfalse);
|
2003-07-23 12:12:24 -04:00
|
|
|
rb_define_alias(cSSLSocket, "to_io", "io");
|
|
|
|
rb_define_method(cSSLSocket, "initialize", ossl_ssl_initialize, -1);
|
|
|
|
rb_define_method(cSSLSocket, "connect", ossl_ssl_connect, 0);
|
|
|
|
rb_define_method(cSSLSocket, "accept", ossl_ssl_accept, 0);
|
2004-05-26 14:11:29 -04:00
|
|
|
rb_define_method(cSSLSocket, "sysread", ossl_ssl_read, -1);
|
2003-07-23 12:12:24 -04:00
|
|
|
rb_define_method(cSSLSocket, "syswrite", ossl_ssl_write, 1);
|
|
|
|
rb_define_method(cSSLSocket, "sysclose", ossl_ssl_close, 0);
|
|
|
|
rb_define_method(cSSLSocket, "cert", ossl_ssl_get_cert, 0);
|
|
|
|
rb_define_method(cSSLSocket, "peer_cert", ossl_ssl_get_peer_cert, 0);
|
2003-11-01 04:24:55 -05:00
|
|
|
rb_define_method(cSSLSocket, "peer_cert_chain", ossl_ssl_get_peer_cert_chain, 0);
|
2003-07-23 12:12:24 -04:00
|
|
|
rb_define_method(cSSLSocket, "cipher", ossl_ssl_get_cipher, 0);
|
|
|
|
rb_define_method(cSSLSocket, "state", ossl_ssl_get_state, 0);
|
2004-08-22 03:28:45 -04:00
|
|
|
rb_define_method(cSSLSocket, "pending", ossl_ssl_pending, 0);
|
2003-07-23 12:12:24 -04:00
|
|
|
|
|
|
|
#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2FIX(SSL_##x))
|
|
|
|
|
|
|
|
ossl_ssl_def_const(VERIFY_NONE);
|
|
|
|
ossl_ssl_def_const(VERIFY_PEER);
|
|
|
|
ossl_ssl_def_const(VERIFY_FAIL_IF_NO_PEER_CERT);
|
|
|
|
ossl_ssl_def_const(VERIFY_CLIENT_ONCE);
|
|
|
|
/* Not introduce constants included in OP_ALL such as...
|
|
|
|
* ossl_ssl_def_const(OP_MICROSOFT_SESS_ID_BUG);
|
|
|
|
* ossl_ssl_def_const(OP_NETSCAPE_CHALLENGE_BUG);
|
|
|
|
* ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
|
|
|
|
* ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
|
|
|
|
* ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
|
|
|
|
* ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
|
|
|
|
* ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
|
|
|
|
* ossl_ssl_def_const(OP_TLS_D5_BUG);
|
|
|
|
* ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);
|
|
|
|
* ossl_ssl_def_const(OP_DONT_INSERT_EMPTY_FRAGMENTS);
|
|
|
|
*/
|
|
|
|
ossl_ssl_def_const(OP_ALL);
|
|
|
|
#if defined(SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION)
|
|
|
|
ossl_ssl_def_const(OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
|
|
|
|
#endif
|
|
|
|
#if defined(SSL_OP_SINGLE_ECDH_USE)
|
|
|
|
ossl_ssl_def_const(OP_SINGLE_ECDH_USE);
|
|
|
|
#endif
|
|
|
|
ossl_ssl_def_const(OP_SINGLE_DH_USE);
|
|
|
|
ossl_ssl_def_const(OP_EPHEMERAL_RSA);
|
|
|
|
#if defined(SSL_OP_CIPHER_SERVER_PREFERENCE)
|
|
|
|
ossl_ssl_def_const(OP_CIPHER_SERVER_PREFERENCE);
|
|
|
|
#endif
|
|
|
|
ossl_ssl_def_const(OP_TLS_ROLLBACK_BUG);
|
|
|
|
ossl_ssl_def_const(OP_NO_SSLv2);
|
|
|
|
ossl_ssl_def_const(OP_NO_SSLv3);
|
|
|
|
ossl_ssl_def_const(OP_NO_TLSv1);
|
|
|
|
ossl_ssl_def_const(OP_PKCS1_CHECK_1);
|
|
|
|
ossl_ssl_def_const(OP_PKCS1_CHECK_2);
|
|
|
|
ossl_ssl_def_const(OP_NETSCAPE_CA_DN_BUG);
|
|
|
|
ossl_ssl_def_const(OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
|
|
|
|
}
|