From 3f61596ef80032a57d50d9435e38dcba848adcb6 Mon Sep 17 00:00:00 2001
From: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Date: Tue, 17 Jan 2012 17:12:03 +0200
Subject: [PATCH] --- yaml --- r: 286080 b: refs/heads/master c:
 5e8898e97a5db4125d944070922164d1d09a2689 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/digsig.h     | 4 ++--
 trunk/lib/Kconfig                | 2 +-
 trunk/lib/Makefile               | 2 +-
 trunk/security/integrity/Kconfig | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0b6d92006e49..1ab306532863 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ac6172a935d1faf7ef259802267657bc0007a62
+refs/heads/master: 5e8898e97a5db4125d944070922164d1d09a2689
diff --git a/trunk/include/linux/digsig.h b/trunk/include/linux/digsig.h
index efae755017d7..b01558b15814 100644
--- a/trunk/include/linux/digsig.h
+++ b/trunk/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/trunk/lib/Kconfig b/trunk/lib/Kconfig
index 201e1b33d721..854735d96dc3 100644
--- a/trunk/lib/Kconfig
+++ b/trunk/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/trunk/lib/Makefile b/trunk/lib/Makefile
index dace162c7e1c..d71aae1b01b3 100644
--- a/trunk/lib/Makefile
+++ b/trunk/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/trunk/security/integrity/Kconfig b/trunk/security/integrity/Kconfig
index d384ea921482..ff60bf72881f 100644
--- a/trunk/security/integrity/Kconfig
+++ b/trunk/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