* 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

diff --git a/modules/ssl/ssl_scache_dc.c b/modules/ssl/ssl_scache_dc.c
index 97f4581b5042d3aa1baa09746f10aa5a75b1aee1..37fa040c91f93eb343f050b917cd3d0bc7bf1041 100644 (file)
--- a/modules/ssl/ssl_scache_dc.c
+++ b/modules/ssl/ssl_scache_dc.c
@@ -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;
 

diff --git a/support/ab.c b/support/ab.c
index 63f6c66cc20b59531ee6759be8393fe7bab0d182..a0b6a18a269d8d6028c1a04e74effa88bb13136c 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -383,14 +383,14 @@ 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,argp,argi,ret,ret);
+        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,argp,argi,ret,ret);
+        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);
     }
     return 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");