From 7fb832aa4ebd916bb7be8a8b827673be3b94d631 Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Tue, 6 Oct 2015 09:31:25 +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. --- src/netif/ppp/magic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/netif/ppp/magic.c b/src/netif/ppp/magic.c index ff0c8ff6..826386cf 100644 --- a/src/netif/ppp/magic.c +++ b/src/netif/ppp/magic.c @@ -162,15 +162,15 @@ void magic_randomize(void) { * it was documented. */ void magic_random_bytes(unsigned char *buf, u32_t buf_len) { - md5_context md5; + md5_context md5_ctx; u_char tmp[MD5_HASH_SIZE]; u32_t n; while (buf_len > 0) { - md5_starts(&md5); - md5_update(&md5, (u_char *)magic_randpool, sizeof(magic_randpool)); - md5_update(&md5, (u_char *)&magic_randcount, sizeof(magic_randcount)); - md5_finish(&md5, tmp); + md5_starts(&md5_ctx); + md5_update(&md5_ctx, (u_char *)magic_randpool, sizeof(magic_randpool)); + md5_update(&md5_ctx, (u_char *)&magic_randcount, sizeof(magic_randcount)); + md5_finish(&md5_ctx, tmp); magic_randcount++; n = LWIP_MIN(buf_len, MD5_HASH_SIZE); MEMCPY(buf, tmp, n);