Commit 021892c5 authored by Joe Orton's avatar Joe Orton
Browse files

* modules/ssl/ssl_scache_dc.c (ssl_scache_dc_retrieve): Fix warning 

with OpenSSL 0.9.8a.

* support/ab.c (ssl_print_cb, ssl_print_cert_info): Fix warnings with
OpenSSL 0.9.8a.


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

modules/ssl/ssl_scache_dc.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ SSL_SESSION *ssl_scache_dc_retrieve(server_rec *s, UCHAR *id, int idlen) 
    unsigned char der[SSL_SESSION_MAX_DER];

    unsigned int der_len;

    SSL_SESSION *pSession;

    unsigned char *pder = der;

    MODSSL_D2I_SSL_SESSION_CONST unsigned char *pder = der;

    SSLModConfigRec *mc = myModConfig(s);

    DC_CTX *ctx = mc->tSessionCacheDataTable;

support/ab.c

+5 −5
Original line number Diff line number Diff line
@@ -383,13 +383,13 @@ static long ssl_print_cb(BIO *bio,int cmd,const char *argp,int argi,long argl,lo 
    if (out == NULL) return(ret);



    if (cmd == (BIO_CB_READ|BIO_CB_RETURN)) {

        BIO_printf(out,"read from %08X [%08lX] (%d bytes => %ld (0x%X))\n",

        BIO_printf(out,"read from %p [%p] (%d bytes => %ld (0x%lX))\n",

                   bio, argp, argi, ret, ret);

        BIO_dump(out,(char *)argp,(int)ret);

        return(ret);

    }

    else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN)) {

        BIO_printf(out,"write to %08X [%08lX] (%d bytes => %ld (0x%X))\n",

        BIO_printf(out,"write to %p [%p] (%d bytes => %ld (0x%lX))\n",

                   bio, argp, argi, ret, ret);

        BIO_dump(out,(char *)argp,(int)ret);

    }
@@ -485,7 +485,7 @@ static void ssl_print_cert_info(BIO *bio, X509 *cert) 
    X509_NAME *dn;

    char buf[1024];



    BIO_printf(bio, "Certificate version: %d\n", X509_get_version(cert)+1);

    BIO_printf(bio, "Certificate version: %ld\n", X509_get_version(cert)+1);

    BIO_printf(bio,"Valid from: ");

    ASN1_UTCTIME_print(bio, X509_get_notBefore(cert));

    BIO_printf(bio,"\n");