From 4798cd1bb3e7b38b0f56d71b88538a773a8c03ca Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Tue, 1 Nov 2005 01:52:13 +0000 Subject: * ext/openssl/extconf.rb: should check ERR_peek_last_error(). [ruby-dev:27597] * ext/openssl/ossl.c (ossl_raise): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/extconf.rb | 1 + ext/openssl/ossl.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 2ced7f62ce..f2fe9a40f4 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -62,6 +62,7 @@ unless have_header("openssl/conf_api.h") end message "=== Checking for OpenSSL features... ===\n" +have_func("ERR_peek_last_error") have_func("BN_mod_add") have_func("BN_mod_sqr") have_func("BN_mod_sub") diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index b7eb79f053..a98f2641cc 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -278,9 +278,14 @@ ossl_raise(VALUE exc, const char *fmt, ...) va_list args; char buf[BUFSIZ]; const char *msg; - long e = ERR_peek_last_error(); + long e; int len = 0; +#ifdef HAVE_ERR_PEEK_LAST_ERROR + e = ERR_peek_last_error(); +#else + e = ERR_peek_error(); +#endif if (fmt) { va_start(args, fmt); len = vsnprintf(buf, BUFSIZ, fmt, args); -- cgit v1.2.3