diff options
author | Dmitry Kasatkin <dmitry.kasatkin@intel.com> | 2012-01-17 10:12:07 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2012-01-17 18:46:27 -0500 |
commit | f1be242c95257b199d8b679bc952ca33487c9af6 (patch) | |
tree | fa3a1057bbd9caedca959c1fa3811413bf101d7d /security/integrity | |
parent | 2e5f094b9dbf9463ab93f86351cd1a8dc88942cc (diff) |
integrity: digital signature config option name change
Similar to SIGNATURE, rename INTEGRITY_DIGSIG to INTEGRITY_SIGNATURE.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/integrity')
-rw-r--r-- | security/integrity/Kconfig | 2 | ||||
-rw-r--r-- | security/integrity/Makefile | 2 | ||||
-rw-r--r-- | security/integrity/integrity.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/security/integrity/Kconfig b/security/integrity/Kconfig index ff60bf72881f..5bd1cc1b4a54 100644 --- a/security/integrity/Kconfig +++ b/security/integrity/Kconfig | |||
@@ -3,7 +3,7 @@ config INTEGRITY | |||
3 | def_bool y | 3 | def_bool y |
4 | depends on IMA || EVM | 4 | depends on IMA || EVM |
5 | 5 | ||
6 | config INTEGRITY_DIGSIG | 6 | config INTEGRITY_SIGNATURE |
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 |
diff --git a/security/integrity/Makefile b/security/integrity/Makefile index bece0563ee5e..d43799cc14f6 100644 --- a/security/integrity/Makefile +++ b/security/integrity/Makefile | |||
@@ -3,7 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_INTEGRITY) += integrity.o | 5 | obj-$(CONFIG_INTEGRITY) += integrity.o |
6 | obj-$(CONFIG_INTEGRITY_DIGSIG) += digsig.o | 6 | obj-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o |
7 | 7 | ||
8 | integrity-y := iint.o | 8 | integrity-y := iint.o |
9 | 9 | ||
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h index 4da6ba81d153..7a25ecec5aaa 100644 --- a/security/integrity/integrity.h +++ b/security/integrity/integrity.h | |||
@@ -51,7 +51,7 @@ struct integrity_iint_cache *integrity_iint_find(struct inode *inode); | |||
51 | #define INTEGRITY_KEYRING_IMA 2 | 51 | #define INTEGRITY_KEYRING_IMA 2 |
52 | #define INTEGRITY_KEYRING_MAX 3 | 52 | #define INTEGRITY_KEYRING_MAX 3 |
53 | 53 | ||
54 | #ifdef CONFIG_INTEGRITY_DIGSIG | 54 | #ifdef CONFIG_INTEGRITY_SIGNATURE |
55 | 55 | ||
56 | int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, | 56 | int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, |
57 | const char *digest, int digestlen); | 57 | const char *digest, int digestlen); |
@@ -65,7 +65,7 @@ static inline int integrity_digsig_verify(const unsigned int id, | |||
65 | return -EOPNOTSUPP; | 65 | return -EOPNOTSUPP; |
66 | } | 66 | } |
67 | 67 | ||
68 | #endif /* CONFIG_INTEGRITY_DIGSIG */ | 68 | #endif /* CONFIG_INTEGRITY_SIGNATURE */ |
69 | 69 | ||
70 | /* set during initialization */ | 70 | /* set during initialization */ |
71 | extern int iint_initialized; | 71 | extern int iint_initialized; |