svn commit: r1169800 - in /commons/sandbox/runtime/trunk/src/main/native: include/acr/ssl.h modules/openssl/api.c

[mturk]

Author: mturk
Date: Mon Sep 12 15:33:17 2011
New Revision: 1169800

URL: http://svn.apache.org/viewvc?rev=1169800&view=rev
Log:
Fix STACK/_STACK api change

Modified:
    commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h
    commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c

Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h?rev=1169800&r1=1169799&r2=1169800&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h Mon Sep 12 
15:33:17 2011
@@ -70,8 +70,10 @@
 
 #if (OPENSSL_VERSION_NUMBER >= 0x10000000)
 #define CONST_SSL_METHOD        const SSL_METHOD
+#define SSLAPI_STACK            _STACK
 #else
 #define CONST_SSL_METHOD        SSL_METHOD
+#define SSLAPI_STACK            STACK
 #endif
 
 /* Default setting for per-dir reneg buffer. */

Modified: commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c?rev=1169800&r1=1169799&r2=1169800&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c 
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c Mon Sep 
12 15:33:17 2011
@@ -172,9 +172,7 @@ struct SSLAPIst {
     void                (*fpNULL)(void);
 
     /*** _STACK   ***/
-#if (OPENSSL_VERSION_NUMBER >= 0x10000000)
-    void                (*fpsk_pop_free)(_STACK *, void (*)(void *));
-#endif
+    void                (*fpsk_pop_free)(SSLAPI_STACK *, void (*)(void *));
 
 };
 
@@ -324,9 +322,7 @@ ACR_JNI_EXPORT(jboolean, Native, ldopens
     CRYPTO_FPLOAD(X509_free);
 
     /*** _STACK   ***/
-#if (OPENSSL_VERSION_NUMBER >= 0x10000000)
     CRYPTO_FPLOAD(sk_pop_free);
-#endif
     /* Optional functions
      * We could compile with the HAVE_FIPS, but target OpenSSL might not
      * have FIPS support for example.
@@ -714,12 +710,10 @@ void X509_free(X509 *x)
     SSLAPI_CALL(X509_free)(x);
 }
 
-#if (OPENSSL_VERSION_NUMBER >= 0x10000000)
-void sk_pop_free(_STACK *st, void (*func)(void *))
+void sk_pop_free(SSLAPI_STACK *st, void (*func)(void *))
 {
     SSLAPI_CALL(sk_pop_free)(st, func);
 }
-#endif
 
 #if HAVE_FIPS
 int FIPS_mode(void)