mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-15 22:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, MPPE, reworked mppe_rekey()

Browse Source 
Moved sha1_context from struct ppp_mppe_state to stack, we don't need it past
mppe_rekey(). Moved shared MEMCPY() outside initial_key if block.
This commit is contained in:
Sylvain Rochet 2015-04-18 00:02:49 +02:00
parent f1cba8a0ea
commit 3618432107
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/netif/ppp/mppe.c
View File

@ -55,7 +55,6 @@
*/ */
struct ppp_mppe_state { struct ppp_mppe_state {
arc4_context arc4; arc4_context arc4;
u8_t sha1_digest[SHA1_SIGNATURE_SIZE];
unsigned char master_key[MPPE_MAX_KEY_LEN]; unsigned char master_key[MPPE_MAX_KEY_LEN];
unsigned char session_key[MPPE_MAX_KEY_LEN]; unsigned char session_key[MPPE_MAX_KEY_LEN];
unsigned keylen; /* key length in bytes */ unsigned keylen; /* key length in bytes */
@ -107,6 +106,7 @@ static const u8_t sha1_pad2[SHA1_PAD_SIZE] = {
static void mppe_rekey(struct ppp_mppe_state * state, int initial_key) static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
{ {
sha1_context sha1; sha1_context sha1;
u8_t sha1_digest[SHA1_SIGNATURE_SIZE];
/* /*
* Key Derivation, from RFC 3078, RFC 3079. * Key Derivation, from RFC 3078, RFC 3079.
@ -117,14 +117,12 @@ static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
sha1_update(&sha1, (unsigned char *)sha1_pad1, SHA1_PAD_SIZE); sha1_update(&sha1, (unsigned char *)sha1_pad1, SHA1_PAD_SIZE);
sha1_update(&sha1, state->session_key, state->keylen); sha1_update(&sha1, state->session_key, state->keylen);
sha1_update(&sha1, (unsigned char *)sha1_pad2, SHA1_PAD_SIZE); sha1_update(&sha1, (unsigned char *)sha1_pad2, SHA1_PAD_SIZE);
sha1_finish(&sha1, state->sha1_digest); sha1_finish(&sha1, sha1_digest);
MEMCPY(state->session_key, sha1_digest, state->keylen);
if (!initial_key) { if (!initial_key) {
arc4_setup(&state->arc4, state->sha1_digest, state->keylen); arc4_setup(&state->arc4, sha1_digest, state->keylen);
MEMCPY(state->session_key, state->sha1_digest, state->keylen);
arc4_crypt(&state->arc4, state->session_key, state->keylen); arc4_crypt(&state->arc4, state->session_key, state->keylen);
} else {
memcpy(state->session_key, state->sha1_digest, state->keylen);
} }
if (state->keylen == 8) { if (state->keylen == 8) {
/* See RFC 3078 */ /* See RFC 3078 */