Merge tag 'modsign-pkcs7-20150812-3' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next

1 files changed, 50 insertions, 9 deletions

diff --git a/init/Kconfig b/init/Kconfig
index af09b4fb43d2..5d1a703663ad 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1752,6 +1752,37 @@ config SYSTEM_TRUSTED_KEYRING
 
           Keys in this keyring are used by module signature checking.
 
+config SYSTEM_TRUSTED_KEYS
+        string "Additional X.509 keys for default system keyring"
+        depends on SYSTEM_TRUSTED_KEYRING
+        help
+          If set, this option should be the filename of a PEM-formatted file
+          containing trusted X.509 certificates to be included in the default
+          system keyring. Any certificate used for module signing is implicitly
+          also trusted.
+
+          NOTE: If you previously provided keys for the system keyring in the
+          form of DER-encoded *.x509 files in the top-level build directory,
+          those are no longer used. You will need to set this option instead.
+
+config SYSTEM_DATA_VERIFICATION
+        def_bool n
+        select SYSTEM_TRUSTED_KEYRING
+        select KEYS
+        select CRYPTO
+        select ASYMMETRIC_KEY_TYPE
+        select ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+        select PUBLIC_KEY_ALGO_RSA
+        select ASN1
+        select OID_REGISTRY
+        select X509_CERTIFICATE_PARSER
+        select PKCS7_MESSAGE_PARSER
+        help
+          Provide PKCS#7 message verification using the contents of the system
+          trusted keyring to provide public keys.  This then can be used for
+          module verification, kexec image verification and firmware blob
+          verification.
+
 config PROFILING
         bool "Profiling support"
         help
@@ -1860,20 +1891,16 @@ config MODULE_SRCVERSION_ALL
 config MODULE_SIG
         bool "Module signature verification"
         depends on MODULES
-        select SYSTEM_TRUSTED_KEYRING
-        select KEYS
-        select CRYPTO
-        select ASYMMETRIC_KEY_TYPE
-        select ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-        select PUBLIC_KEY_ALGO_RSA
-        select ASN1
-        select OID_REGISTRY
-        select X509_CERTIFICATE_PARSER
+        select SYSTEM_DATA_VERIFICATION
         help
           Check modules for valid signatures upon load: the signature
           is simply appended to the module. For more information see
           Documentation/module-signing.txt.
 
+          Note that this option adds the OpenSSL development packages as a
+          kernel build dependency so that the signing tool can use its crypto
+          library.
+
           !!!WARNING!!!  If you enable this option, you MUST make sure that the
           module DOES NOT get stripped after being signed.  This includes the
           debuginfo strip done by some packagers (such as rpmbuild) and
@@ -1938,6 +1965,20 @@ config MODULE_SIG_HASH
         default "sha384" if MODULE_SIG_SHA384
         default "sha512" if MODULE_SIG_SHA512
 
+config MODULE_SIG_KEY
+        string "File name or PKCS#11 URI of module signing key"
+        default "signing_key.pem"
+        depends on MODULE_SIG
+        help
+         Provide the file name of a private key/certificate in PEM format,
+         or a PKCS#11 URI according to RFC7512. The file should contain, or
+         the URI should identify, both the certificate and its corresponding
+         private key.
+
+         If this option is unchanged from its default "signing_key.pem",
+         then the kernel will automatically generate the private key and
+         certificate as described in Documentation/module-signing.txt
+
 config MODULE_COMPRESS
         bool "Compress modules on installation"
         depends on MODULES