libavb: Update SPDX tag style

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/lib/libavb/Makefile b/lib/libavb/Makefile
index c8ff080dbcaa3685132307f4142c5acff533f24f..b983fe768e55d7ba33d0aab1c1a040d72278c3d3 100644 (file)
--- 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 e6e8f71fb853507e926c26d9ca08586e51d36ae2..e29930631035d552e28c4dfae8d6fc91d098aed7 100644 (file)
--- 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 a841828b6dbd9d255c689ad9c96d25418a397679..80e2271782e8318c015aad8dd4a2baa298caf6d7 100644 (file)
--- 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 1481b5c36bc2e42c326bd1de9e07dc729218663f..91a6615c740d956c9353da05151c35a56d6f1ac1 100644 (file)
--- 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 e94f0d8309ffd52f5a11119c2cb1555154416de2..9af3a9999423f06c7114c03c923a7dd4b97628b6 100644 (file)
--- 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 af9d77045e7ca78c840067f554861c234c4a9dbe..f1836d5fc31b87ce482311fa8b1691829eb2bd96 100644 (file)
--- 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 cede08f1bc6e7931c08ab4e5af9fd185350b7c52..d8f649b137c8a117c2160470c9e72ae0c1699fb9 100644 (file)
--- 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 6422293293c57347001ac15916871b83e36b2a50..fb0b305f2cc5fa07bbf5100c1ca1c9fbdfbdbbd7 100644 (file)
--- 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 13a3efde2797b963faaabc9530a9b938b10916d0..d4f42ac964ad03ddae2d84f1956610bdceb1a4fc 100644 (file)
--- 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 f8b687394221d23ccab2035bd58dacfcfbaf5939..697a7152175770fb780d40f8948210fe578232dc 100644 (file)
--- 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 975136aa016278d8197a35285911fc691be91429..62a6e658d1b082a2d1a90f4cfdee49e11930ea60 100644 (file)
--- 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 6dfaf621d839f09d71e15b82b5febcf44b15d30f..cd1438e0cd839e21632de8fec02eb9ae8717a3b9 100644 (file)
--- 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 3d4352068afd4c8fd7a2937a4eb8d4c0995ea14d..bede97f818f90011ea8a86f78e7058f470340b83 100644 (file)
--- 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 da902775691d843d43e76b7fa90e6e3fa537b94f..2a61b35a8ff2bd33427bd3921527d907c2bfe046 100644 (file)
--- 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 3d3e647fe1c675d2c7670cb23efe1742b25c72ca..d7f3eb501a3cf8175e50f3aa815dc8e118fcd99e 100644 (file)
--- 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 5457ddeeb3a7569fb8da0b81b1c3d09f240b7eee..fa3fe4537b42206cca7461c91979eeb8d54de26c 100644 (file)
--- 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 655918d8f049222a326fb72e74e478e5bdc8b437..246fbdacf3906e6030f352544b9179c3dadb897a 100644 (file)
--- 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 36134346f6a1b4e6c559204a09a214372b2fe870..8bbdc7c31b9faae8534c45090898b30f9c022d3d 100644 (file)
--- 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 2627cd0d64f4a9e9e8e797e33fb7c99072e8b7ec..589c96310ab3b4465bad3e4c42d01545608e00a8 100644 (file)
--- 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 2a708961e96d83006cd33aa6c57b1db9f6781e63..917c58f9feaa154dea1d858555719b475a1bfdc4 100644 (file)
--- 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 269f7d00b46de77a2ae738c0c898e4ea1cda8684..bbf15626b85f2f41dafc90e0782fa03e12b709b7 100644 (file)
--- 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 f5c6a9c7c7f0d357f090f0fe568f51bb11cada02..8741790e0940a0d85fa17cc8a87a3ca7fb6e521b 100644 (file)
--- 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 f1d5f5af94cfc8873a6a25378650471805f0c20e..365aaadc2f70b6582d33bbbe60fb0b9cf45b6f3f 100644 (file)
--- 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 b81c2428974481ec72ffaee3c13110590895ca68..d24c7015f6738ade563096d4ab6a47caa87faff0 100644 (file)
--- 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 128986dfbb6dec699d21423c109a59a333eb8acd..a5e7297aa709b94d92b18f60ddfefd11963bb3c8 100644 (file)
--- 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 66ac6f03bb664482f46a8179340572bee051c28f..a941850d93431b6d314c915e20ed933247717d30 100644 (file)
--- 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 d603060469187879584d8b7eb679b5c6bc4cf67d..73fd70d4ce27c9fbfd6fccf26f752dc2e6e0c612 100644 (file)
--- 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 345c2b29a6a0a6e1d32cb6e1a106be8b3a6398ac..f032de4a2e05410116396686b5735b349fdf438c 100644 (file)
--- 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 0f2084742251a14bd410ad8b411cb04f645cd08d..e9addc1c8775d3fd1d2569486067da26e66bb908 100644 (file)
--- 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 169f83d4083adf60224cea2d4544cb779c1636dc..405d625351eb23cc03e06c75634c247a1430c046 100644 (file)
--- 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 e566d7766ae3c9721aa4a10f9c125f93b66c6fc1..26dc6b045ac7cf6362246d4fbffd1443d2e7386c 100644 (file)
--- 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 2acca7d5e1331cf2943138dbd3ba4de91f4bff1c..a7e2322b9e01d0c267590b80397cdfd134c04943 100644 (file)
--- 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 85a3e1beec6ffba9cb80c8a1f8a418e0a59e1795..24f8519ff609134e31b30357ace96290fb1ecfd6 100644 (file)
--- 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 92a2edfc465334e317871039b9df09ed96219e54..1f20722e6ca312d3689fd8db485a59cd60cae197 100644 (file)
--- 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 a36da62d5c9ad136721093a7fbece512bf336d96..57c6ece851c984121c5198ddbf99f0e63d0675ca 100644 (file)
--- 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 dab17cef6e0d209e5d86c68e790b44fe4a85be84..ac92a2bcb8a88e70a9385c36931a8ad461da8724 100644 (file)
--- 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_