From patchwork Tue Jun 15 15:40:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1492309 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G4CFT68Myz9sW8; Wed, 16 Jun 2021 01:40:29 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ltBAw-0002vi-P7; Tue, 15 Jun 2021 15:40:26 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ltBAu-0002ue-Jz for kernel-team@lists.ubuntu.com; Tue, 15 Jun 2021 15:40:24 +0000 Received: from mail-wr1-f71.google.com ([209.85.221.71]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1ltBAu-00028p-Az for kernel-team@lists.ubuntu.com; Tue, 15 Jun 2021 15:40:24 +0000 Received: by mail-wr1-f71.google.com with SMTP id h10-20020a5d688a0000b0290119c2ce2499so8703862wru.19 for ; Tue, 15 Jun 2021 08:40:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E/G2mMIBJJk1YwTM5GbZxRAhbxWIeqyJAUUWnlCH54o=; b=HsqGkfe+/n/jzr2T2Db9FM2U3914h31wgeZ4liUlFwZu7LuOX6NH0/oZxyxmsD3u7W i3rqEDyQGAkgb5HNiMHA+nOEc1/o5ksZjCbUWlLf9ldK6Qifn8WL+Fvodon5JWEugazX tFIg25SHr5j+VHL0TC+NzmN53JsOCpKszoO6oEVFYOFnWJ7dcHV4s49Rg1ZfQJT3S4cB CSn+qFmccYA5zMIzVGpMvQSpHI0n0KcRM8JbjTUpbOXjQuK6uuAJ2GtOP1oQtCpHyfQI XezJ7gsL5VveuY+73xfMCYNf3Uu23Ay2joNHX7M4bWSbOEh6Rx4RkFp4ZdUzxVCSRF1h fQUA== X-Gm-Message-State: AOAM533J75JOsW/Kts91oYheoHSZuD/rvyyoZQklAJfAeWbc5qfL1B7g vBMBpbGep3uIL/cpvS+fezruoMj6cKFGZPfsJWr28wKdSFOyQKpS/2Q1ppZH3/elNIZjzjuiXKV XV9RTYEUBtJma3T4LuXsLQl3tfEeatvAyprEj4Y1qjQ== X-Received: by 2002:a05:6000:18ac:: with SMTP id b12mr25523825wri.219.1623771623839; Tue, 15 Jun 2021 08:40:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyF/6EwmvTvRi9unlq/+KTCRVtaT22BRtwGzTfibhDIDOdBQZzW5D8NrgiJPCPAfmwoq5oT4g== X-Received: by 2002:a05:6000:18ac:: with SMTP id b12mr25523812wri.219.1623771623650; Tue, 15 Jun 2021 08:40:23 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:dc22:6ba5:a376:4d8d]) by smtp.gmail.com with ESMTPSA id f5sm20711204wrf.22.2021.06.15.08.40.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 08:40:23 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [UNSTABLE][PATCH 3/3] UBUNTU: [Config] Configure CONFIG_SYSTEM_REVOCATION_KEYS with revoked keys Date: Tue, 15 Jun 2021 16:40:04 +0100 Message-Id: <20210615154004.351480-4-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210615154004.351480-1-dimitri.ledkov@canonical.com> References: <20210615154004.351480-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1932029 Signed-off-by: Dimitri John Ledkov --- debian.master/config/annotations | 1 + debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 559bb9b2157e..f62c725567e4 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -366,6 +366,7 @@ CONFIG_SYSTEM_TRUSTED_KEYRING policy<{'amd64': 'y', 'arm64': ' CONFIG_SYSTEM_TRUSTED_KEYS policy<{'amd64': '"debian/canonical-certs.pem"', 'arm64': '"debian/canonical-certs.pem"', 'armhf': '"debian/canonical-certs.pem"', 'ppc64el': '"debian/canonical-certs.pem"', 's390x': '"debian/canonical-certs.pem"'}> CONFIG_SYSTEM_EXTRA_CERTIFICATE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE policy<{'amd64': '4096', 'arm64': '4096', 'armhf': '4096', 'ppc64el': '4096', 's390x': '4096'}> +CONFIG_SYSTEM_REVOCATION_KEYS policy<{'amd64': '"debian/canonical-revoked-certs.pem"', 'arm64': '"debian/canonical-revoked-certs.pem"', 'armhf': '"debian/canonical-revoked-certs.pem"', 'ppc64el': '"debian/canonical-revoked-certs.pem"', 's390x': '"debian/canonical-revoked-certs.pem"'}> CONFIG_SECONDARY_TRUSTED_KEYRING policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> # Menu: Cryptographic API >> Hardware crypto devices diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ef826287e141..4e4777b50856 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -10735,7 +10735,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_SYSTEM_EXTRA_CERTIFICATE=y CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096 -CONFIG_SYSTEM_REVOCATION_KEYS="" +CONFIG_SYSTEM_REVOCATION_KEYS="debian/canonical-revoked-certs.pem" CONFIG_SYSTEM_REVOCATION_LIST=y CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="debian/canonical-certs.pem"