diff options
| author | Mister Oyster <oysterized@gmail.com> | 2018-01-05 03:20:13 +0100 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2018-01-05 03:30:24 +0100 |
| commit | d85ec51c5de8fd3549f05d0208c42aa8bbc9ebf5 (patch) | |
| tree | f24ae1ec1fb3947323b006d121fdb102706bbafb | |
| parent | 58ca1d9f1e9f2cb8d19d436bf6405ba8930fff13 (diff) | |
Revert "crypto: api - prevent helper ciphers from being used"
This reverts commit 467b365068b0376fd670b1b97c22679e9a280bb1.
| -rw-r--r-- | crypto/api.c | 10 | ||||
| -rw-r--r-- | include/linux/crypto.h | 6 |
2 files changed, 0 insertions, 16 deletions
diff --git a/crypto/api.c b/crypto/api.c index 583ccdce2..36a0d4602 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -257,16 +257,6 @@ struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask) mask |= CRYPTO_ALG_TESTED; } - /* - * If the internal flag is set for a cipher, require a caller to - * to invoke the cipher with the internal flag to use that cipher. - * Also, if a caller wants to allocate a cipher that may or may - * not be an internal cipher, use type | CRYPTO_ALG_INTERNAL and - * !(mask & CRYPTO_ALG_INTERNAL). - */ - if (!((type | mask) & CRYPTO_ALG_INTERNAL)) - mask |= CRYPTO_ALG_INTERNAL; - larval = crypto_larval_lookup(name, type, mask); if (IS_ERR(larval) || !crypto_is_larval(larval)) return larval; diff --git a/include/linux/crypto.h b/include/linux/crypto.h index b9cbc363c..61dd0b15d 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -95,12 +95,6 @@ #define CRYPTO_ALG_KERN_DRIVER_ONLY 0x00001000 /* - * Mark a cipher as a service implementation only usable by another - * cipher and never by a normal user of the kernel crypto API - */ -#define CRYPTO_ALG_INTERNAL 0x00002000 - -/* * Transform masks and values (for crt_flags). */ #define CRYPTO_TFM_REQ_MASK 0x000fff00 |