prevent conflict with existing (md4|md5|sha1|des) object file if polarssl is already used elsewhere in the project

src/netif/ppp/chap-md5.c

@@ -41,7 +41,12 @@
 #include "chap-new.h"
 #include "chap-md5.h"
 #include "magic.h"
+
+#if LWIP_INCLUDED_POLARSSL_MD5
+#include "polarssl/lwip_md5.h"
+#else
 #include "polarssl/md5.h"
+#endif
 
 #define MD5_HASH_SIZE		16
 #define MD5_MIN_CHALLENGE	16

src/netif/ppp/chap_ms.c

@@ -91,12 +91,27 @@
 
 #include "chap-new.h"
 #include "chap_ms.h"
-#include "polarssl/md4.h"
-#include "polarssl/sha1.h"
-#include "polarssl/des.h"
 #include "pppcrypt.h"
 #include "magic.h"
 
+#if LWIP_INCLUDED_POLARSSL_MD4
+#include "polarssl/lwip_md4.h"
+#else
+#include "polarssl/md4.h"
+#endif
+
+#if LWIP_INCLUDED_POLARSSL_SHA1
+#include "polarssl/lwip_sha1.h"
+#else
+#include "polarssl/sha1.h"
+#endif
+
+#if LWIP_INCLUDED_POLARSSL_DES
+#include "polarssl/lwip_des.h"
+#else
+#include "polarssl/des.h"
+#endif
+
 #define SHA1_SIGNATURE_SIZE 20
 
 static void	ascii2unicode (char[], int, u_char[]);

src/netif/ppp/eap.c

@@ -48,7 +48,12 @@
 
 #include "ppp_impl.h"
 
+#if LWIP_INCLUDED_POLARSSL_MD5
+#include "polarssl/lwip_md5.h"
+#else
 #include "polarssl/md5.h"
+#endif
+
 #include "eap.h"
 
 #ifdef USE_SRP

src/netif/ppp/magic.c

@@ -77,7 +77,12 @@
 
 #include "ppp_impl.h"
 
+#if LWIP_INCLUDED_POLARSSL_MD5
+#include "polarssl/lwip_md5.h"
+#else
 #include "polarssl/md5.h"
+#endif
+
 #include "magic.h"
 
 #if PPP_MD5_RANDM /* Using MD5 for better randomness if enabled */

src/netif/ppp/polarssl/lwip_des.c

@@ -42,7 +42,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_DES
 
-#include "des.h"
+#include "lwip_des.h"
 
 /*
  * 32-bit integer manipulation macros (big endian)

src/netif/ppp/polarssl/lwip_md4.c

@@ -42,7 +42,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_MD4
 
-#include "md4.h"
+#include "lwip_md4.h"
 
 /*
  * 32-bit integer manipulation macros (little endian)

src/netif/ppp/polarssl/lwip_md5.c

@@ -41,7 +41,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_MD5
 
-#include "md5.h"
+#include "lwip_md5.h"
 
 /*
  * 32-bit integer manipulation macros (little endian)

src/netif/ppp/polarssl/lwip_sha1.c

@@ -41,7 +41,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_SHA1
 
-#include "sha1.h"
+#include "lwip_sha1.h"
 
 /*
  * 32-bit integer manipulation macros (big endian)