summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/digsig.h4
-rw-r--r--lib/Kconfig2
-rw-r--r--lib/Makefile2
-rw-r--r--security/integrity/Kconfig2
4 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/digsig.h b/include/linux/digsig.h
index efae755017d7..b01558b15814 100644
--- a/include/linux/digsig.h
+++ b/include/linux/digsig.h
@@ -46,7 +46,7 @@ struct signature_hdr {
char mpi[0];
} __packed;
-#if defined(CONFIG_DIGSIG) || defined(CONFIG_DIGSIG_MODULE)
+#if defined(CONFIG_SIGNATURE) || defined(CONFIG_SIGNATURE_MODULE)
int digsig_verify(struct key *keyring, const char *sig, int siglen,
const char *digest, int digestlen);
@@ -59,6 +59,6 @@ static inline int digsig_verify(struct key *keyring, const char *sig,
return -EOPNOTSUPP;
}
-#endif /* CONFIG_DIGSIG */
+#endif /* CONFIG_SIGNATURE */
#endif /* _DIGSIG_H */
diff --git a/lib/Kconfig b/lib/Kconfig
index 201e1b33d721..854735d96dc3 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -302,7 +302,7 @@ config MPILIB_EXTRA
This code in unnecessary for RSA digital signature verification,
and can be compiled if needed.
-config DIGSIG
+config SIGNATURE
tristate "In-kernel signature checker"
depends on KEYS
select MPILIB
diff --git a/lib/Makefile b/lib/Makefile
index dace162c7e1c..d71aae1b01b3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -119,7 +119,7 @@ obj-$(CONFIG_CORDIC) += cordic.o
obj-$(CONFIG_DQL) += dynamic_queue_limits.o
obj-$(CONFIG_MPILIB) += mpi/
-obj-$(CONFIG_DIGSIG) += digsig.o
+obj-$(CONFIG_SIGNATURE) += digsig.o
hostprogs-y := gen_crc32table
clean-files := crc32table.h
diff --git a/security/integrity/Kconfig b/security/integrity/Kconfig
index d384ea921482..ff60bf72881f 100644
--- a/security/integrity/Kconfig
+++ b/security/integrity/Kconfig
@@ -7,7 +7,7 @@ config INTEGRITY_DIGSIG
boolean "Digital signature verification using multiple keyrings"
depends on INTEGRITY && KEYS
default n
- select DIGSIG
+ select SIGNATURE
help
This option enables digital signature verification support
using multiple keyrings. It defines separate keyrings for each