diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-01 01:52:13 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-01 01:52:13 +0000 |
| commit | 4a37f742b122b5850221ec9abea4f44a86f93c0f (patch) | |
| tree | 5ac86460314d4bf6edb3e6a2b6835adf00853b7a /ext/openssl | |
| parent | 433e0247f3ec5f941a3fd0f6a3d6c48d584271c8 (diff) | |
| download | ruby-4a37f742b122b5850221ec9abea4f44a86f93c0f.tar.gz ruby-4a37f742b122b5850221ec9abea4f44a86f93c0f.tar.xz ruby-4a37f742b122b5850221ec9abea4f44a86f93c0f.zip | |
* ext/openssl/extconf.rb: should check ERR_peek_last_error().
[ruby-dev:27597]
* ext/openssl/ossl.c (ossl_raise): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/openssl/ossl.c | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 2ced7f62c..f2fe9a40f 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 b7eb79f05..a98f2641c 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); |