backport some changes from openssl gem v2.0.6 and v2.0.7.

	[Backport #13935]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 28 insertions, 0 deletions

diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
index 95058b5f19..a89bced254 100644
--- a/test/openssl/test_cipher.rb
+++ b/test/openssl/test_cipher.rb
@@ -253,6 +253,13 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
       assert_equal tag1, tag2
     end if has_cipher?("aes-128-gcm")
 
+    def test_non_aead_cipher_set_auth_data
+      assert_raise(OpenSSL::Cipher::CipherError) {
+        cipher = OpenSSL::Cipher.new("aes-128-cfb").encrypt
+        cipher.auth_data = "123"
+      }
+    end
+
   end
 
   private
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index e999d206cf..6c89f1969a 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -213,6 +213,27 @@ module OpenSSL::TestPairM
     }
   end
 
+  def test_read_with_outbuf
+    ssl_pair { |s1, s2|
+      s1.write("abc\n")
+      buf = ""
+      ret = s2.read(2, buf)
+      assert_same ret, buf
+      assert_equal "ab", ret
+      buf = "garbage"
+      ret = s2.read(2, buf)
+      assert_same ret, buf
+      assert_equal "c\n", ret
+      buf = "garbage"
+      assert_equal :wait_readable, s2.read_nonblock(100, buf, exception: false)
+      assert_equal "", buf
+      s1.close
+      buf = "garbage"
+      assert_equal nil, s2.read(100, buf)
+      assert_equal "", buf
+    }
+  end
+
   def write_nonblock(socket, meth, str)
     ret = socket.send(meth, str)
     ret.is_a?(Symbol) ? 0 : ret