[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190712233931.17350-1-ebiggers@kernel.org>
Date: Fri, 12 Jul 2019 16:39:31 -0700
From: Eric Biggers <ebiggers@...nel.org>
To: netdev@...r.kernel.org, linux-ppp@...r.kernel.org,
"David S . Miller" <davem@...emloft.net>,
Paul Mackerras <paulus@...ba.org>
Cc: linux-crypto@...r.kernel.org, Takashi Iwai <tiwai@...e.de>,
Ard Biesheuvel <ard.biesheuvel@...aro.org>
Subject: [PATCH net] ppp: mppe: Revert "ppp: mppe: Add softdep to arc4"
From: Eric Biggers <ebiggers@...gle.com>
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.
Cc: Takashi Iwai <tiwai@...e.de>
Cc: Ard Biesheuvel <ard.biesheuvel@...aro.org>
Signed-off-by: Eric Biggers <ebiggers@...gle.com>
---
drivers/net/ppp/ppp_mppe.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
index bd3c80b0bc77d..de3b57d09d0cb 100644
--- a/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
@@ -64,7 +64,6 @@ MODULE_AUTHOR("Frank Cusack <fcusack@...sack.com>");
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
--
2.22.0
Powered by blists - more mailing lists