ppp: mppe: Revert "ppp: mppe: Add softdep to arc4"
PATCH 1/1 ppp: mppe: Revert "ppp: mppe: Add softdep to arc4"
From: Eric Biggers <[email protected]>
Commit 0e5a610b5ca5 ("ppp: mppe: switch to RC4 library interface"), which was merged through the crypto tree for v5.3, changed ppp_mppe.c to use the new arc4_crypt() library function rather than access RC4 through the dynamic crypto_skcipher API.
Meanwhile commit aad1dcc4f011 ("ppp: mppe: Add softdep to arc4") was merged through the net tree and added a module soft-dependency on "arc4".
The latter commit no longer makes sense because the code now uses the "libarc4" module rather than "arc4", and also due to the direct use of arc4_crypt(), no module soft-dependency is required.
So revert the latter commit.
--- drivers/net/ppp/ppp_mppe.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ppp/ppp_mppe.c +0 -1
@@ -64,7 +64,6 @@ MODULE_AUTHOR("Frank Cusack <[email protected]>");MODULE_DESCRIPTION ("Point-to-Point Protocol Microsoft Point-to-Point Encryption support" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_ALIAS ("ppp-compress-" __stringify(CI_MPPE )); -MODULE_SOFTDEP ("pre: arc4" );MODULE_VERSION ("1.0.2" );#define SHA1_PAD_SIZE 40
Signature · 1 line
2.22.0
From: Eric Biggers <[email protected]>
Date: Fri, 12 Jul 2019 16:39:31 -0700
Quoted 14 lines
From: Eric Biggers <[email protected]>
Commit
0e5a610b5ca5("ppp: mppe: switch to RC4 library interface"), which was merged through the crypto tree for v5.3, changedppp_mppe.cto use the newarc4_crypt()library function rather than access RC4 through the dynamiccrypto_skcipherAPI.Meanwhile commit
aad1dcc4f011("ppp: mppe: Add softdep to arc4") was merged through the net tree and added a module soft-dependency on "arc4".The latter commit no longer makes sense because the code now uses the "libarc4" module rather than "arc4", and also due to the direct use of
arc4_crypt(), no module soft-dependency is required.
Quoted 5 lines
So revert the latter commit.
Cc Takashi Iwai <[email protected]>Cc Ard Biesheuvel <[email protected]>Signed-off-by Eric Biggers <[email protected]>
Applied.