summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ext/openssl/lib/openssl/cipher.rb2
-rw-r--r--ext/openssl/ossl_ssl.c4
-rw-r--r--test/openssl/test_pair.rb166
4 files changed, 10 insertions, 169 deletions
diff --git a/ChangeLog b/ChangeLog
index fe60272..6e8d3ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Mar 9 20:25:58 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_write): call
+ rb_sys_fail if errno isn't 0. [ruby-dev:25831]
+
+ * ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
+
Wed Mar 9 15:46:35 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/server.rb (WEBrick::GenericServer#start): should
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
index 1115310..9f8776d 100644
--- a/ext/openssl/lib/openssl/cipher.rb
+++ b/ext/openssl/lib/openssl/cipher.rb
@@ -20,7 +20,7 @@
module OpenSSL
module Cipher
- %w(AES Cast5 BF DES Idea RC2 RC4 RC5).each{|cipher|
+ %w(AES CAST5 BF DES IDEA RC2 RC4 RC5).each{|cipher|
eval(<<-EOD)
class #{cipher} < Cipher
def initialize(*args)
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 01b44f3..efe2eb8 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -462,7 +462,7 @@ ossl_start_ssl(VALUE self, int (*func)())
rb_io_wait_readable(fileno(fptr->f));
continue;
case SSL_ERROR_SYSCALL:
- rb_sys_fail(0);
+ if (errno) rb_sys_fail(0);
default:
ossl_raise(eSSLError, NULL);
}
@@ -567,7 +567,7 @@ ossl_ssl_write(VALUE self, VALUE str)
rb_io_wait_readable(fileno(fptr->f));
continue;
case SSL_ERROR_SYSCALL:
- rb_sys_fail(0);
+ if (errno) rb_sys_fail(0);
default:
ossl_raise(eSSLError, "SSL_write:");
}
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 7dd658b..2b48471 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -164,169 +164,3 @@ class OpenSSL::TestPair < Test::Unit::TestCase
end
end
-begin
- require "openssl"
-rescue LoadError
-end
-require 'test/unit'
-
-if defined?(OpenSSL)
-
-require 'socket'
-dir = File.expand_path(__FILE__)
-2.times {dir = File.dirname(dir)}
-$:.replace([File.join(dir, "ruby")] | $:)
-require 'ut_eof'
-
-module SSLPair
- def server
- host = "127.0.0.1"
- port = 0
- key = OpenSSL::PKey::RSA.new(512)
- cert = OpenSSL::X509::Certificate.new
- cert.version = 2
- cert.serial = 0
- name = OpenSSL::X509::Name.new([["C","JP"],["O","TEST"],["CN","localhost"]])
- cert.subject = name
- cert.issuer = name
- cert.not_before = Time.now
- cert.not_after = Time.now + 3600
- cert.public_key = key.public_key
- ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
- cert.extensions = [
- ef.create_extension("basicConstraints","CA:FALSE"),
- ef.create_extension("subjectKeyIdentifier","hash"),
- ef.create_extension("extendedKeyUsage","serverAuth"),
- ef.create_extension("keyUsage",
- "keyEncipherment,dataEncipherment,digitalSignature")
- ]
- ef.issuer_certificate = cert
- cert.add_extension ef.create_extension("authorityKeyIdentifier",
- "keyid:always,issuer:always")
- cert.sign(key, OpenSSL::Digest::SHA1.new)
- ctx = OpenSSL::SSL::SSLContext.new()
- ctx.key = key
- ctx.cert = cert
- tcps = TCPServer.new(host, port)
- ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
- return ssls
- end
-
- def client(port)
- host = "127.0.0.1"
- ctx = OpenSSL::SSL::SSLContext.new()
- s = TCPSocket.new(host, port)
- ssl = OpenSSL::SSL::SSLSocket.new(s, ctx)
- ssl.connect
- ssl.sync_close = true
- ssl
- end
-
- def ssl_pair
- ssls = server
- th = Thread.new {
- ns = ssls.accept
- ssls.close
- ns
- }
- port = ssls.to_io.addr[1]
- c = client(port)
- s = th.value
- if block_given?
- begin
- yield c, s
- ensure
- c.close unless c.closed?
- s.close unless s.closed?
- end
- else
- return c, s
- end
- end
-end
-
-class OpenSSL::TestEOF1 < Test::Unit::TestCase
- include TestEOF
- include SSLPair
-
- def open_file(content)
- s1, s2 = ssl_pair
- Thread.new { s2 << content; s2.close }
- yield s1
- end
-end
-
-class OpenSSL::TestEOF2 < Test::Unit::TestCase
- include TestEOF
- include SSLPair
-
- def open_file(content)
- s1, s2 = ssl_pair
- Thread.new { s1 << content; s1.close }
- yield s2
- end
-end
-
-class OpenSSL::TestPair < Test::Unit::TestCase
- include SSLPair
-
- def test_getc
- ssl_pair {|s1, s2|
- s1 << "a"
- assert_equal(?a, s2.getc)
- }
- end
-
- def test_readpartial
- ssl_pair {|s1, s2|
- s2.write "a\nbcd"
- assert_equal("a\n", s1.gets)
- assert_equal("bcd", s1.readpartial(10))
- s2.write "efg"
- assert_equal("efg", s1.readpartial(10))
- s2.close
- assert_raise(EOFError) { s1.readpartial(10) }
- assert_raise(EOFError) { s1.readpartial(10) }
- assert_equal("", s1.readpartial(0))
- }
- end
-
- def test_readall
- ssl_pair {|s1, s2|
- s2.close
- assert_equal("", s1.read)
- }
- end
-
- def test_readline
- ssl_pair {|s1, s2|
- s2.close
- assert_raise(EOFError) { s1.readline }
- }
- end
-
- def test_puts_meta
- ssl_pair {|s1, s2|
- begin
- old = $/
- $/ = '*'
- s1.puts 'a'
- ensure
- $/ = old
- end
- s1.close
- assert_equal("a\n", s2.read)
- }
- end
-
- def test_puts_empty
- ssl_pair {|s1, s2|
- s1.puts
- s1.close
- assert_equal("\n", s2.read)
- }
- end
-
-end
-
-end