generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve signed vs. unsigned issues

Browse Source
This commit is contained in:
Richard Levitte 2006-03-13 12:32:51 +00:00
parent 019fdc7850
commit 07ef612968
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/s3_srvr.c
View File

@ -1514,7 +1514,7 @@ int ssl3_send_server_key_exchange(SSL *s)
{ {
/* copy PSK identity hint */ /* copy PSK identity hint */
s2n(strlen(s->ctx->psk_identity_hint), p); s2n(strlen(s->ctx->psk_identity_hint), p);
strncpy(p, s->ctx->psk_identity_hint, strlen(s->ctx->psk_identity_hint)); strncpy((char *)p, s->ctx->psk_identity_hint, strlen(s->ctx->psk_identity_hint));
p+=strlen(s->ctx->psk_identity_hint); p+=strlen(s->ctx->psk_identity_hint);
} }
#endif #endif
@ -2305,7 +2305,7 @@ int ssl3_get_client_key_exchange(SSL *s)
if (s->session->psk_identity != NULL) if (s->session->psk_identity != NULL)
OPENSSL_free(s->session->psk_identity); OPENSSL_free(s->session->psk_identity);
s->session->psk_identity = BUF_strdup(p); s->session->psk_identity = BUF_strdup((char *)p);
if (s->session->psk_identity == NULL) if (s->session->psk_identity == NULL)
{ {
SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,

8
ssl/ssl_asn1.c
View File

@ -241,13 +241,13 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
{ {
a.psk_identity_hint.length=strlen(in->psk_identity_hint); a.psk_identity_hint.length=strlen(in->psk_identity_hint);
a.psk_identity_hint.type=V_ASN1_OCTET_STRING; a.psk_identity_hint.type=V_ASN1_OCTET_STRING;
a.psk_identity_hint.data=in->psk_identity_hint; a.psk_identity_hint.data=(unsigned char *)(in->psk_identity_hint);
} }
if (in->psk_identity) if (in->psk_identity)
{ {
a.psk_identity.length=strlen(in->psk_identity); a.psk_identity.length=strlen(in->psk_identity);
a.psk_identity.type=V_ASN1_OCTET_STRING; a.psk_identity.type=V_ASN1_OCTET_STRING;
a.psk_identity.data=in->psk_identity; a.psk_identity.data=(unsigned char *)(in->psk_identity);
} }
#endif /* OPENSSL_NO_PSK */ #endif /* OPENSSL_NO_PSK */
@ -548,7 +548,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,8); M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,8);
if (os.data) if (os.data)
{ {
ret->psk_identity_hint = BUF_strndup(os.data, os.length); ret->psk_identity_hint = 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;
@ -561,7 +561,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,9); M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,9);
if (os.data) if (os.data)
{ {
ret->psk_identity = BUF_strndup(os.data, os.length); ret->psk_identity = 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;

2
ssl/t1_lib.c
View File

@ -637,7 +637,7 @@ int ssl_check_serverhello_tlsext(SSL *s)
SSLerr(SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT,SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST); SSLerr(SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT,SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST);
return -1; return -1;
} }
list = s->session->tlsext_ecpointformatlist; list = (unsigned char *)(s->session->tlsext_ecpointformatlist);
for (i = 0; i < s->session->tlsext_ecpointformatlist_length; i++) for (i = 0; i < s->session->tlsext_ecpointformatlist_length; i++)
{ {
if (*(list++) == TLSEXT_ECPOINTFORMAT_uncompressed) if (*(list++) == TLSEXT_ECPOINTFORMAT_uncompressed)