diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-12-15 15:35:40 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-12-15 15:35:40 -0800 |
| commit | 68eebd5c343394f45361e9e3732cfbb8a3e32e32 (patch) | |
| tree | 5c2ba83f864fd69c4e7620c6983b8814b11a919d /Add-an-EFI-signature-blob-parser-and-key-loader.patch | |
| parent | 5de569a890be505e0ec46d2b1c9691f0405a17c6 (diff) | |
| download | kernel-68eebd5c343394f45361e9e3732cfbb8a3e32e32.tar.gz kernel-68eebd5c343394f45361e9e3732cfbb8a3e32e32.tar.xz kernel-68eebd5c343394f45361e9e3732cfbb8a3e32e32.zip | |
Linux v4.9 rebase
Diffstat (limited to 'Add-an-EFI-signature-blob-parser-and-key-loader.patch')
| -rw-r--r-- | Add-an-EFI-signature-blob-parser-and-key-loader.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Add-an-EFI-signature-blob-parser-and-key-loader.patch b/Add-an-EFI-signature-blob-parser-and-key-loader.patch index 3697a4b74..f57abc9f2 100644 --- a/Add-an-EFI-signature-blob-parser-and-key-loader.patch +++ b/Add-an-EFI-signature-blob-parser-and-key-loader.patch @@ -1,7 +1,7 @@ -From e36a2d65e25fdf42b50aa5dc17583d7bfd09c4c4 Mon Sep 17 00:00:00 2001 +From 822b4b3eb76ca451a416a51f0a7bfedfa5c5ea39 Mon Sep 17 00:00:00 2001 From: Dave Howells <dhowells@redhat.com> Date: Tue, 23 Oct 2012 09:36:28 -0400 -Subject: [PATCH 5/9] Add an EFI signature blob parser and key loader. +Subject: [PATCH 16/20] Add an EFI signature blob parser and key loader. X.509 certificates are loaded into the specified keyring as asymmetric type keys. @@ -17,10 +17,10 @@ Signed-off-by: David Howells <dhowells@redhat.com> create mode 100644 crypto/asymmetric_keys/efi_parser.c diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig -index e28e912000a7..94024e8aedaa 100644 +index 331f6baf2df8..5f9002d3192e 100644 --- a/crypto/asymmetric_keys/Kconfig +++ b/crypto/asymmetric_keys/Kconfig -@@ -60,4 +60,12 @@ config SIGNED_PE_FILE_VERIFICATION +@@ -61,4 +61,12 @@ config SIGNED_PE_FILE_VERIFICATION This option provides support for verifying the signature(s) on a signed PE binary. @@ -160,10 +160,10 @@ index 000000000000..636feb18b733 + return 0; +} diff --git a/include/linux/efi.h b/include/linux/efi.h -index 8c274b4ea8e6..ff1877145aa4 100644 +index 190858d62fe3..668aa1244885 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h -@@ -1044,6 +1044,10 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm, +@@ -1025,6 +1025,10 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm, char * __init efi_md_typeattr_format(char *buf, size_t size, const efi_memory_desc_t *md); @@ -175,5 +175,5 @@ index 8c274b4ea8e6..ff1877145aa4 100644 * efi_range_is_wc - check the WC bit on an address range * @start: starting kvirt address -- -2.5.5 +2.9.3 |