httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r209675 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_init.c ssl_scache_dbm.c ssl_scache_shmcb.c ssl_toolkit_compat.h
Date Thu, 07 Jul 2005 23:47:06 GMT
Author: wrowe
Date: Thu Jul  7 16:47:05 2005
New Revision: 209675

URL: http://svn.apache.org/viewcvs?rev=209675&view=rev
Log:

  The macro is simply not worth it; each of these various occurances
  differ as openssl has modified pointer constness from bump to bump.

  This needs testing on Netware, it builds clean on 0.9.6m, 0.9.7d,
  0.9.7g, and 0.9.8-final on Win32.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
    httpd/httpd/trunk/modules/ssl/ssl_scache_dbm.c
    httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c
    httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ssl/ssl_engine_init.c?rev=209675&r1=209674&r2=209675&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_init.c Thu Jul  7 16:47:05 2005
@@ -719,7 +719,12 @@
 {
     SSLModConfigRec *mc = myModConfig(s);
     ssl_asn1_t *asn1;
-    unsigned char *ptr;
+#ifdef OPENSSL_VERSION_NUMBER
+#if (OPENSSL_VERSION_NUMBER >= 0x00908000)
+    const /* ...shifting sands of openssl... */
+#endif
+#endif
+        unsigned char *ptr;
     const char *type = ssl_asn1_keystr(idx);
     X509 *cert;
 
@@ -757,7 +762,12 @@
 {
     SSLModConfigRec *mc = myModConfig(s);
     ssl_asn1_t *asn1;
-    unsigned char *ptr;
+#ifdef OPENSSL_VERSION_NUMBER
+#if (OPENSSL_VERSION_NUMBER >= 0x00908000)
+    const /* ...shifting sands of openssl... */
+#endif
+#endif
+        unsigned char *ptr;
     const char *type = ssl_asn1_keystr(idx);
     int pkey_type = (idx == SSL_AIDX_RSA) ? EVP_PKEY_RSA : EVP_PKEY_DSA;
     EVP_PKEY *pkey;

Modified: httpd/httpd/trunk/modules/ssl/ssl_scache_dbm.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ssl/ssl_scache_dbm.c?rev=209675&r1=209674&r2=209675&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_scache_dbm.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_scache_dbm.c Thu Jul  7 16:47:05 2005
@@ -196,7 +196,12 @@
     apr_datum_t dbmkey;
     apr_datum_t dbmval;
     SSL_SESSION *sess = NULL;
-    MODSSL_D2I_DATUM_TYPE ucpData;
+#ifdef OPENSSL_VERSION_NUMBER
+#if (OPENSSL_VERSION_NUMBER >= 0x0090707f)
+    const /* ...shifting sands of openssl... */
+#endif
+#endif
+        unsigned char *ucpData;
     int nData;
     time_t expiry;
     time_t now;

Modified: httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c?rev=209675&r1=209674&r2=209675&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_scache_shmcb.c Thu Jul  7 16:47:05 2005
@@ -1184,7 +1184,12 @@
     SHMCBHeader *header;
     SSL_SESSION *pSession = NULL;
     unsigned int curr_pos, loop, count;
-    MODSSL_D2I_DATUM_TYPE ptr;
+#ifdef OPENSSL_VERSION_NUMBER
+#if (OPENSSL_VERSION_NUMBER >= 0x0090707f)
+    const /* ...shifting sands of openssl... */
+#endif
+#endif
+        unsigned char *ptr;
     time_t now;
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
@@ -1262,7 +1267,12 @@
     SHMCBIndex *idx;
     SHMCBHeader *header;
     unsigned int curr_pos, loop, count;
-    MODSSL_D2I_DATUM_TYPE ptr;
+#ifdef OPENSSL_VERSION_NUMBER
+#if (OPENSSL_VERSION_NUMBER >= 0x0090707f)
+    const /* ...shifting sands of openssl... */
+#endif
+#endif
+        unsigned char *ptr;
     BOOL to_return = FALSE;
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,

Modified: httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h?rev=209675&r1=209674&r2=209675&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h Thu Jul  7 16:47:05 2005
@@ -84,12 +84,6 @@
 #endif
 #define MODSSL_CLIENT_CERT_CB_ARG_TYPE X509
 #define MODSSL_PCHAR_CAST
-#if (OPENSSL_VERSION_NUMBER < 0x0090707f)
-# define MODSSL_D2I_DATUM_TYPE unsigned char *
-#else
-# define MODSSL_D2I_DATUM_TYPE const unsigned char *
-#endif
-
 
 #define modssl_X509_verify_cert X509_verify_cert
 
@@ -152,7 +146,6 @@
 #define MODSSL_INFO_CB_ARG_TYPE SSL*
 #define MODSSL_CLIENT_CERT_CB_ARG_TYPE void
 #define MODSSL_PCHAR_CAST (char *)
-#define MODSSL_D2I_DATUM_TYPE unsigned char *
 
 typedef int (modssl_read_bio_cb_fn)(char*,int,int);
 



Mime
View raw message