Commit b904c4e2 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@209675 13f79535-47bb-0310-9956-ffa450edef68
parent 67c4823f

modules/ssl/ssl_engine_init.c

+10 −0
Changes for modules/ssl/ssl_engine_init.c: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -719,6 +719,11 @@ static int ssl_server_import_cert(server_rec *s, 
{

    SSLModConfigRec *mc = myModConfig(s);

    ssl_asn1_t *asn1;

#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,6 +762,11 @@ static int ssl_server_import_key(server_rec *s, 
{

    SSLModConfigRec *mc = myModConfig(s);

    ssl_asn1_t *asn1;

#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;

modules/ssl/ssl_scache_dbm.c

+6 −1
Changes for modules/ssl/ssl_scache_dbm.c: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -196,7 +196,12 @@ SSL_SESSION *ssl_scache_dbm_retrieve(server_rec *s, UCHAR *id, int idlen) 
    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;

modules/ssl/ssl_scache_shmcb.c

+12 −2
Changes for modules/ssl/ssl_scache_shmcb.c: 12 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1184,7 +1184,12 @@ static SSL_SESSION *shmcb_lookup_session_id( 
    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 @@ static BOOL shmcb_remove_session_id( 
    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,

modules/ssl/ssl_toolkit_compat.h

+0 −7
Changes for modules/ssl/ssl_toolkit_compat.h: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -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 @@ typedef int (modssl_read_bio_cb_fn)(char*,int,int,void*); 
#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);