Commit 8de5b7f5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix signed/unsigned char clashes.

parent 9ee0f7b7

apps/s_client.c

+1 −1
Original line number Diff line number Diff line
@@ -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

ssl/ssl_asn1.c

+2 −2
Original line number Diff line number Diff line
@@ -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;