Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (1a4edd90) · Commits · e / devices / android_kernel_teracube_mt6765

include/linux/digsig.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@ enum digest_algo {

	struct pubkey_hdr {		struct pubkey_hdr {
	uint8_t version; /* key format version */		uint8_t version; /* key format version */
	time_t timestamp; /* key made, always 0 for now */		uint32_t timestamp; /* key made, always 0 for now */
	uint8_t algo;		uint8_t algo;
	uint8_t nmpi;		uint8_t nmpi;
	char mpi[0];		char mpi[0];
	@@ -38,7 +38,7 @@ struct pubkey_hdr {

	struct signature_hdr {		struct signature_hdr {
	uint8_t version; /* signature format version */		uint8_t version; /* signature format version */
	time_t timestamp; /* signature made */		uint32_t timestamp; /* signature made */
	uint8_t algo;		uint8_t algo;
	uint8_t hash;		uint8_t hash;
	uint8_t keyid[8];		uint8_t keyid[8];