From 6856d319af3fe968db1df37b8eb606a856b75e90 Mon Sep 17 00:00:00 2001 From: Jessica Yu Date: Jun 25 2021 12:36:56 +0000 Subject: Merge branch 'users/msuchanek/SLE15-SP3/for-next' into SLE15-SP3 Pull CONFIG_MODULE_SIG_KEY revert from Michal Suchanek. --- diff --git a/config/arm64/default b/config/arm64/default index b2c68df..64829e2 100644 --- a/config/arm64/default +++ b/config/arm64/default @@ -10445,7 +10445,7 @@ CONFIG_CHECK_CODESIGN_EKU=y # # Certificates for signature checking # -CONFIG_MODULE_SIG_KEY="" +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set diff --git a/config/ppc64le/default b/config/ppc64le/default index 3057ab0..c4d46e2 100644 --- a/config/ppc64le/default +++ b/config/ppc64le/default @@ -5923,7 +5923,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y # # Certificates for signature checking # -CONFIG_MODULE_SIG_KEY="" +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set diff --git a/config/s390x/default b/config/s390x/default index 6ccb17d..00a3522 100644 --- a/config/s390x/default +++ b/config/s390x/default @@ -3721,7 +3721,7 @@ CONFIG_CHECK_CODESIGN_EKU=y # # Certificates for signature checking # -CONFIG_MODULE_SIG_KEY="" +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set diff --git a/config/x86_64/default b/config/x86_64/default index ade3735..19b900c 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -9409,7 +9409,7 @@ CONFIG_CHECK_CODESIGN_EKU=y # # Certificates for signature checking # -CONFIG_MODULE_SIG_KEY="" +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set