2022-01-26 20:13:43

by Stephan Müller

[permalink] [raw]
Subject: [PATCH 4/7] crypto: move Jitter RNG header include dir

To support the ESDM operation which uses the Jitter RNG separately
from the kernel crypto API, the header file must be accessible to
the ESDM code.

Signed-off-by: Stephan Mueller <[email protected]>
---
crypto/jitterentropy-kcapi.c | 3 +--
crypto/jitterentropy.c | 2 +-
{crypto => include/crypto/internal}/jitterentropy.h | 0
3 files changed, 2 insertions(+), 3 deletions(-)
rename {crypto => include/crypto/internal}/jitterentropy.h (100%)

diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c
index 2d115bec15ae..40bc51f32432 100644
--- a/crypto/jitterentropy-kcapi.c
+++ b/crypto/jitterentropy-kcapi.c
@@ -41,10 +41,9 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/time.h>
+#include <crypto/internal/jitterentropy.h>
#include <crypto/internal/rng.h>

-#include "jitterentropy.h"
-
/***************************************************************************
* Helper function
***************************************************************************/
diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c
index 93bff3213823..81b80a4d3d3a 100644
--- 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 "jitterentropy.h"
+#include <crypto/internal/jitterentropy.h>

/***************************************************************************
* Adaptive Proportion Test
diff --git a/crypto/jitterentropy.h b/include/crypto/internal/jitterentropy.h
similarity index 100%
rename from crypto/jitterentropy.h
rename to include/crypto/internal/jitterentropy.h
--
2.33.1