mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
a9fb0817a1
the underlying IO become readable or writable if the error was SSL_ERROR_WANT_READ or SSL_ERROR_WANT_WRITE. [ruby-dev:25795] * ext/openssl/ossl_ssl.c (ossl_ssl_read, ossl_ssl_write): ditto. * ext/openssl/lib/openssl/buffering.rb (Buffering#consume_rbuf): pointless eof flag resetting is deleted. (Buffering#read): should return an empty string if the specified size is zero. (Buffering#readpartial): new method. (Buffering#readline): fix typo. (Buffering#getc): return the first character of string correctly. (Buffering#readchar): fix typo. (Buffering#eof?): should read again it the input buffer is empty. (Buffering#do_write): should rescue Errno::EAGAIN. (Buffering#puts): use "\n" as the output field separator. * ext/openssl/extconf.rb: get rid of GNUmakefile generation. * text/openssl/test_pair.rb: test for IO like methods. * test/ruby/ut_eof.rb: test about empty file. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
117 lines
3.3 KiB
Ruby
117 lines
3.3 KiB
Ruby
=begin
|
|
= $RCSfile$ -- Generator for Makefile
|
|
|
|
= Info
|
|
'OpenSSL for Ruby 2' project
|
|
Copyright (C) 2002 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
All rights reserved.
|
|
|
|
= Licence
|
|
This program is licenced under the same licence as Ruby.
|
|
(See the file 'LICENCE'.)
|
|
|
|
= Version
|
|
$Id$
|
|
=end
|
|
|
|
require "mkmf"
|
|
|
|
dir_config("openssl")
|
|
dir_config("kerberos")
|
|
|
|
message "=== OpenSSL for Ruby configurator ===\n"
|
|
|
|
##
|
|
# Adds -Wall -DOSSL_DEBUG for compilation and some more targets when GCC is used
|
|
# To turn it on, use: --with-debug or --enable-debug
|
|
#
|
|
if with_config("debug") or enable_config("debug")
|
|
$defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
|
|
|
|
if /gcc/ =~ CONFIG["CC"]
|
|
$CPPFLAGS += " -Wall" unless $CPPFLAGS.split.include? "-Wall"
|
|
end
|
|
end
|
|
|
|
message "=== Checking for system dependent stuff... ===\n"
|
|
have_library("nsl", "t_open")
|
|
have_library("socket", "socket")
|
|
have_header("unistd.h")
|
|
have_header("sys/time.h")
|
|
have_header("assert.h")
|
|
|
|
message "=== Checking for required stuff... ===\n"
|
|
if $mingw
|
|
have_library("wsock32")
|
|
have_library("gdi32")
|
|
end
|
|
result = have_header("openssl/ssl.h")
|
|
result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")}
|
|
result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
|
|
if !result
|
|
unless pkg_config("openssl") and have_header("openssl/ssl.h")
|
|
message "=== Checking for required stuff failed. ===\n"
|
|
message "Makefile wasn't created. Fix the errors above.\n"
|
|
exit 1
|
|
end
|
|
end
|
|
|
|
unless have_header("openssl/conf_api.h")
|
|
message "OpenSSL 0.9.6 or later required.\n"
|
|
exit 1
|
|
end
|
|
|
|
message "=== Checking for OpenSSL features... ===\n"
|
|
have_func("BN_mod_add")
|
|
have_func("BN_mod_sqr")
|
|
have_func("BN_mod_sub")
|
|
have_func("BN_pseudo_rand_range")
|
|
have_func("BN_rand_range")
|
|
have_func("CONF_get1_default_config_file")
|
|
have_func("EVP_CIPHER_CTX_copy")
|
|
have_func("EVP_CIPHER_CTX_set_padding")
|
|
have_func("EVP_CipherFinal_ex")
|
|
have_func("EVP_CipherInit_ex")
|
|
have_func("EVP_DigestFinal_ex")
|
|
have_func("EVP_DigestInit_ex")
|
|
have_func("EVP_MD_CTX_cleanup")
|
|
have_func("EVP_MD_CTX_create")
|
|
have_func("EVP_MD_CTX_destroy")
|
|
have_func("EVP_MD_CTX_init")
|
|
have_func("HMAC_CTX_cleanup")
|
|
have_func("HMAC_CTX_copy")
|
|
have_func("HMAC_CTX_init")
|
|
have_func("PEM_def_callback")
|
|
have_func("X509V3_set_nconf")
|
|
have_func("X509_CRL_add0_revoked")
|
|
have_func("X509_CRL_set_issuer_name")
|
|
have_func("X509_CRL_set_version")
|
|
have_func("X509_CRL_sort")
|
|
have_func("X509_STORE_get_ex_data")
|
|
have_func("X509_STORE_set_ex_data")
|
|
if try_compile("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n")
|
|
$defs.push("-DHAVE_VA_ARGS_MACRO")
|
|
end
|
|
if have_header("openssl/engine.h")
|
|
have_func("ENGINE_add")
|
|
have_func("ENGINE_load_builtin_engines")
|
|
have_func("ENGINE_load_openbsd_dev_crypto")
|
|
have_func("ENGINE_get_digest")
|
|
have_func("ENGINE_get_cipher")
|
|
have_func("ENGINE_cleanup")
|
|
end
|
|
if try_compile(<<SRC)
|
|
#include <openssl/opensslv.h>
|
|
#if OPENSSL_VERSION_NUMBER < 0x00907000L
|
|
# error "OpenSSL version is less than 0.9.7."
|
|
#endif
|
|
SRC
|
|
have_header("openssl/ocsp.h")
|
|
end
|
|
have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h")
|
|
have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h")
|
|
have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h")
|
|
|
|
message "=== Checking done. ===\n"
|
|
create_makefile("openssl")
|
|
message "Done.\n"
|