From: Richard Levitte <levitte@openssl.org>
Date: Wed, 4 Jan 2006 12:02:43 +0000 (+0000)
Subject: Fix signed/unsigned char clashes.
X-Git-Tag: OpenSSL_0_9_8k^2~1608
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8de5b7f54833435c4a3e281632871520cd5f1041;p=oweals%2Fopenssl.git

Fix signed/unsigned char clashes.
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 181cb3f15b..c791667741 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -239,7 +239,7 @@ typedef struct tlsextctx_st {
 static int MS_CALLBACK ssl_servername_cb(SSL *s, int *ad, void *arg)
 	{
 	tlsextctx * p = (tlsextctx *) arg;
-	const unsigned char * hn= SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
+	const char * hn= SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
 	if (SSL_get_servername_type(s) != -1) 
  	        p->ack = !SSL_session_reused(s) && hn != NULL;
 	else 
diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index e98a47fc9d..1ff31d4402 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -186,7 +186,7 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
                 {
                 a.tlsext_hostname.length=strlen(in->tlsext_hostname);
                 a.tlsext_hostname.type=V_ASN1_OCTET_STRING;
-                a.tlsext_hostname.data=in->tlsext_hostname;
+                a.tlsext_hostname.data=(unsigned char *)in->tlsext_hostname;
                 }                
 #endif /* OPENSSL_NO_TLSEXT */
 
@@ -419,7 +419,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
 	M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,6);
 	if (os.data)
 		{
-		ret->tlsext_hostname = BUF_strndup(os.data, os.length);
+		ret->tlsext_hostname = BUF_strndup((char *)os.data, os.length);
 		OPENSSL_free(os.data);
 		os.data = NULL;
 		os.length = 0;