Skip to content

Commit

Permalink
integrity: digital signature config option name change
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Kasatkin authored and James Morris committed Jan 17, 2012
1 parent 2e5f094 commit f1be242
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion security/integrity/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ config INTEGRITY
def_bool y
depends on IMA || EVM

config INTEGRITY_DIGSIG
config INTEGRITY_SIGNATURE
boolean "Digital signature verification using multiple keyrings"
depends on INTEGRITY && KEYS
default n
Expand Down
2 changes: 1 addition & 1 deletion security/integrity/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#

obj-$(CONFIG_INTEGRITY) += integrity.o
obj-$(CONFIG_INTEGRITY_DIGSIG) += digsig.o
obj-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o

integrity-y := iint.o

Expand Down
4 changes: 2 additions & 2 deletions security/integrity/integrity.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct integrity_iint_cache *integrity_iint_find(struct inode *inode);
#define INTEGRITY_KEYRING_IMA 2
#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,
const char *digest, int digestlen);
Expand All @@ -65,7 +65,7 @@ static inline int integrity_digsig_verify(const unsigned int id,
return -EOPNOTSUPP;
}

#endif /* CONFIG_INTEGRITY_DIGSIG */
#endif /* CONFIG_INTEGRITY_SIGNATURE */

/* set during initialization */
extern int iint_initialized;

0 comments on commit f1be242

Please sign in to comment.