diff options
36 files changed, 36 insertions, 73 deletions
diff --git a/lib/libavb/Makefile b/lib/libavb/Makefile index c8ff080dbc..b983fe768e 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 e6e8f71fb8..e299306310 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 a841828b6d..80e2271782 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 1481b5c36b..91a6615c74 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 e94f0d8309..9af3a99994 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 af9d77045e..f1836d5fc3 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 cede08f1bc..d8f649b137 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 6422293293..fb0b305f2c 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 13a3efde27..d4f42ac964 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 f8b6873942..697a715217 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 975136aa01..62a6e658d1 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 6dfaf621d8..cd1438e0cd 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 3d4352068a..bede97f818 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 da90277569..2a61b35a8f 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 3d3e647fe1..d7f3eb501a 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 5457ddeeb3..fa3fe4537b 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 655918d8f0..246fbdacf3 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 36134346f6..8bbdc7c31b 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 2627cd0d64..589c96310a 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 2a708961e9..917c58f9fe 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 269f7d00b4..bbf15626b8 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 f5c6a9c7c7..8741790e09 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 f1d5f5af94..365aaadc2f 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 b81c242897..d24c7015f6 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 <olivier.gay@a3.epfl.ch> * 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 128986dfbb..a5e7297aa7 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 <olivier.gay@a3.epfl.ch> * 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 66ac6f03bb..a941850d93 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 d603060469..73fd70d4ce 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 345c2b29a6..f032de4a2e 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 0f20847422..e9addc1c87 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 <stdarg.h> diff --git a/lib/libavb/avb_util.c b/lib/libavb/avb_util.c index 169f83d408..405d625351 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 e566d7766a..26dc6b045a 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 2acca7d5e1..a7e2322b9e 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 85a3e1beec..24f8519ff6 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 92a2edfc46..1f20722e6c 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 a36da62d5c..57c6ece851 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 dab17cef6e..ac92a2bcb8 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_ |