yugui	2010-11-02 00:03:37 +0900 (Tue, 02 Nov 2010)

  New Revision: 29662

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

  Log:
    merges r29190 from trunk into ruby_1_9_2.
    --
            * Fixed wrong check of missing functions. Patch by Adrian Quark.
              ref #3400
              The patch contains following comment:
                This patch should avoid unnecessary incompatibility with future
                versions of Openssl.  Changes suggested by bmaher_at_amazon.com.

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

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29661)
+++ ruby_1_9_2/ChangeLog	(revision 29662)
@@ -1,3 +1,11 @@
+Mon Sep  6 11:03:13 2010  NAKAMURA, Hiroshi  <nahi@r...>
+
+	* Fixed wrong check of missing functions. Patch by Adrian Quark.
+	  ref #3400
+	  The patch contains following comment:
+	    This patch should avoid unnecessary incompatibility with future
+	    versions of Openssl.  Changes suggested by bmaher_at_amazon.com.
+
 Mon Sep  6 10:31:59 2010  NARUSE, Yui  <naruse@r...>
 
 	* ext/readline/readline.c (readline_s_get_line_buffer):
Index: ruby_1_9_2/ext/openssl/openssl_missing.c
===================================================================
--- ruby_1_9_2/ext/openssl/openssl_missing.c	(revision 29661)
+++ ruby_1_9_2/ext/openssl/openssl_missing.c	(revision 29662)
@@ -36,12 +36,13 @@
 #endif /* NO_HMAC */
 
 #if !defined(HAVE_X509_STORE_SET_EX_DATA)
-
 int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data)
 {
     return CRYPTO_set_ex_data(&str->ex_data, idx, data);
 }
+#endif
 
+#if !defined(HAVE_X509_STORE_GET_EX_DATA)
 void *X509_STORE_get_ex_data(X509_STORE *str, int idx)
 {
     return CRYPTO_get_ex_data(&str->ex_data, idx);
Index: ruby_1_9_2/ext/openssl/openssl_missing.h
===================================================================
--- ruby_1_9_2/ext/openssl/openssl_missing.h	(revision 29661)
+++ ruby_1_9_2/ext/openssl/openssl_missing.h	(revision 29662)
@@ -63,7 +63,7 @@
 	(d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri)
 #endif
 
-#if !defined(HAVE_EVP_MD_CTX_INIT)
+#if !defined(HAVE_HMAC_CTX_INIT)
 void HMAC_CTX_init(HMAC_CTX *ctx);
 #endif
 
@@ -133,8 +133,11 @@
 #define OPENSSL_cleanse(p, l) memset(p, 0, l)
 #endif
 
+#if !defined(HAVE_X509_STORE_GET_EX_DATA)
+void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
+#endif
+
 #if !defined(HAVE_X509_STORE_SET_EX_DATA)
-void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
 int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
 #endif
 
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29661)
+++ ruby_1_9_2/version.h	(revision 29662)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 31
+#define RUBY_PATCHLEVEL 32
 #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/