Fix signed/unsigned char clashes.

This commit is contained in:
Richard Levitte 2006-01-04 12:02:43 +00:00
parent 9ee0f7b7e0
commit 8de5b7f548
2 changed files with 3 additions and 3 deletions

View File

@ -239,7 +239,7 @@ typedef struct tlsextctx_st {
static int MS_CALLBACK ssl_servername_cb(SSL *s, int *ad, void *arg) static int MS_CALLBACK ssl_servername_cb(SSL *s, int *ad, void *arg)
{ {
tlsextctx * p = (tlsextctx *) 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) if (SSL_get_servername_type(s) != -1)
p->ack = !SSL_session_reused(s) && hn != NULL; p->ack = !SSL_session_reused(s) && hn != NULL;
else else

View File

@ -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.length=strlen(in->tlsext_hostname);
a.tlsext_hostname.type=V_ASN1_OCTET_STRING; 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 */ #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); M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,6);
if (os.data) 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); OPENSSL_free(os.data);
os.data = NULL; os.data = NULL;
os.length = 0; os.length = 0;