Attachment 202531 Details for Bug 248716 – a better fix

[patch] a better fix

rhel5.patch (text/plain), 1.83 KB, created by Michal Schmidt on 2007-09-21 16:18:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Schmidt

Created: 2007-09-21 16:18:35 UTC

Size: 1.83 KB

patch

obsolete

>diff -up linux-2.6.18.x86_64/drivers/net/ppp_mppe.c.orig linux-2.6.18.x86_64/drivers/net/ppp_mppe.c
>--- linux-2.6.18.x86_64/drivers/net/ppp_mppe.c.orig	2006-09-20 05:42:06.000000000 +0200
>+++ linux-2.6.18.x86_64/drivers/net/ppp_mppe.c	2007-09-21 17:33:35.000000000 +0200
>@@ -134,7 +134,7 @@ struct ppp_mppe_state {
>  * Key Derivation, from RFC 3078, RFC 3079.
>  * Equivalent to Get_Key() for MS-CHAP as described in RFC 3079.
>  */
>-static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *InterimKey)
>+static void get_new_key_from_sha(struct ppp_mppe_state * state)
> {
> 	struct scatterlist sg[4];
> 
>@@ -144,8 +144,6 @@ static void get_new_key_from_sha(struct 
> 	setup_sg(&sg[3], sha_pad->sha_pad2, sizeof(sha_pad->sha_pad2));
> 
> 	crypto_digest_digest (state->sha1, sg, 4, state->sha1_digest);
>-
>-	memcpy(InterimKey, state->sha1_digest, state->keylen);
> }
> 
> /*
>@@ -154,20 +152,20 @@ static void get_new_key_from_sha(struct 
>  */
> static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
> {
>-	unsigned char InterimKey[MPPE_MAX_KEY_LEN];
> 	struct scatterlist sg_in[1], sg_out[1];
> 
>-	get_new_key_from_sha(state, InterimKey);
>+	get_new_key_from_sha(state);
> 	if (!initial_key) {
>-		crypto_cipher_setkey(state->arc4, InterimKey, state->keylen);
>-		setup_sg(sg_in, InterimKey, state->keylen);
>+		crypto_cipher_setkey(state->arc4, state->sha1_digest,
>+				     state->keylen);
>+		setup_sg(sg_in, state->sha1_digest, state->keylen);
> 		setup_sg(sg_out, state->session_key, state->keylen);
> 		if (crypto_cipher_encrypt(state->arc4, sg_out, sg_in,
> 				      state->keylen) != 0) {
>     		    printk(KERN_WARNING "mppe_rekey: cipher_encrypt failed\n");
> 		}
> 	} else {
>-		memcpy(state->session_key, InterimKey, state->keylen);
>+		memcpy(state->session_key, state->sha1_digest, state->keylen);
> 	}
> 	if (state->keylen == 8) {
> 		/* See RFC 3078 */

Actions: View | Diff

Attachments on bug 248716: 199981 | 202531