From: serassio <>
Date: Sun, 20 Mar 2005 02:43:39 +0000 (+0000)
Subject: Fixed some little bugs introduced with latest SSL update.
X-Git-Tag: SQUID_3_0_PRE4~828
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3de409f03e5741b0bca8771209275322c355b960;p=thirdparty%2Fsquid.git

Fixed some little bugs introduced with latest SSL update.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 9f75e71522..405032c5e4 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.683 2005/03/18 16:06:10 hno Exp $
+ * $Id: client_side.cc,v 1.684 2005/03/19 19:43:39 serassio Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2954,7 +2954,7 @@ clientNegotiateSSL(int fd, void *data)
             /* Write out the SSL session details.. actually the call below, but
              * OpenSSL headers do strange typecasts confusing GCC.. */
             /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */
-            PEM_ASN1_write(i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *)SSL_get_session(ssl), NULL,NULL,0,NULL,NULL);
+            PEM_ASN1_write((int(*)())i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *)SSL_get_session(ssl), NULL,NULL,0,NULL,NULL);
             /* Note: This does not automatically fflush the log file.. */
         }
 
diff --git a/src/external_acl.cc b/src/external_acl.cc
index 47daa43e67..99b21e6981 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.60 2005/03/18 17:17:51 hno Exp $
+ * $Id: external_acl.cc,v 1.61 2005/03/19 19:43:39 serassio Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -344,9 +344,9 @@ parse_externalAclHelper(external_acl ** list)
 #if USE_SSL
 
         else if (strcmp(token, "%USER_CERT") == 0)
-            format->type = EXT_ACL_USER_CERT_RAW;
+            format->type = _external_acl_format::EXT_ACL_USER_CERT_RAW;
         else if (strcmp(token, "%USER_CERTCHAIN") == 0)
-            format->type = EXT_ACL_USER_CERTCHAIN_RAW;
+            format->type = _external_acl_format::EXT_ACL_USER_CERTCHAIN_RAW;
         else if (strncmp(token, "%USER_CERT_", 11)) {
             format->type = _external_acl_format::EXT_ACL_USER_CERT;
             format->header = xstrdup(token + 11);
diff --git a/src/ssl_support.cc b/src/ssl_support.cc
index 3ed990580f..1af63af448 100644
--- a/src/ssl_support.cc
+++ b/src/ssl_support.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl_support.cc,v 1.30 2005/03/18 17:17:51 hno Exp $
+ * $Id: ssl_support.cc,v 1.31 2005/03/19 19:43:39 serassio Exp $
  *
  * AUTHOR: Benno Rice
  * DEBUG: section 83    SSL accelerator support
@@ -581,7 +581,7 @@ sslCreateServerContext(const char *certfile, const char *keyfile, int version, c
     SSL_CTX_set_options(sslContext, ssl_parse_options(options));
 
     if (context && *context) {
-        SSL_CTX_set_session_id_context(sslContext, context, strlen(context));
+        SSL_CTX_set_session_id_context(sslContext, (const unsigned char *)context, strlen(context));
     }
 
     if (fl & SSL_FLAG_NO_SESSION_REUSE) {