nobu	2013-12-25 10:42:09 +0900 (Wed, 25 Dec 2013)

  New Revision: 44402

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

  Log:
    ossl_ssl.c: declare OP_MSIE_SSLV2_RSA_PADDING only if defined
    
    * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant
      `OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined.  The
      `SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest
      snapshot of OpenSSL 1.0.1.  [Fixes GH-488]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44401)
+++ ChangeLog	(revision 44402)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Dec 25 10:42:02 2013  Yamashita Yuu  <yamashita@g...>
+
+	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant
+	  `OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined.  The
+	  `SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest
+	  snapshot of OpenSSL 1.0.1.  [Fixes GH-488]
+
 Wed Dec 25 01:03:00 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* proc.c (bind_local_variables): allowing binding to list its
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 44401)
+++ ext/openssl/ossl_ssl.c	(revision 44402)
@@ -2229,7 +2229,9 @@ Init_ossl_ssl() https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ssl.c#L2229
     ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
     ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
     ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
+#if defined(SSL_OP_MSIE_SSLV2_RSA_PADDING)
     ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
+#endif
     ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
     ossl_ssl_def_const(OP_TLS_D5_BUG);
     ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);

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