From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.85.221.67, mailfrom: philmd@redhat.com) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by groups.io with SMTP; Mon, 29 Apr 2019 22:13:43 -0700 Received: by mail-wr1-f67.google.com with SMTP id f7so10834776wrs.2 for ; Mon, 29 Apr 2019 22:13:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=H2oEHFd5alcCiAghIbPZ/9Tf4000RyFPjQNCm/2wo9E=; b=atAMwIg2EpKs9D64umLpzGmsL16ZBy2Q6JnXoT1WeVPItGoolNzEjwRzlZ+/HnZx9A pzLviDLywytmsnzTk7glrnB/wus/SqsVfdKO93LawEYXZir7vJ5WZ5v3bRAN0ynmvlkH 6iZxvIILVVMSJo1PF98L2W7Nofqe1U5hUNlGIbGWvY2k4YKPPq8YoXSP+FHFKtbgugOp xfu2kV4FMtr2TmElkKF5JIhXuyYFc3TxEqj6BA+l5aKP+Qp2eEW3AbHSYl7e7d8XE0V9 olGXL47lHaClK75AQEsER1fUzz+DCu+rVsiVHIjDYnk6ONkDnSbqCtBEUJZ8LTsKHkp5 5Pbg== X-Gm-Message-State: APjAAAW/+KGntesHO28r0U3kmnRABHfmoSj8gAIlzqHcACRLw22Uxzck xel47aBWdfwKW17DzT4sR1RNHg== X-Google-Smtp-Source: APXvYqxfblofAdb6Ak4QZ3TEziOpTHrrosKH/CB58yhQdw++slXA3vhnQQaNWxFfvglMRZHnUgg0MQ== X-Received: by 2002:a5d:6352:: with SMTP id b18mr28994367wrw.24.1556601221865; Mon, 29 Apr 2019 22:13:41 -0700 (PDT) Return-Path: Received: from [192.168.1.37] (193.red-88-21-103.staticip.rima-tde.net. [88.21.103.193]) by smtp.gmail.com with ESMTPSA id o4sm1298204wmo.20.2019.04.29.22.13.40 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 22:13:41 -0700 (PDT) Subject: Re: [edk2-devel] [PATCH 02/16] OvmfPkg/EnrollDefaultKeys: update @file comment blocks To: devel@edk2.groups.io, lersek@redhat.com Cc: Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall References: <20190427005328.27005-1-lersek@redhat.com> <20190427005328.27005-3-lersek@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Openpgp: id=89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE; url=http://pgp.mit.edu/pks/lookup?op=get&search=0xA2A3FD6EDEADC0DE Message-ID: Date: Tue, 30 Apr 2019 07:13:40 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190427005328.27005-3-lersek@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 4/27/19 2:53 AM, Laszlo Ersek wrote: > Refresh the sentence that states the purpose of the application. > > Extend the copyright notice to the year 2019. > > Replace the 2-clause BSD License banner with the BSD-2-Clause-Patent SPDX > ID. > > Cc: Anthony Perard > Cc: Ard Biesheuvel > Cc: Jordan Justen > Cc: Julien Grall > Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1747 > Signed-off-by: Laszlo Ersek > --- > OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf | 13 +++---------- > OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 12 +++--------- > 2 files changed, 6 insertions(+), 19 deletions(-) > > diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf > index 0ad86a2843e6..1e579f495143 100644 > --- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf > +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf > @@ -1,21 +1,14 @@ > ## @file > -# Enroll default PK, KEK, DB. > +# Enroll default PK, KEK, db, dbx. > # > -# Copyright (C) 2014, Red Hat, Inc. > +# Copyright (C) 2014-2019, Red Hat, Inc. > # > -# This program and the accompanying materials are licensed and made available > -# under the terms and conditions of the BSD License which accompanies this > -# distribution. The full text of the license may be found at > -# http://opensource.org/licenses/bsd-license. > -# > -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > -# IMPLIED. > +# SPDX-License-Identifier: BSD-2-Clause-Patent > ## > > [Defines] > INF_VERSION = 0x00010006 > BASE_NAME = EnrollDefaultKeys > FILE_GUID = D5C1DF0B-1BAC-4EDF-BA48-08834009CA5A > MODULE_TYPE = UEFI_APPLICATION > VERSION_STRING = 0.1 > diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c > index dd413df12de3..b354ec6f81c8 100644 > --- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c > +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c > @@ -1,20 +1,14 @@ > /** @file > - Enroll default PK, KEK, DB. > + Enroll default PK, KEK, db, dbx. > > - Copyright (C) 2014, Red Hat, Inc. > + Copyright (C) 2014-2019, Red Hat, Inc. > > - This program and the accompanying materials are licensed and made available > - under the terms and conditions of the BSD License which accompanies this > - distribution. The full text of the license may be found at > - http://opensource.org/licenses/bsd-license. > - > - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT > - WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > + SPDX-License-Identifier: BSD-2-Clause-Patent > **/ > #include // gEfiCustomModeEnableGuid > #include // EFI_SETUP_MODE_NAME > #include // EFI_IMAGE_SECURITY_DATABASE > #include // CopyGuid() > #include // ASSERT() > #include // FreePool() > #include // ShellAppMain() > Reviewed-by: Philippe Mathieu-Daude