Don't cast second argument of mem_printf_hook (%b) to size_t.

Also treat the given number as unsigned int.

Due to the printf hook registration the second argument of
mem_printf_hook (if called via printf etc.) is always of type int*.
Casting this to a size_t pointer and then dereferencing that as int does
not work on big endian machines if int is smaller than size_t (e.g. on ppc64).

In order to make this change work if the argument is of a type larger
than int, size_t for instance, the second argument for %b has to be casted
to (u_)int.

diff --git a/src/libcharon/encoding/generator.c b/src/libcharon/encoding/generator.c
index ce38443613de5172fcb7c4cfc127c158838650bd..60fa7e0c4da910bb1ac92385e919fa673d5be166 100644 (file)
--- a/src/libcharon/encoding/generator.c
+++ b/src/libcharon/encoding/generator.c
@@ -523,7 +523,7 @@ METHOD(generator_t, generate_payload, void,
                 payload_type_names, payload_type);
        DBG3(DBG_ENC, "generated data for this payload %b",
                 this->buffer + offset_start,
-                this->out_position - this->buffer - offset_start);
+                (u_int)(this->out_position - this->buffer - offset_start));
 }
 
 METHOD(generator_t, destroy, void,

diff --git a/src/libcharon/encoding/parser.c b/src/libcharon/encoding/parser.c
index 6309a5c3f525a1081d52b3622a9e18f73bf80d92..e492103094f569c70e207d04b1bf2ea9faef11b1 100644 (file)
--- a/src/libcharon/encoding/parser.c
+++ b/src/libcharon/encoding/parser.c
@@ -377,7 +377,7 @@ METHOD(parser_t, parse_payload, status_t,
                 payload_type_names, payload_type, this->input_roof - this->byte_pos);
 
        DBG3(DBG_ENC, "parsing payload from %b",
-                this->byte_pos, this->input_roof - this->byte_pos);
+                this->byte_pos, (u_int)(this->input_roof - this->byte_pos));
 
        /* base pointer for output, avoids casting in every rule */
        output = pld;

