abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 13:34:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

PPP, magic, enables building without PPP_MD5_RANDM support

Browse Source 
The only API difference with and without the PPP_MD5_RANDM support is the
availability of the random_bytes() function. Added a random_bytes()
function on top of magic() when PPP_MD5_RANDM support is not enabled,
thus allowing builds for both cases.

PPP_MD5_RANDM is still enabled by default (it was mandatory) if a protocol
using encryption is enabled, such as CHAP, EAP, or L2TP auth support.
This commit is contained in:
Sylvain Rochet 2015-08-30 18:41:41 +02:00
parent ced7bef274
commit d0fa8acf86
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/include/lwip/opt.h
View File

@ -2159,16 +2159,11 @@
/** /**
* PPP_MD5_RANDM==1: Use MD5 for better randomness. * PPP_MD5_RANDM==1: Use MD5 for better randomness.
* Automatically enabled if CHAP or L2TP AUTH support is enabled. * Enabled by default if CHAP, EAP, or L2TP AUTH support is enabled.
*/ */
#ifndef PPP_MD5_RANDM #ifndef PPP_MD5_RANDM
#define PPP_MD5_RANDM 0 #define PPP_MD5_RANDM (CHAP_SUPPORT || EAP_SUPPORT || PPPOL2TP_AUTH_SUPPORT)
#endif #endif
#if CHAP_SUPPORT || PPPOL2TP_AUTH_SUPPORT
/* MD5 Random is required for CHAP and L2TP AUTH */
#undef PPP_MD5_RANDM
#define PPP_MD5_RANDM 1
#endif /* CHAP_SUPPORT || PPPOL2TP_AUTH_SUPPORT */
/** /**
* PolarSSL library, used if necessary and not previously disabled * PolarSSL library, used if necessary and not previously disabled

14
src/include/netif/ppp/magic.h
View File

@ -100,12 +100,6 @@ void magic_randomize(void);
*/ */
u32_t magic(void); /* Returns the next magic number */ u32_t magic(void); /* Returns the next magic number */
/*
* Return a new random number between 0 and (2^pow)-1 included.
*/
u32_t magic_pow(u8_t pow);
#if PPP_MD5_RANDM
/* /*
* Fill buffer with random bytes * Fill buffer with random bytes
* *
@ -116,8 +110,12 @@ u32_t magic_pow(u8_t pow);
* least some degree. Also, it's important to get a good seed before * least some degree. Also, it's important to get a good seed before
* the first use. * the first use.
*/ */
void random_bytes(unsigned char *buf, u32_t len); void random_bytes(unsigned char *buf, u32_t buf_len);
#endif /* PPP_MD5_RANDM */
/*
* Return a new random number between 0 and (2^pow)-1 included.
*/
u32_t magic_pow(u8_t pow);
#endif /* MAGIC_H */ #endif /* MAGIC_H */

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

@ -209,7 +209,7 @@ static u32_t magic_randomseed = 0; /* Seed used for random number generatio
* operational. Thus we call it again on the first random * operational. Thus we call it again on the first random
* event. * event.
*/ */
void magic_init() { void magic_init(void) {
magic_randomseed += sys_jiffies(); magic_randomseed += sys_jiffies();
/* Initialize the Borland random number generator. */ /* Initialize the Borland random number generator. */
@ -249,10 +249,24 @@ void magic_randomize(void) {
* operator or network events in which case it will be pseudo random * operator or network events in which case it will be pseudo random
* seeded by the real time clock. * seeded by the real time clock.
*/ */
u32_t magic() { u32_t magic(void) {
return ((((u32_t)rand() << 16) + rand()) + magic_randomseed); return ((((u32_t)rand() << 16) + rand()) + magic_randomseed);
} }
/*
* random_bytes - Fill a buffer with random bytes.
*/
void random_bytes(unsigned char *buf, u32_t buf_len) {
u32_t new_rand, n;
while (buf_len > 0) {
new_rand = magic();
n = LWIP_MIN(buf_len, sizeof(new_rand));
MEMCPY(buf, &new_rand, n);
buf += n;
buf_len -= n;
}
}
#endif /* PPP_MD5_RANDM */ #endif /* PPP_MD5_RANDM */
/* /*