From 673c6505ae1e1388a13c90f83de59fcd6951b109 Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Mon, 5 Oct 2015 11:08:09 +0200 Subject: [PATCH] PPP: Fix shadowing of global declaration Older compilers don't like variables with the same name as global functions. md5.h contains a function md5(), rename md5 variable in magic.c to md5_ctx. lwip/src/netif/ppp/magic.c: In function `magic_churnrand': lwip/src/netif/ppp/magic.c:105:15: error: declaration of `md5' shadows a global declaration [-Werror=shadow] lwip/src/include/netif/ppp/polarssl/md5.h:88:6: error: shadowed declaration is here [-Werror=shadow] lwip/src/netif/ppp/magic.c: In function `magic_random_bytes': lwip/src/netif/ppp/magic.c:165:15: error: declaration of `md5' shadows a global declaration [-Werror=shadow] lwip/src/include/netif/ppp/polarssl/md5.h:88:6: error: shadowed declaration is here [-Werror=shadow] --- src/netif/ppp/magic.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/netif/ppp/magic.c b/src/netif/ppp/magic.c index 66ab1226..ff0c8ff6 100644 --- a/src/netif/ppp/magic.c +++ b/src/netif/ppp/magic.c @@ -102,13 +102,13 @@ static u32_t magic_randomseed; /* Seed used for random number generation. */ * Ref: Applied Cryptography 2nd Ed. by Bruce Schneier p. 427 */ static void magic_churnrand(char *rand_data, u32_t rand_len) { - md5_context md5; + md5_context md5_ctx; /* LWIP_DEBUGF(LOG_INFO, ("magic_churnrand: %u@%P\n", rand_len, rand_data)); */ - md5_starts(&md5); - md5_update(&md5, (u_char *)magic_randpool, sizeof(magic_randpool)); + md5_starts(&md5_ctx); + md5_update(&md5_ctx, (u_char *)magic_randpool, sizeof(magic_randpool)); if (rand_data) { - md5_update(&md5, (u_char *)rand_data, rand_len); + md5_update(&md5_ctx, (u_char *)rand_data, rand_len); } else { struct { /* INCLUDE fields for any system sources of randomness */ @@ -123,9 +123,9 @@ static void magic_churnrand(char *rand_data, u32_t rand_len) { sys_data.rand = LWIP_RAND(); #endif /* LWIP_RAND */ /* Load sys_data fields here. */ - md5_update(&md5, (u_char *)&sys_data, sizeof(sys_data)); + md5_update(&md5_ctx, (u_char *)&sys_data, sizeof(sys_data)); } - md5_finish(&md5, (u_char *)magic_randpool); + md5_finish(&md5_ctx, (u_char *)magic_randpool); /* LWIP_DEBUGF(LOG_INFO, ("magic_churnrand: -> 0\n")); */ }