mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-06 18:54:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP: Fix shadowing of global declaration

Browse Source 
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]
This commit is contained in:
Erik Ekman 2015-10-05 11:08:09 +02:00 committed by Sylvain Rochet
parent 1fef434f01
commit 673c6505ae
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/netif/ppp/magic.c
View File

@ -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 * Ref: Applied Cryptography 2nd Ed. by Bruce Schneier p. 427
*/ */
static void magic_churnrand(char *rand_data, u32_t rand_len) { 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)); */ /* LWIP_DEBUGF(LOG_INFO, ("magic_churnrand: %u@%P\n", rand_len, rand_data)); */
md5_starts(&md5); md5_starts(&md5_ctx);
md5_update(&md5, (u_char *)magic_randpool, sizeof(magic_randpool)); md5_update(&md5_ctx, (u_char *)magic_randpool, sizeof(magic_randpool));
if (rand_data) { if (rand_data) {
md5_update(&md5, (u_char *)rand_data, rand_len); md5_update(&md5_ctx, (u_char *)rand_data, rand_len);
} else { } else {
struct { struct {
/* INCLUDE fields for any system sources of randomness */ /* 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(); sys_data.rand = LWIP_RAND();
#endif /* LWIP_RAND */ #endif /* LWIP_RAND */
/* Load sys_data fields here. */ /* 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")); */ /* LWIP_DEBUGF(LOG_INFO, ("magic_churnrand: -> 0\n")); */
} }