Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

integrity: digital signature config option name change

Browse Source 
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>
This commit is contained in:
Dmitry Kasatkin 2012-01-17 17:12:07 +02:00 committed by James Morris
parent 2e5f094b9d
commit f1be242c95
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/integrity/Kconfig
View File

@ -3,7 +3,7 @@ config INTEGRITY
def_bool y def_bool y
depends on IMA || EVM depends on IMA || EVM
config INTEGRITY_DIGSIG config INTEGRITY_SIGNATURE
boolean "Digital signature verification using multiple keyrings" boolean "Digital signature verification using multiple keyrings"
depends on INTEGRITY && KEYS depends on INTEGRITY && KEYS
default n default n

2
security/integrity/Makefile
View File

@ -3,7 +3,7 @@
# #
obj-$(CONFIG_INTEGRITY) += integrity.o obj-$(CONFIG_INTEGRITY) += integrity.o
obj-$(CONFIG_INTEGRITY_DIGSIG) += digsig.o obj-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o
integrity-y := iint.o integrity-y := iint.o

4
security/integrity/integrity.h
View File

@ -51,7 +51,7 @@ struct integrity_iint_cache *integrity_iint_find(struct inode *inode);
#define INTEGRITY_KEYRING_IMA 2 #define INTEGRITY_KEYRING_IMA 2
#define INTEGRITY_KEYRING_MAX 3 #define INTEGRITY_KEYRING_MAX 3
#ifdef CONFIG_INTEGRITY_DIGSIG #ifdef CONFIG_INTEGRITY_SIGNATURE
int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,
const char *digest, int digestlen); const char *digest, int digestlen);
@ -65,7 +65,7 @@ static inline int integrity_digsig_verify(const unsigned int id,
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
#endif /* CONFIG_INTEGRITY_DIGSIG */ #endif /* CONFIG_INTEGRITY_SIGNATURE */
/* set during initialization */ /* set during initialization */
extern int iint_initialized; extern int iint_initialized;