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 <anthony.per...@citrix.com> > Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Julien Grall <julien.gr...@arm.com> > Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1747 > Signed-off-by: Laszlo Ersek <ler...@redhat.com> > --- > 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 <Guid/AuthenticatedVariableFormat.h> // gEfiCustomModeEnableGuid > #include <Guid/GlobalVariable.h> // EFI_SETUP_MODE_NAME > #include <Guid/ImageAuthentication.h> // > EFI_IMAGE_SECURITY_DATABASE > #include <Library/BaseMemoryLib.h> // CopyGuid() > #include <Library/DebugLib.h> // ASSERT() > #include <Library/MemoryAllocationLib.h> // FreePool() > #include <Library/ShellCEntryLib.h> // ShellAppMain() >
Reviewed-by: Philippe Mathieu-Daude <phi...@redhat.com> -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39825): https://edk2.groups.io/g/devel/message/39825 Mute This Topic: https://groups.io/mt/31359371/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
