PPP, MPPE, updated polarssl ARC4 for lwIP

src/include/lwip/opt.h

@@ -2036,6 +2036,13 @@
 #define CCP_SUPPORT                     0
 #endif
 
+/**
+ * MPPE_SUPPORT==1: Support MPPE. CURRENTLY NOT SUPPORTED! DO NOT SET!
+ */
+#ifndef MPPE_SUPPORT
+#define MPPE_SUPPORT                     0
+#endif
+
 /**
  * ECP_SUPPORT==1: Support ECP. CURRENTLY NOT SUPPORTED! DO NOT SET!
  */
@@ -2140,6 +2147,12 @@
 #ifndef LWIP_INCLUDED_POLARSSL_DES
 #define LWIP_INCLUDED_POLARSSL_DES        1 /* MSCHAP require DES support */
 #endif /* LWIP_INCLUDED_POLARSSL_DES */
+/* MS-CHAP support is required for MPPE */
+#if MPPE_SUPPORT
+#ifndef LWIP_INCLUDED_POLARSSL_ARC4
+#define LWIP_INCLUDED_POLARSSL_ARC4       1 /* MPPE require ARC4 support */
+#endif /* LWIP_INCLUDED_POLARSSL_ARC4*/
+#endif /* MPPE_SUPPORT */
 #endif /* MSCHAP_SUPPORT */
 
 /* Default value if unset */
@@ -2155,6 +2168,9 @@
 #ifndef LWIP_INCLUDED_POLARSSL_DES
 #define LWIP_INCLUDED_POLARSSL_DES        0
 #endif /* LWIP_INCLUDED_POLARSSL_DES */
+#ifndef LWIP_INCLUDED_POLARSSL_ARC4
+#define LWIP_INCLUDED_POLARSSL_ARC4       0
+#endif /* LWIP_INCLUDED_POLARSSL_ARC4 */
 
 /*
  * Timeouts

src/include/netif/ppp/polarssl/arc4.h

@@ -32,8 +32,12 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef POLARSSL_ARC4_H
-#define POLARSSL_ARC4_H
+
+#include "lwip/opt.h"
+#if LWIP_INCLUDED_POLARSSL_ARC4
+
+#ifndef LWIP_INCLUDED_POLARSSL_ARC4_H
+#define LWIP_INCLUDED_POLARSSL_ARC4_H
 
 /**
  * \brief          ARC4 context structure
@@ -68,15 +72,10 @@ void arc4_setup( arc4_context *ctx, unsigned char *key, int keylen );
  */
 void arc4_crypt( arc4_context *ctx, unsigned char *buf, int buflen );
 
-/*
- * \brief          Checkup routine
- *
- * \return         0 if successful, or 1 if the test failed
- */
-int arc4_self_test( int verbose );
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* arc4.h */
+#endif /* LWIP_INCLUDED_POLARSSL_ARC4_H */
+
+#endif /* LWIP_INCLUDED_POLARSSL_ARC4 */

src/include/netif/ppp/ppp.h

@@ -85,10 +85,6 @@
 #define PPP_STATS_SUPPORT   0
 #endif
 
-#ifndef MPPE_SUPPORT
-#define MPPE_SUPPORT        0
-#endif
-
 
 /*************************
 *** PUBLIC DEFINITIONS ***