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

  Wrap this type in a macro since it seems to be bouncing from
  0.9.7g to 0.9.7h in const'ness.

PR: 34520

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@209530 13f79535-47bb-0310-9956-ffa450edef68
parent 2448265f

modules/ssl/ssl_scache_dbm.c

+4 −3
Changes for modules/ssl/ssl_scache_dbm.c: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ 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;

    UCHAR *ucpData;

    MODSSL_D2I_DATUM_TYPE ucpData;

    int nData;

    time_t expiry;

    time_t now;
@@ -237,13 +237,14 @@ SSL_SESSION *ssl_scache_dbm_retrieve(server_rec *s, UCHAR *id, int idlen) 


    /* parse resulting data */

    nData = dbmval.dsize-sizeof(time_t);

    ucpData = (UCHAR *)malloc(nData);

    ucpData = malloc(nData);

    if (ucpData == NULL) {

        apr_dbm_close(dbm);

        ssl_mutex_off(s);

        return NULL;

    }

    memcpy(ucpData, (char *)dbmval.dptr+sizeof(time_t), nData);

    /* Cast needed, ucpData may be const */

    memcpy((UCHAR *)ucpData, (char *)dbmval.dptr+sizeof(time_t), nData);

    memcpy(&expiry, dbmval.dptr, sizeof(time_t));



    apr_dbm_close(dbm);

modules/ssl/ssl_scache_shmcb.c

+2 −2
Changes for modules/ssl/ssl_scache_shmcb.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1184,7 +1184,7 @@ static SSL_SESSION *shmcb_lookup_session_id( 
    SHMCBHeader *header;

    SSL_SESSION *pSession = NULL;

    unsigned int curr_pos, loop, count;

    unsigned char *ptr;

    MODSSL_D2I_DATUM_TYPE ptr;

    time_t now;



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
@@ -1262,7 +1262,7 @@ static BOOL shmcb_remove_session_id( 
    SHMCBIndex *idx;

    SHMCBHeader *header;

    unsigned int curr_pos, loop, count;

    unsigned char *ptr;

    MODSSL_D2I_DATUM_TYPE ptr;

    BOOL to_return = FALSE;



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,

modules/ssl/ssl_toolkit_compat.h

+7 −0
Changes for modules/ssl/ssl_toolkit_compat.h: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -84,6 +84,12 @@ 
#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
@@ -146,6 +152,7 @@ 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);