drivers/char: Remove LRNG v44 patchset

Signed-off-by: Alexandre Frade <kernel@xanmod.org>
xanmod · May 30, 2022 · cafd914 · cafd914
1 parent 9ffe6c5
commit cafd914
Show file tree

Hide file tree

Showing 33 changed files with 10 additions and 7,306 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -11113,13 +11113,6 @@ F:	Documentation/litmus-tests/
 F:	Documentation/memory-barriers.txt
 F:	tools/memory-model/
 
-LINUX RANDOM NUMBER GENERATOR (LRNG) DRIVER
-M:	Stephan Mueller <smueller@chronox.de>
-S:	Maintained
-W:	https://www.chronox.de/lrng.html
-F:	drivers/char/lrng/
-F:	include/linux/lrng.h
-
 LIS3LV02D ACCELEROMETER DRIVER
 M:	Eric Piel <eric.piel@tremplin-utc.net>
 S:	Maintained

diff --git a/crypto/drbg.c b/crypto/drbg.c
@@ -115,7 +115,7 @@
  * the SHA256 / AES 256 over other ciphers. Thus, the favored
  * DRBGs are the latest entries in this array.
  */
-const struct drbg_core drbg_cores[] = {
+static const struct drbg_core drbg_cores[] = {
 #ifdef CONFIG_CRYPTO_DRBG_CTR
 	{
 		.flags = DRBG_CTR | DRBG_STRENGTH128,
@@ -192,7 +192,6 @@ const struct drbg_core drbg_cores[] = {
 	},
 #endif /* CONFIG_CRYPTO_DRBG_HMAC */
 };
-EXPORT_SYMBOL(drbg_cores);
 
 static int drbg_uninstantiate(struct drbg_state *drbg);
 
@@ -208,7 +207,7 @@ static int drbg_uninstantiate(struct drbg_state *drbg);
  * Return: normalized strength in *bytes* value or 32 as default
  *	   to counter programming errors
  */
-unsigned short drbg_sec_strength(drbg_flag_t flags)
+static inline unsigned short drbg_sec_strength(drbg_flag_t flags)
 {
 	switch (flags & DRBG_STRENGTH_MASK) {
 	case DRBG_STRENGTH128:
@@ -221,7 +220,6 @@ unsigned short drbg_sec_strength(drbg_flag_t flags)
 		return 32;
 	}
 }
-EXPORT_SYMBOL(drbg_sec_strength);
 
 /*
  * FIPS 140-2 continuous self test for the noise source
@@ -1254,7 +1252,7 @@ static int drbg_seed(struct drbg_state *drbg, struct drbg_string *pers,
 }
 
 /* Free all substructures in a DRBG state without the DRBG state structure */
-void drbg_dealloc_state(struct drbg_state *drbg)
+static inline void drbg_dealloc_state(struct drbg_state *drbg)
 {
 	if (!drbg)
 		return;
@@ -1275,13 +1273,12 @@ void drbg_dealloc_state(struct drbg_state *drbg)
 		drbg->fips_primed = false;
 	}
 }
-EXPORT_SYMBOL(drbg_dealloc_state);
 
 /*
  * Allocate all sub-structures for a DRBG state.
  * The DRBG state structure must already be allocated.
  */
-int drbg_alloc_state(struct drbg_state *drbg)
+static inline int drbg_alloc_state(struct drbg_state *drbg)
 {
 	int ret = -ENOMEM;
 	unsigned int sb_size = 0;
@@ -1362,7 +1359,6 @@ int drbg_alloc_state(struct drbg_state *drbg)
 	drbg_dealloc_state(drbg);
 	return ret;
 }
-EXPORT_SYMBOL(drbg_alloc_state);
 
 /*************************************************************************
  * DRBG interface functions
@@ -1899,7 +1895,8 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg,
  *
  * return: flags
  */
-void drbg_convert_tfm_core(const char *cra_driver_name, int *coreref, bool *pr)
+static inline void drbg_convert_tfm_core(const char *cra_driver_name,
+					 int *coreref, bool *pr)
 {
 	int i = 0;
 	size_t start = 0;
@@ -1926,7 +1923,6 @@ void drbg_convert_tfm_core(const char *cra_driver_name, int *coreref, bool *pr)
 		}
 	}
 }
-EXPORT_SYMBOL(drbg_convert_tfm_core);
 
 static int drbg_kcapi_init(struct crypto_tfm *tfm)
 {

diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c
@@ -42,7 +42,8 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <crypto/internal/rng.h>
-#include <crypto/internal/jitterentropy.h>
+
+#include "jitterentropy.h"
 
 /***************************************************************************
  * Helper function

diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c
@@ -133,7 +133,7 @@ struct rand_data {
 #define JENT_ENTROPY_SAFETY_FACTOR	64
 
 #include <linux/fips.h>
-#include <crypto/internal/jitterentropy.h>
+#include "jitterentropy.h"
 
 /***************************************************************************
  * Adaptive Proportion Test

diff --git a/include/crypto/internal/jitterentropy.h → crypto/jitterentropy.h b/include/crypto/internal/jitterentropy.h → crypto/jitterentropy.h
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
@@ -451,6 +451,4 @@ config RANDOM_TRUST_BOOTLOADER
 	pool. Otherwise, say N here so it will be regarded as device input that
 	only mixes the entropy pool.
 
-source "drivers/char/lrng/Kconfig"
-
 endmenu
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
@@ -3,14 +3,7 @@
 # Makefile for the kernel character device drivers.
 #
 
-obj-y				+= mem.o
-
-ifeq ($(CONFIG_LRNG),y)
-  obj-y				+= lrng/
-else
-  obj-y				+= random.o
-endif
-
+obj-y				+= mem.o random.o
 obj-$(CONFIG_TTY_PRINTK)	+= ttyprintk.o
 obj-y				+= misc.o
 obj-$(CONFIG_ATARI_DSP56K)	+= dsp56k.o