From 897a1d947e7e50cf03113dcbe505ffb63dce45a9 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 19 Jun 2018 11:21:44 -0400 Subject: [PATCH] libavb: Update SPDX tag style Signed-off-by: Tom Rini --- lib/libavb/Makefile | 4 +--- lib/libavb/avb_chain_partition_descriptor.c | 3 +-- lib/libavb/avb_chain_partition_descriptor.h | 3 +-- lib/libavb/avb_cmdline.c | 3 +-- lib/libavb/avb_cmdline.h | 3 +-- lib/libavb/avb_crypto.c | 3 +-- lib/libavb/avb_crypto.h | 3 +-- lib/libavb/avb_descriptor.c | 3 +-- lib/libavb/avb_descriptor.h | 3 +-- lib/libavb/avb_footer.c | 3 +-- lib/libavb/avb_footer.h | 3 +-- lib/libavb/avb_hash_descriptor.c | 3 +-- lib/libavb/avb_hash_descriptor.h | 3 +-- lib/libavb/avb_hashtree_descriptor.c | 3 +-- lib/libavb/avb_hashtree_descriptor.h | 3 +-- lib/libavb/avb_kernel_cmdline_descriptor.c | 3 +-- lib/libavb/avb_kernel_cmdline_descriptor.h | 3 +-- lib/libavb/avb_ops.h | 3 +-- lib/libavb/avb_property_descriptor.c | 3 +-- lib/libavb/avb_property_descriptor.h | 3 +-- lib/libavb/avb_rsa.c | 3 +-- lib/libavb/avb_rsa.h | 3 +-- lib/libavb/avb_sha.h | 3 +-- lib/libavb/avb_sha256.c | 3 +-- lib/libavb/avb_sha512.c | 3 +-- lib/libavb/avb_slot_verify.c | 3 +-- lib/libavb/avb_slot_verify.h | 3 +-- lib/libavb/avb_sysdeps.h | 3 +-- lib/libavb/avb_sysdeps_posix.c | 3 +-- lib/libavb/avb_util.c | 3 +-- lib/libavb/avb_util.h | 3 +-- lib/libavb/avb_vbmeta_image.c | 3 +-- lib/libavb/avb_vbmeta_image.h | 3 +-- lib/libavb/avb_version.c | 3 +-- lib/libavb/avb_version.h | 3 +-- lib/libavb/libavb.h | 3 +-- 36 files changed, 36 insertions(+), 73 deletions(-) diff --git a/lib/libavb/Makefile b/lib/libavb/Makefile index c8ff080..b983fe7 100644 --- a/lib/libavb/Makefile +++ b/lib/libavb/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2017 Linaro Limited -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_LIBAVB) += avb_chain_partition_descriptor.o avb_cmdline.o obj-$(CONFIG_LIBAVB) += avb_crypto.o avb_footer.o avb_hashtree_descriptor.o diff --git a/lib/libavb/avb_chain_partition_descriptor.c b/lib/libavb/avb_chain_partition_descriptor.c index e6e8f71..e299306 100644 --- a/lib/libavb/avb_chain_partition_descriptor.c +++ b/lib/libavb/avb_chain_partition_descriptor.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_chain_partition_descriptor.h" diff --git a/lib/libavb/avb_chain_partition_descriptor.h b/lib/libavb/avb_chain_partition_descriptor.h index a841828..80e2271 100644 --- a/lib/libavb/avb_chain_partition_descriptor.h +++ b/lib/libavb/avb_chain_partition_descriptor.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_cmdline.c b/lib/libavb/avb_cmdline.c index 1481b5c..91a6615 100644 --- a/lib/libavb/avb_cmdline.c +++ b/lib/libavb/avb_cmdline.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_cmdline.h" diff --git a/lib/libavb/avb_cmdline.h b/lib/libavb/avb_cmdline.h index e94f0d8..9af3a99 100644 --- a/lib/libavb/avb_cmdline.h +++ b/lib/libavb/avb_cmdline.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #ifdef AVB_INSIDE_LIBAVB_H diff --git a/lib/libavb/avb_crypto.c b/lib/libavb/avb_crypto.c index af9d770..f1836d5 100644 --- a/lib/libavb/avb_crypto.c +++ b/lib/libavb/avb_crypto.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_crypto.h" diff --git a/lib/libavb/avb_crypto.h b/lib/libavb/avb_crypto.h index cede08f..d8f649b 100644 --- a/lib/libavb/avb_crypto.h +++ b/lib/libavb/avb_crypto.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_descriptor.c b/lib/libavb/avb_descriptor.c index 6422293..fb0b305 100644 --- a/lib/libavb/avb_descriptor.c +++ b/lib/libavb/avb_descriptor.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_descriptor.h" diff --git a/lib/libavb/avb_descriptor.h b/lib/libavb/avb_descriptor.h index 13a3efd..d4f42ac 100644 --- a/lib/libavb/avb_descriptor.h +++ b/lib/libavb/avb_descriptor.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_footer.c b/lib/libavb/avb_footer.c index f8b6873..697a715 100644 --- a/lib/libavb/avb_footer.c +++ b/lib/libavb/avb_footer.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_footer.h" diff --git a/lib/libavb/avb_footer.h b/lib/libavb/avb_footer.h index 975136a..62a6e65 100644 --- a/lib/libavb/avb_footer.h +++ b/lib/libavb/avb_footer.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_hash_descriptor.c b/lib/libavb/avb_hash_descriptor.c index 6dfaf62..cd1438e 100644 --- a/lib/libavb/avb_hash_descriptor.c +++ b/lib/libavb/avb_hash_descriptor.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_hash_descriptor.h" diff --git a/lib/libavb/avb_hash_descriptor.h b/lib/libavb/avb_hash_descriptor.h index 3d43520..bede97f 100644 --- a/lib/libavb/avb_hash_descriptor.h +++ b/lib/libavb/avb_hash_descriptor.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_hashtree_descriptor.c b/lib/libavb/avb_hashtree_descriptor.c index da90277..2a61b35 100644 --- a/lib/libavb/avb_hashtree_descriptor.c +++ b/lib/libavb/avb_hashtree_descriptor.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_hashtree_descriptor.h" diff --git a/lib/libavb/avb_hashtree_descriptor.h b/lib/libavb/avb_hashtree_descriptor.h index 3d3e647..d7f3eb5 100644 --- a/lib/libavb/avb_hashtree_descriptor.h +++ b/lib/libavb/avb_hashtree_descriptor.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_kernel_cmdline_descriptor.c b/lib/libavb/avb_kernel_cmdline_descriptor.c index 5457dde..fa3fe45 100644 --- a/lib/libavb/avb_kernel_cmdline_descriptor.c +++ b/lib/libavb/avb_kernel_cmdline_descriptor.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_kernel_cmdline_descriptor.h" diff --git a/lib/libavb/avb_kernel_cmdline_descriptor.h b/lib/libavb/avb_kernel_cmdline_descriptor.h index 655918d..246fbda 100644 --- a/lib/libavb/avb_kernel_cmdline_descriptor.h +++ b/lib/libavb/avb_kernel_cmdline_descriptor.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_ops.h b/lib/libavb/avb_ops.h index 3613434..8bbdc7c 100644 --- a/lib/libavb/avb_ops.h +++ b/lib/libavb/avb_ops.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_property_descriptor.c b/lib/libavb/avb_property_descriptor.c index 2627cd0..589c963 100644 --- a/lib/libavb/avb_property_descriptor.c +++ b/lib/libavb/avb_property_descriptor.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_property_descriptor.h" diff --git a/lib/libavb/avb_property_descriptor.h b/lib/libavb/avb_property_descriptor.h index 2a70896..917c58f 100644 --- a/lib/libavb/avb_property_descriptor.h +++ b/lib/libavb/avb_property_descriptor.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_rsa.c b/lib/libavb/avb_rsa.c index 269f7d0..bbf1562 100644 --- a/lib/libavb/avb_rsa.c +++ b/lib/libavb/avb_rsa.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT OR BSD-3-Clause /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: (MIT or BSD-3-Clause) */ /* Implementation of RSA signature verification which uses a pre-processed diff --git a/lib/libavb/avb_rsa.h b/lib/libavb/avb_rsa.h index f5c6a9c..8741790 100644 --- a/lib/libavb/avb_rsa.h +++ b/lib/libavb/avb_rsa.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT OR BSD-3-Clause */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: (MIT or BSD-3-Clause) */ /* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. diff --git a/lib/libavb/avb_sha.h b/lib/libavb/avb_sha.h index f1d5f5a..365aaad 100644 --- a/lib/libavb/avb_sha.h +++ b/lib/libavb/avb_sha.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #ifdef AVB_INSIDE_LIBAVB_H diff --git a/lib/libavb/avb_sha256.c b/lib/libavb/avb_sha256.c index b81c242..d24c701 100644 --- a/lib/libavb/avb_sha256.c +++ b/lib/libavb/avb_sha256.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: BSD-3-Clause /* * Copyright (C) 2005, 2007 Olivier Gay * All rights reserved. @@ -5,8 +6,6 @@ * FIPS 180-2 SHA-224/256/384/512 implementation * Last update: 02/02/2007 * Issue date: 04/30/2005 - * - * SPDX-License-Identifier: BSD-3-Clause */ #include "avb_sha.h" diff --git a/lib/libavb/avb_sha512.c b/lib/libavb/avb_sha512.c index 128986d..a5e7297 100644 --- a/lib/libavb/avb_sha512.c +++ b/lib/libavb/avb_sha512.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: BSD-3-Clause /* * Copyright (C) 2005, 2007 Olivier Gay * All rights reserved. @@ -5,8 +6,6 @@ * FIPS 180-2 SHA-224/256/384/512 implementation * Last update: 02/02/2007 * Issue date: 04/30/2005 - * - * SPDX-License-Identifier: BSD-3-Clause */ #include "avb_sha.h" diff --git a/lib/libavb/avb_slot_verify.c b/lib/libavb/avb_slot_verify.c index 66ac6f0..a941850 100644 --- a/lib/libavb/avb_slot_verify.c +++ b/lib/libavb/avb_slot_verify.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_slot_verify.h" diff --git a/lib/libavb/avb_slot_verify.h b/lib/libavb/avb_slot_verify.h index d603060..73fd70d 100644 --- a/lib/libavb/avb_slot_verify.h +++ b/lib/libavb/avb_slot_verify.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_sysdeps.h b/lib/libavb/avb_sysdeps.h index 345c2b2..f032de4 100644 --- a/lib/libavb/avb_sysdeps.h +++ b/lib/libavb/avb_sysdeps.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_sysdeps_posix.c b/lib/libavb/avb_sysdeps_posix.c index 0f20847..e9addc1 100644 --- a/lib/libavb/avb_sysdeps_posix.c +++ b/lib/libavb/avb_sysdeps_posix.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include diff --git a/lib/libavb/avb_util.c b/lib/libavb/avb_util.c index 169f83d..405d625 100644 --- a/lib/libavb/avb_util.c +++ b/lib/libavb/avb_util.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_util.h" diff --git a/lib/libavb/avb_util.h b/lib/libavb/avb_util.h index e566d77..26dc6b0 100644 --- a/lib/libavb/avb_util.h +++ b/lib/libavb/avb_util.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_vbmeta_image.c b/lib/libavb/avb_vbmeta_image.c index 2acca7d..a7e2322 100644 --- a/lib/libavb/avb_vbmeta_image.c +++ b/lib/libavb/avb_vbmeta_image.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_vbmeta_image.h" diff --git a/lib/libavb/avb_vbmeta_image.h b/lib/libavb/avb_vbmeta_image.h index 85a3e1b..24f8519 100644 --- a/lib/libavb/avb_vbmeta_image.h +++ b/lib/libavb/avb_vbmeta_image.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/avb_version.c b/lib/libavb/avb_version.c index 92a2edf..1f20722 100644 --- a/lib/libavb/avb_version.c +++ b/lib/libavb/avb_version.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: MIT /* * Copyright (C) 2017 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #include "avb_version.h" diff --git a/lib/libavb/avb_version.h b/lib/libavb/avb_version.h index a36da62..57c6ece 100644 --- a/lib/libavb/avb_version.h +++ b/lib/libavb/avb_version.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2017 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION) diff --git a/lib/libavb/libavb.h b/lib/libavb/libavb.h index dab17ce..ac92a2b 100644 --- a/lib/libavb/libavb.h +++ b/lib/libavb/libavb.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (C) 2016 The Android Open Source Project - * - * SPDX-License-Identifier: MIT */ #ifndef LIBAVB_H_