summaryrefslogtreecommitdiff
path: root/ext/openssl
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-09 11:26:49 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-09 11:26:49 +0000
commit279c5947d1c306656121f57755d3e4c37bfd0883 (patch)
tree39cc3de532700f7c21a32bf5f7f2eb195a444509 /ext/openssl
parent2c820137ad23bc160caae02e9197a80640c8c370 (diff)
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
-rw-r--r--ext/openssl/lib/openssl/cipher.rb2
-rw-r--r--ext/openssl/ossl_ssl.c4
2 files changed, 3 insertions, 3 deletions
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:");
}