1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error

Browse Source 
to get last error on the current thread. And should report
  if errors are on the stack while OpenSSL.debug is true.

* ext/openssl/ossl.c (ossl_get_errors): new method for debugging
  this library.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
gotoyuzo 2005-08-07 20:21:40 +00:00
parent b1e29f011d
commit ec46711668
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Mon Aug 8 05:16:55 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
to get last error on the current thread. And should report
if errors are on the stack while OpenSSL.debug is true.
* ext/openssl/ossl.c (ossl_get_errors): new method for debugging
this library.
Mon Aug 8 05:15:19 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> Mon Aug 8 05:15:19 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpproxy.rb (HTTPProxyServer#intialize), * lib/webrick/httpproxy.rb (HTTPProxyServer#intialize),

24
ext/openssl/ossl.c
View File

@ -278,7 +278,7 @@ ossl_raise(VALUE exc, const char *fmt, ...)
va_list args; va_list args;
char buf[BUFSIZ]; char buf[BUFSIZ];
const char *msg; const char *msg;
long e = ERR_get_error(); long e = ERR_peek_last_error();
int len = 0; int len = 0;
if (fmt) { if (fmt) {
@ -291,15 +291,34 @@ ossl_raise(VALUE exc, const char *fmt, ...)
msg = ERR_error_string(e, NULL); msg = ERR_error_string(e, NULL);
else else
msg = ERR_reason_error_string(e); msg = ERR_reason_error_string(e);
ERR_clear_error();
fmt = len ? ": %s" : "%s"; fmt = len ? ": %s" : "%s";
len += snprintf(buf+len, BUFSIZ-len, fmt, msg); len += snprintf(buf+len, BUFSIZ-len, fmt, msg);
} }
if (dOSSL == Qtrue){ /* show all errors on the stack */
while ((e = ERR_get_error()) != 0){
rb_warn("error on stack: %s", ERR_error_string(e, NULL));
}
}
ERR_clear_error();
if(len > BUFSIZ) len = strlen(buf); if(len > BUFSIZ) len = strlen(buf);
rb_exc_raise(rb_exc_new(exc, buf, len)); rb_exc_raise(rb_exc_new(exc, buf, len));
} }
VALUE
ossl_get_errors()
{
VALUE ary;
long e;
ary = rb_ary_new();
while ((e = ERR_get_error()) != 0){
rb_ary_push(ary, rb_str_new2(ERR_error_string(e, NULL)));
}
return ary;
}
/* /*
* Debug * Debug
*/ */
@ -411,6 +430,7 @@ Init_openssl()
dOSSL = Qfalse; dOSSL = Qfalse;
rb_define_module_function(mOSSL, "debug", ossl_debug_get, 0); rb_define_module_function(mOSSL, "debug", ossl_debug_get, 0);
rb_define_module_function(mOSSL, "debug=", ossl_debug_set, 1); rb_define_module_function(mOSSL, "debug=", ossl_debug_set, 1);
rb_define_module_function(mOSSL, "errors", ossl_get_errors, 0);
/* /*
* Get ID of to_der * Get ID of to_der