Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1be242c authored by Dmitry Kasatkin's avatar Dmitry Kasatkin Committed by James Morris
Browse files

integrity: digital signature config option name change 



Similar to SIGNATURE, rename INTEGRITY_DIGSIG to INTEGRITY_SIGNATURE.

Signed-off-by: default avatarDmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 2e5f094b

security/integrity/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

security/integrity/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

security/integrity/integrity.h

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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;