From c7be4c2e3e590e23eba1da73152f21ae8def0aad Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 26 May 2009 17:08:16 +0300 Subject: [PATCH] Resolve couple of compiler warnings --- src/tls/tlsv1_server_read.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/tls/tlsv1_server_read.c b/src/tls/tlsv1_server_read.c index 102e8b2a4..e6a71f92c 100644 --- a/src/tls/tlsv1_server_read.c +++ b/src/tls/tlsv1_server_read.c @@ -40,6 +40,7 @@ static int tls_process_client_hello(struct tlsv1_server *conn, u8 ct, u16 cipher_suite; u16 num_suites; int compr_null_found; + u16 ext_type, ext_len; if (ct != TLS_CONTENT_TYPE_HANDSHAKE) { wpa_printf(MSG_DEBUG, "TLSv1: Expected Handshake; " @@ -183,10 +184,7 @@ static int tls_process_client_hello(struct tlsv1_server *conn, u8 ct, } if (end - pos >= 2) { - u16 ext_len; - /* Extension client_hello_extension_list<0..2^16-1> */ - ext_len = WPA_GET_BE16(pos); pos += 2; @@ -195,7 +193,7 @@ static int tls_process_client_hello(struct tlsv1_server *conn, u8 ct, if (end - pos != ext_len) { wpa_printf(MSG_DEBUG, "TLSv1: Invalid ClientHello " "extension list length %u (expected %u)", - ext_len, end - pos); + ext_len, (unsigned int) (end - pos)); goto decode_error; } @@ -207,8 +205,6 @@ static int tls_process_client_hello(struct tlsv1_server *conn, u8 ct, */ while (pos < end) { - u16 ext_type, ext_len; - if (end - pos < 2) { wpa_printf(MSG_DEBUG, "TLSv1: Invalid " "extension_type field"); @@ -520,7 +516,7 @@ static int tls_process_client_key_exchange_rsa( out, &outlen) < 0) { wpa_printf(MSG_DEBUG, "TLSv1: Failed to decrypt " "PreMasterSecret (encr_len=%d outlen=%lu)", - end - pos, (unsigned long) outlen); + (int) (end - pos), (unsigned long) outlen); use_random = 1; }