Apply Crypto API wrappers to the exported crypto symbol in CONFIG_CRYPTO_RNG2-related crypto to convert them into pluggable interface.
This patch is partially based on work by Vegard Nossum, with modifications. Unlike the original, we do not include DEFINE_CRYPTO_API since only one copy of the crypto symbols is kept, either in the crypto module or in the main kernel, and we ensure such wrapper do not have impact on crypto already chosen built as module. Co-developed-by: Vegard Nossum <[email protected]> Signed-off-by: Jay Wang <[email protected]> --- crypto/Makefile | 2 +- crypto/fips140/fips140-api.c | 23 ++++++++++++++++++++++- include/crypto/internal/rng.h | 21 ++++++++++++++++----- include/crypto/rng.h | 18 +++++++++++++----- 4 files changed, 52 insertions(+), 12 deletions(-) diff --git a/crypto/Makefile b/crypto/Makefile index 647797922678..4c87e141c961 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -162,7 +162,7 @@ obj-$(CONFIG_CRYPTO_LZ4) += lz4.o obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o obj-$(CONFIG_CRYPTO_XXHASH) += xxhash_generic.o obj-$(CONFIG_CRYPTO_842) += 842.o -obj-$(CONFIG_CRYPTO_RNG2) += rng.o +crypto-objs-$(CONFIG_CRYPTO_RNG2) += rng.o obj-$(CONFIG_CRYPTO_DRBG) += drbg.o obj-$(CONFIG_CRYPTO_JITTERENTROPY) += jitterentropy_rng.o CFLAGS_jitterentropy.o = -O0 diff --git a/crypto/fips140/fips140-api.c b/crypto/fips140/fips140-api.c index 3cfe147b984c..20afa1c21cf0 100644 --- a/crypto/fips140/fips140-api.c +++ b/crypto/fips140/fips140-api.c @@ -391,4 +391,25 @@ DEFINE_CRYPTO_VAR_STUB(md5_zero_message_hash); DEFINE_CRYPTO_API_STUB(crypto_authenc_extractkeys); -#endif \ No newline at end of file +#endif +/* + * crypto/rng.c + */ +#if IS_BUILTIN(CONFIG_CRYPTO_RNG2) + +#include <crypto/rng.h> + +DEFINE_CRYPTO_API_STUB(crypto_get_default_rng); +DEFINE_CRYPTO_API_STUB(crypto_put_default_rng); +DEFINE_CRYPTO_API_STUB(crypto_alloc_rng); +DEFINE_CRYPTO_API_STUB(crypto_rng_reset); + +#include <crypto/internal/rng.h> + +DEFINE_CRYPTO_API_STUB(crypto_register_rng); +DEFINE_CRYPTO_API_STUB(crypto_unregister_rng); +DEFINE_CRYPTO_API_STUB(crypto_register_rngs); +DEFINE_CRYPTO_API_STUB(crypto_unregister_rngs); +DEFINE_CRYPTO_API_STUB(crypto_del_default_rng); + +#endif diff --git a/include/crypto/internal/rng.h b/include/crypto/internal/rng.h index e0711b6a597f..b281d8eb9405 100644 --- a/include/crypto/internal/rng.h +++ b/include/crypto/internal/rng.h @@ -9,16 +9,27 @@ #ifndef _CRYPTO_INTERNAL_RNG_H #define _CRYPTO_INTERNAL_RNG_H +#include <crypto/api.h> #include <crypto/algapi.h> #include <crypto/rng.h> -int crypto_register_rng(struct rng_alg *alg); -void crypto_unregister_rng(struct rng_alg *alg); -int crypto_register_rngs(struct rng_alg *algs, int count); -void crypto_unregister_rngs(struct rng_alg *algs, int count); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_RNG2, crypto_register_rng, int, + (struct rng_alg *alg), + (alg)); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_RNG2, crypto_unregister_rng, void, + (struct rng_alg *alg), + (alg)); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_RNG2, crypto_register_rngs, int, + (struct rng_alg *algs, int count), + (algs, count)); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_RNG2, crypto_unregister_rngs, void, + (struct rng_alg *algs, int count), + (algs, count)); #if defined(CONFIG_CRYPTO_RNG) || defined(CONFIG_CRYPTO_RNG_MODULE) -int crypto_del_default_rng(void); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_RNG2, crypto_del_default_rng, int, + (void), + ()); #else static inline int crypto_del_default_rng(void) { diff --git a/include/crypto/rng.h b/include/crypto/rng.h index d451b54b322a..89a78f4a6e37 100644 --- a/include/crypto/rng.h +++ b/include/crypto/rng.h @@ -9,6 +9,7 @@ #ifndef _CRYPTO_RNG_H #define _CRYPTO_RNG_H +#include <crypto/api.h> #include <linux/atomic.h> #include <linux/container_of.h> #include <linux/crypto.h> @@ -59,8 +60,12 @@ struct crypto_rng { extern struct crypto_rng *crypto_default_rng; -int crypto_get_default_rng(void); -void crypto_put_default_rng(void); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_RNG2, crypto_get_default_rng, int, + (void), + ()); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_RNG2, crypto_put_default_rng, void, + (void), + ()); /** * DOC: Random number generator API @@ -89,7 +94,9 @@ void crypto_put_default_rng(void); * Return: allocated cipher handle in case of success; IS_ERR() is true in case * of an error, PTR_ERR() returns the error code. */ -struct crypto_rng *crypto_alloc_rng(const char *alg_name, u32 type, u32 mask); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_RNG2, crypto_alloc_rng, struct crypto_rng *, + (const char *alg_name, u32 type, u32 mask), + (alg_name, type, mask)); static inline struct crypto_tfm *crypto_rng_tfm(struct crypto_rng *tfm) { @@ -177,8 +184,9 @@ static inline int crypto_rng_get_bytes(struct crypto_rng *tfm, * * Return: 0 if the setting of the key was successful; < 0 if an error occurred */ -int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed, - unsigned int slen); +DECLARE_CRYPTO_API(CONFIG_CRYPTO_RNG2, crypto_rng_reset, int, + (struct crypto_rng *tfm, const u8 *seed, unsigned int slen), + (tfm, seed, slen)); /** * crypto_rng_seedsize() - obtain seed size of RNG -- 2.47.3
