[macruby-changes] [5121] MacRuby/trunk/ext/openssl

[source_changes at macosforge.org]

Revision: 5121
          http://trac.macosforge.org/projects/ruby/changeset/5121
Author:   watson1978 at gmail.com
Date:     2011-01-05 05:48:02 -0800 (Wed, 05 Jan 2011)
Log Message:
-----------
Fixed wrong check of missing functions. Merged from CRuby 1.9 r29190.
see https://github.com/ruby/ruby/commit/dad43c29f88081fc683a3f2993073d4a315d5ffe

Revision Links:
--------------
    http://trac.macosforge.org/projects/ruby/changeset/29190

Modified Paths:
--------------
    MacRuby/trunk/ext/openssl/openssl_missing.c
    MacRuby/trunk/ext/openssl/openssl_missing.h

Modified: MacRuby/trunk/ext/openssl/openssl_missing.c
===================================================================
--- MacRuby/trunk/ext/openssl/openssl_missing.c	2011-01-05 08:43:08 UTC (rev 5120)
+++ MacRuby/trunk/ext/openssl/openssl_missing.c	2011-01-05 13:48:02 UTC (rev 5121)
@@ -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);
@@ -111,7 +112,7 @@
 #endif
 
 #if !defined(HAVE_EVP_CIPHER_CTX_COPY)
-/* 
+/*
  * this function does not exist in OpenSSL yet... or ever?.
  * a future version may break this function.
  * tested on 0.9.7d.
@@ -180,12 +181,12 @@
 		(ASN1_STRING *)(*a)->serialNumber,
 		(ASN1_STRING *)(*b)->serialNumber));
 }
-		    
+
 int
 X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev)
 {
     X509_CRL_INFO *inf;
-    
+
     inf = crl->crl;
     if (!inf->revoked)
 	inf->revoked = sk_X509_REVOKED_new(OSSL_X509_REVOKED_cmp);
@@ -313,7 +314,7 @@
 {
     int i,j;
     const char *prompt;
-    
+
     if (key) {
 	i = strlen(key);
 	i = (i > num) ? num : i;

Modified: MacRuby/trunk/ext/openssl/openssl_missing.h
===================================================================
--- MacRuby/trunk/ext/openssl/openssl_missing.h	2011-01-05 08:43:08 UTC (rev 5120)
+++ MacRuby/trunk/ext/openssl/openssl_missing.h	2011-01-05 13:48:02 UTC (rev 5121)
@@ -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
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20110105/d8e1c6c1/attachment.html>