diff --git a/src/libcharon/plugins/eap_sim_pcsc/eap_sim_pcsc_card.c b/src/libcharon/plugins/eap_sim_pcsc/eap_sim_pcsc_card.c
index 629792489e2e7a6d4eecc4ff37eed5a106c45b42..c3f0f24b36f1f11bd0e5272a57e1164e53e1862c 100644 (file)
--- a/src/libcharon/plugins/eap_sim_pcsc/eap_sim_pcsc_card.c
+++ b/src/libcharon/plugins/eap_sim_pcsc/eap_sim_pcsc_card.c
@@ -207,7 +207,8 @@ METHOD(simaka_card_t, get_triplet, bool,
                if (dwRecvLength < APDU_STATUS_LEN ||
                        pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA)
                {
-                       DBG1(DBG_IKE, "Select MF failed: %b", pbRecvBuffer, dwRecvLength);
+                       DBG1(DBG_IKE, "Select MF failed: %b", pbRecvBuffer,
+                                (u_int)dwRecvLength);
                        continue;
                }
 
@@ -223,7 +224,8 @@ METHOD(simaka_card_t, get_triplet, bool,
                if (dwRecvLength < APDU_STATUS_LEN ||
                        pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA)
                {
-                       DBG1(DBG_IKE, "Select DF GSM failed: %b", pbRecvBuffer, dwRecvLength);
+                       DBG1(DBG_IKE, "Select DF GSM failed: %b", pbRecvBuffer,
+                                (u_int)dwRecvLength);
                        continue;
                }
 
@@ -239,7 +241,8 @@ METHOD(simaka_card_t, get_triplet, bool,
                if (dwRecvLength < APDU_STATUS_LEN ||
                        pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA)
                {
-                       DBG1(DBG_IKE, "Select IMSI failed: %b", pbRecvBuffer, dwRecvLength);
+                       DBG1(DBG_IKE, "Select IMSI failed: %b", pbRecvBuffer,
+                                (u_int)dwRecvLength);
                        continue;
                }
 
@@ -255,14 +258,15 @@ METHOD(simaka_card_t, get_triplet, bool,
                if (dwRecvLength < APDU_STATUS_LEN ||
                        pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_SUCCESS)
                {
-                       DBG1(DBG_IKE, "Select IMSI failed: %b", pbRecvBuffer, dwRecvLength);
+                       DBG1(DBG_IKE, "Select IMSI failed: %b", pbRecvBuffer,
+                                (u_int)dwRecvLength);
                        continue;
                }
 
                if (!decode_imsi_ef(pbRecvBuffer, dwRecvLength-APDU_STATUS_LEN, imsi))
                {
                        DBG1(DBG_IKE, "Couldn't decode IMSI EF: %b",
-                                pbRecvBuffer, dwRecvLength);
+                                pbRecvBuffer, (u_int)dwRecvLength);
                        continue;
                }
 
@@ -288,7 +292,7 @@ METHOD(simaka_card_t, get_triplet, bool,
                        pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_RESPONSE_DATA)
                {
                        DBG1(DBG_IKE, "Run GSM Algorithm failed: %b",
-                                pbRecvBuffer, dwRecvLength);
+                                pbRecvBuffer, (u_int)dwRecvLength);
                        continue;
                }
 
@@ -305,7 +309,8 @@ METHOD(simaka_card_t, get_triplet, bool,
                if (dwRecvLength < APDU_STATUS_LEN ||
                        pbRecvBuffer[dwRecvLength-APDU_STATUS_LEN] != APDU_SW1_SUCCESS)
                {
-                       DBG1(DBG_IKE, "Get Response failed: %b", pbRecvBuffer, dwRecvLength);
+                       DBG1(DBG_IKE, "Get Response failed: %b", pbRecvBuffer,
+                                (u_int)dwRecvLength);
                        continue;
                }
 
@@ -320,7 +325,7 @@ METHOD(simaka_card_t, get_triplet, bool,
                else
                {
                        DBG1(DBG_IKE, "Get Response incorrect length: %b",
-                                pbRecvBuffer, dwRecvLength);
+                                pbRecvBuffer, (u_int)dwRecvLength);
                        continue;
                }
 

diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c
index 830ed4c8dc4c364e7d77fbfcab0812bd31d935bd..1873d9621b4bb6730769dfd49eb362a3f96528aa 100644 (file)
--- a/src/libcharon/plugins/smp/smp.c
+++ b/src/libcharon/plugins/smp/smp.c
@@ -642,7 +642,7 @@ static job_requeue_t process(int *fdp)
                DBG2(DBG_CFG, "SMP XML connection closed");
                return JOB_REQUEUE_NONE;
        }
-       DBG3(DBG_CFG, "got XML request: %b", buffer, len);
+       DBG3(DBG_CFG, "got XML request: %b", buffer, (u_int)len);
 
        reader = xmlReaderForMemory(buffer, len, NULL, NULL, 0);
        if (reader == NULL)

diff --git a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
index 74dba82ccb414716f91d2251ee3e14934aa0cffc..eee3814a85bd3afbc43e58bd456baa16a57204b5 100644 (file)
--- a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
+++ b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
@@ -235,7 +235,7 @@ static packet_t *receive_packet(private_socket_dynamic_socket_t *this,
                DBG1(DBG_NET, "receive buffer too small, packet discarded");
                return NULL;
        }
-       DBG3(DBG_NET, "received packet %b", buffer, len);
+       DBG3(DBG_NET, "received packet %b", buffer, (u_int)len);
 
        if (len < MARKER_LEN)
        {

diff --git a/src/libstrongswan/chunk.c b/src/libstrongswan/chunk.c
index bb879002e2e13c96718c7682cc90dd36c39207ca..9397c4e44ea20fd3a1d0ebff7f8cc4dfaa8fc870 100644 (file)
--- a/src/libstrongswan/chunk.c
+++ b/src/libstrongswan/chunk.c
@@ -668,7 +668,8 @@ int chunk_printf_hook(char *dst, size_t len, printf_hook_spec_t *spec,
 
        if (!spec->hash)
        {
-               const void *new_args[] = {&chunk->ptr, &chunk->len};
+               u_int chunk_len = chunk->len;
+               const void *new_args[] = {&chunk->ptr, &chunk_len};
                return mem_printf_hook(dst, len, spec, new_args);
        }
 

diff --git a/src/libstrongswan/plugins/fips_prf/fips_prf.c b/src/libstrongswan/plugins/fips_prf/fips_prf.c
index ee71f6efd47efa18d5f8d2cedfb84705afab50ac..c0666367a1e87bee2149eaf20ba1ee2b80dc9777 100644 (file)
--- a/src/libstrongswan/plugins/fips_prf/fips_prf.c
+++ b/src/libstrongswan/plugins/fips_prf/fips_prf.c
@@ -127,14 +127,14 @@ METHOD(prf_t, get_bytes, void,
        {
                /* a. XVAL = (XKEY + XSEED j) mod 2^b */
                add_mod(this->b, xkey, xseed, xval);
-               DBG3(DBG_LIB, "XVAL %b", xval, this->b);
+               DBG3(DBG_LIB, "XVAL %b", xval, (u_int)this->b);
                /* b. wi = G(t, XVAL ) */
                this->g(this, chunk_create(xval, this->b), &w[i * this->b]);
-               DBG3(DBG_LIB, "w[%d] %b", i, &w[i * this->b], this->b);
+               DBG3(DBG_LIB, "w[%d] %b", i, &w[i * this->b], (u_int)this->b);
                /* c. XKEY = (1 + XKEY + wi) mod 2b */
                add_mod(this->b, xkey, &w[i * this->b], sum);
                add_mod(this->b, sum, one, xkey);
-               DBG3(DBG_LIB, "XKEY %b", xkey, this->b);
+               DBG3(DBG_LIB, "XKEY %b", xkey, (u_int)this->b);
        }
 
        /* 3.3 done already, mod q not used */

diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils.c
index 5a104de7fc3b2e5128222dbe230baa69676dc7ea..f76245a195c0229a137791f7176acb34ef01cfad 100644 (file)
--- a/src/libstrongswan/utils.c
+++ b/src/libstrongswan/utils.c
@@ -444,7 +444,7 @@ int mem_printf_hook(char *dst, size_t dstlen,
                                        printf_hook_spec_t *spec, const void *const *args)
 {
        char *bytes = *((void**)(args[0]));
-       int len = *((size_t*)(args[1]));
+       u_int len = *((int*)(args[1]));
 
        char buffer[BYTES_PER_LINE * 3];
        char ascii_buffer[BYTES_PER_LINE + 1];
@@ -455,7 +455,7 @@ int mem_printf_hook(char *dst, size_t dstlen,
        int i = 0;
        int written = 0;
 
-       written += print_in_hook(dst, dstlen, "=> %d bytes @ %p", len, bytes);
+       written += print_in_hook(dst, dstlen, "=> %u bytes @ %p", len, bytes);
 
        while (bytes_pos < bytes_roof)
        {

diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index 3ddaea0895f2e92ec75d2979de75998adf828851..cedfe8fd1a1fbdf2921bd2ef40230cf76d8e6e44 100644 (file)
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -637,7 +637,7 @@ int time_delta_printf_hook(char *dst, size_t len, printf_hook_spec_t *spec,
  * printf hook for memory areas.
  *
  * Arguments are:
- *     u_char *ptr, int len
+ *     u_char *ptr, u_int len
  */
 int mem_printf_hook(char *dst, size_t len, printf_hook_spec_t *spec,
                                        const void *const *args);