[ruby-cvs:66667] nagachika:r59489 (ruby_2_4): merge revision(s) 58742, 59081: [Backport #11033]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Thu Aug 3 22:43:01 JST 2017


nagachika	2017-08-03 22:43:01 +0900 (Thu, 03 Aug 2017)

  New Revision: 59489

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59489

  Log:
    merge revision(s) 58742,59081: [Backport #11033]
    
    Search SSL libraries by testing various filename patterns
    
    * ext/openssl/extconf.rb (find_openssl_library): should search by more flexible
      method, especially for LibreSSL on Windows.
    
    openssl: import v2.0.4
    
    Import Ruby/OpenSSL 2.0.4. Only bug (and typo) fixes. The full commit
    history since v2.0.3 (imported at r57482) can be found at:
    
      https://github.com/ruby/openssl/compare/v2.0.3...v2.0.4
    
    This contains the fix for [Bug #11033].
    
    ----------------------------------------------------------------
    Jun Aruga (1):
          Update .travis.yml and Dockerfile
    
    Kazuki Yamaguchi (9):
          test/test_pkey_ec: do not use dummy 0 order
          test/test_ssl: fix typo in test_sysread_and_syswrite
          ssl: check return value of SSL_set_fd()
          Fix typos
          test/test_x509store: skip OpenSSL::TestX509Store#test_set_errors
          tool/sync-with-trunk: 'LASY' -> 'LAST'
          x509store: clear error queue after calling X509_LOOKUP_load_file()
          extconf.rb: simplify searching libraries logic
          Ruby/OpenSSL 2.0.4
    
    SHIBATA Hiroshi (1):
          Fix typos
    
    Vladimir Rybas (1):
          Fix documentation for OpenSSL::Cipher#final
    
    nobu (2):
          openssl: fix broken openssl check
          openssl: fix broken openssl check
    
    usa (1):
          Search SSL libraries by testing various filename patterns

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/ext/openssl/History.md
    branches/ruby_2_4/ext/openssl/extconf.rb
    branches/ruby_2_4/ext/openssl/openssl.gemspec
    branches/ruby_2_4/ext/openssl/ossl_bn.c
    branches/ruby_2_4/ext/openssl/ossl_cipher.c
    branches/ruby_2_4/ext/openssl/ossl_ns_spki.c
    branches/ruby_2_4/ext/openssl/ossl_pkey_ec.c
    branches/ruby_2_4/ext/openssl/ossl_pkey_rsa.c
    branches/ruby_2_4/ext/openssl/ossl_ssl.c
    branches/ruby_2_4/ext/openssl/ossl_version.h
    branches/ruby_2_4/ext/openssl/ossl_x509store.c
    branches/ruby_2_4/test/openssl/test_pkcs7.rb
    branches/ruby_2_4/test/openssl/test_ssl.rb
    branches/ruby_2_4/test/openssl/test_x509store.rb
    branches/ruby_2_4/version.h


More information about the ruby-cvs mailing list