httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r349415 - in /httpd/httpd/trunk: modules/ssl/ssl_scache_dc.c support/ab.c
Date Mon, 28 Nov 2005 16:16:26 GMT
Author: jorton
Date: Mon Nov 28 08:16:21 2005
New Revision: 349415

URL: http://svn.apache.org/viewcvs?rev=349415&view=rev
Log:
* 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.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_scache_dc.c
    httpd/httpd/trunk/support/ab.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_scache_dc.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ssl/ssl_scache_dc.c?rev=349415&r1=349414&r2=349415&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_scache_dc.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_scache_dc.c Mon Nov 28 08:16:21 2005
@@ -127,7 +127,7 @@
     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;
 

Modified: httpd/httpd/trunk/support/ab.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/ab.c?rev=349415&r1=349414&r2=349415&view=diff
==============================================================================
--- httpd/httpd/trunk/support/ab.c (original)
+++ httpd/httpd/trunk/support/ab.c Mon Nov 28 08:16:21 2005
@@ -383,14 +383,14 @@
     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 @@
     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");



Mime
View raw message