aboutsummaryrefslogtreecommitdiffstats
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 {
46 char mpi[0]; 46 char mpi[0];
47} __packed; 47} __packed;
48 48
49#if defined(CONFIG_DIGSIG) || defined(CONFIG_DIGSIG_MODULE) 49#if defined(CONFIG_SIGNATURE) || defined(CONFIG_SIGNATURE_MODULE)
50 50
51int digsig_verify(struct key *keyring, const char *sig, int siglen, 51int digsig_verify(struct key *keyring, const char *sig, int siglen,
52 const char *digest, int digestlen); 52 const char *digest, int digestlen);
@@ -59,6 +59,6 @@ static inline int digsig_verify(struct key *keyring, const char *sig,
59 return -EOPNOTSUPP; 59 return -EOPNOTSUPP;
60} 60}
61 61
62#endif /* CONFIG_DIGSIG */ 62#endif /* CONFIG_SIGNATURE */
63 63
64#endif /* _DIGSIG_H */ 64#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
302 This code in unnecessary for RSA digital signature verification, 302 This code in unnecessary for RSA digital signature verification,
303 and can be compiled if needed. 303 and can be compiled if needed.
304 304
305config DIGSIG 305config SIGNATURE
306 tristate "In-kernel signature checker" 306 tristate "In-kernel signature checker"
307 depends on KEYS 307 depends on KEYS
308 select MPILIB 308 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
119obj-$(CONFIG_DQL) += dynamic_queue_limits.o 119obj-$(CONFIG_DQL) += dynamic_queue_limits.o
120 120
121obj-$(CONFIG_MPILIB) += mpi/ 121obj-$(CONFIG_MPILIB) += mpi/
122obj-$(CONFIG_DIGSIG) += digsig.o 122obj-$(CONFIG_SIGNATURE) += digsig.o
123 123
124hostprogs-y := gen_crc32table 124hostprogs-y := gen_crc32table
125clean-files := crc32table.h 125clean-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
7 boolean "Digital signature verification using multiple keyrings" 7 boolean "Digital signature verification using multiple keyrings"
8 depends on INTEGRITY && KEYS 8 depends on INTEGRITY && KEYS
9 default n 9 default n
10 select DIGSIG 10 select SIGNATURE
11 help 11 help
12 This option enables digital signature verification support 12 This option enables digital signature verification support
13 using multiple keyrings. It defines separate keyrings for each 13 using multiple keyrings. It defines separate keyrings for each