[前][次][番号順一覧][スレッド一覧]

ruby-changes:20334

From: yugui <ko1@a...>
Date: Sun, 3 Jul 2011 21:24:29 +0900 (JST)
Subject: [ruby-changes:20334] yugui:r32382 (ruby_1_9_2): merges r31528 from trunk into ruby_1_9_2. fixes #4861.

yugui	2011-07-03 21:24:02 +0900 (Sun, 03 Jul 2011)

  New Revision: 32382

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32382

  Log:
    merges r31528 from trunk into ruby_1_9_2. fixes #4861.
    --
            * ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed.
            However, the problem is not revised in this.
            This adds the control of using function of SSLv2 in made macro by function check.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/openssl/ossl_ssl.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32381)
+++ ruby_1_9_2/ChangeLog	(revision 32382)
@@ -1,3 +1,9 @@
+Thu May 12 12:24:22 2011  Nobuhiro Iwamatsu  <iwamatsu@n...>
+
+        * ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed.
+        However, the problem is not revised in this.
+        This adds the control of using function of SSLv2 in made macro by function check.
+
 Mon Jun 13 18:33:04 2011  Tanaka Akira  <akr@f...>
 
 	* lib/securerandom.rb (SecureRandom.random_bytes): modify PRNG state
Index: ruby_1_9_2/ext/openssl/ossl_ssl.c
===================================================================
--- ruby_1_9_2/ext/openssl/ossl_ssl.c	(revision 32381)
+++ ruby_1_9_2/ext/openssl/ossl_ssl.c	(revision 32382)
@@ -107,9 +107,12 @@
     OSSL_SSL_METHOD_ENTRY(TLSv1),
     OSSL_SSL_METHOD_ENTRY(TLSv1_server),
     OSSL_SSL_METHOD_ENTRY(TLSv1_client),
+#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
+        defined(HAVE_SSLV2_CLIENT_METHOD)	
     OSSL_SSL_METHOD_ENTRY(SSLv2),
     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
+#endif
     OSSL_SSL_METHOD_ENTRY(SSLv3),
     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32381)
+++ ruby_1_9_2/version.h	(revision 32382)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 281
+#define RUBY_PATCHLEVEL 282
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]