summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Czapiga <jacz@semihalf.com>2022-10-18 16:35:03 +0200
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-10-21 16:17:47 +0000
commitd0f7fdf670407af5ef6e08ee28019d44244af13a (patch)
tree0f9506be737dcea5522a47e2a4e752bad65cbc9e
parent0ca75fd1117249209aa0d4f994001732758fb20c (diff)
downloadvboot-d0f7fdf670407af5ef6e08ee28019d44244af13a.tar.gz
treewide: Fix copyrights and extra new lines at end of file
BUG=none BRANCH=none TEST=make runtests Signed-off-by: Jakub Czapiga <jacz@semihalf.com> Change-Id: If93a65ba58c4973d4b344229c7ee26685395bbbf Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3964274 Reviewed-by: Yu-Ping Wu <yupingso@chromium.org> Commit-Queue: Jakub Czapiga <czapiga@google.com> Tested-by: Jakub Czapiga <czapiga@google.com>
-rw-r--r--Android.mk2
-rwxr-xr-xemerge_test.sh2
-rw-r--r--firmware/2lib/2sha_utility.c2
-rw-r--r--firmware/lib/cgptlib/cgptlib_internal.c2
-rw-r--r--futility/file_type.inc2
-rw-r--r--rust/vboot_reference-sys/build.rs2
-rw-r--r--rust/vboot_reference-sys/lib.rs2
-rwxr-xr-xscripts/getversion.sh2
-rw-r--r--scripts/image_signing/common.sh2
-rw-r--r--scripts/image_signing/common_minimal.sh3
-rwxr-xr-xscripts/image_signing/convert_recovery_to_full_ssd.sh2
-rwxr-xr-xscripts/image_signing/convert_recovery_to_ssd.sh2
-rwxr-xr-xscripts/image_signing/ensure_amd_psp_flags.sh2
-rwxr-xr-xscripts/image_signing/ensure_no_nonrelease_files.sh2
-rwxr-xr-xscripts/image_signing/ensure_no_password.sh2
-rwxr-xr-xscripts/image_signing/ensure_not_ASAN.sh2
-rwxr-xr-xscripts/image_signing/ensure_not_tainted_license.sh2
-rwxr-xr-xscripts/image_signing/ensure_sane_lsb-release.sh2
-rwxr-xr-xscripts/image_signing/ensure_secure_kernelparams.sh2
-rwxr-xr-xscripts/image_signing/ensure_update_verification.sh2
-rwxr-xr-xscripts/image_signing/get_gbb_flags.sh2
-rwxr-xr-xscripts/image_signing/insert_au_publickey.sh2
-rwxr-xr-xscripts/image_signing/insert_container_publickey.sh2
-rwxr-xr-xscripts/image_signing/install_gsetup_certs.sh2
-rw-r--r--scripts/image_signing/lib/sign_android_lib.sh2
-rwxr-xr-xscripts/image_signing/make_dev_firmware.sh2
-rwxr-xr-xscripts/image_signing/make_dev_ssd.sh2
-rwxr-xr-xscripts/image_signing/remove_test_label.sh2
-rwxr-xr-xscripts/image_signing/resign_firmwarefd.sh2
-rwxr-xr-xscripts/image_signing/resign_kernel_partition.sh3
-rw-r--r--scripts/image_signing/sample-test-configs/ensure_no_nonrelease_files.config2
-rw-r--r--scripts/image_signing/sample-test-configs/ensure_sane_lsb-release.config2
-rw-r--r--scripts/image_signing/sample-test-configs/ensure_secure_kernelparams.config2
-rwxr-xr-xscripts/image_signing/security_test_artifact.py2
-rwxr-xr-xscripts/image_signing/set_channel.sh2
-rwxr-xr-xscripts/image_signing/set_gbb_flags.sh2
-rwxr-xr-xscripts/image_signing/set_lsb_release.sh2
-rwxr-xr-xscripts/image_signing/sign_android_image.sh2
-rwxr-xr-xscripts/image_signing/sign_android_unittests.sh2
-rwxr-xr-xscripts/image_signing/sign_firmware.sh2
-rwxr-xr-xscripts/image_signing/sign_gsc_firmware.sh2
-rwxr-xr-xscripts/image_signing/sign_official_build.sh2
-rwxr-xr-xscripts/image_signing/sign_psp_verstagebl_fw.sh2
-rwxr-xr-xscripts/image_signing/sign_uefi.sh2
-rwxr-xr-xscripts/image_signing/strip_boot_from_image.sh2
-rwxr-xr-xscripts/image_signing/tag_image.sh2
-rwxr-xr-xscripts/image_signing/verify_uefi.sh2
-rw-r--r--scripts/keygeneration/accessory/common_leverage_hammer.sh2
-rwxr-xr-xscripts/keygeneration/accessory/create_new_ec_efs_key.sh2
-rwxr-xr-xscripts/keygeneration/accessory/create_new_gsc_key.sh2
-rwxr-xr-xscripts/keygeneration/accessory/create_new_hammer_like_keys.sh2
-rwxr-xr-xscripts/keygeneration/accessory/create_new_hps_key.sh2
-rwxr-xr-xscripts/keygeneration/add_loem_keys.sh2
-rw-r--r--scripts/keygeneration/common.sh2
-rwxr-xr-xscripts/keygeneration/create_new_android_keys.sh2
-rwxr-xr-xscripts/keygeneration/create_new_keys.sh2
-rwxr-xr-xscripts/keygeneration/create_psp_verstagebl_key.sh2
-rwxr-xr-xscripts/keygeneration/increment_firmware_data_key.sh2
-rwxr-xr-xscripts/keygeneration/increment_kernel_data_key.sh2
-rwxr-xr-xscripts/keygeneration/increment_kernel_subkey.sh2
-rwxr-xr-xscripts/keygeneration/increment_kernel_subkey_and_key.sh2
-rwxr-xr-xscripts/keygeneration/keyset_version_check.sh2
-rwxr-xr-xscripts/keygeneration/make_keyblock.sh2
-rwxr-xr-xscripts/keygeneration/make_pair.sh2
-rwxr-xr-xscripts/keygeneration/uefi/create_new_uefi_keys.sh2
-rwxr-xr-xscripts/keygeneration/uefi/increment_db_child_key.sh2
-rwxr-xr-xscripts/keygeneration/uefi/increment_db_key.sh2
-rwxr-xr-xscripts/keygeneration/uefi/increment_kek_key.sh2
-rwxr-xr-xscripts/keygeneration/uefi/increment_pk_key.sh2
-rw-r--r--scripts/keygeneration/uefi/uefi_common.sh2
-rw-r--r--tests/common.sh2
-rwxr-xr-xtests/external_rsa_signer.sh2
-rwxr-xr-xtests/futility/models/customtip/setvars.sh2
-rwxr-xr-xtests/futility/models/link/setvars.sh2
-rwxr-xr-xtests/futility/models/peppy/setvars.sh2
-rwxr-xr-xtests/futility/run_test_scripts.sh2
-rwxr-xr-xtests/futility/test_create.sh2
-rwxr-xr-xtests/futility/test_dump_fmap.sh2
-rwxr-xr-xtests/futility/test_file_types.sh2
-rwxr-xr-xtests/futility/test_gbb_utility.sh2
-rwxr-xr-xtests/futility/test_load_fmap.sh2
-rwxr-xr-xtests/futility/test_main.sh2
-rwxr-xr-xtests/futility/test_rwsig.sh2
-rwxr-xr-xtests/futility/test_show_contents.sh2
-rwxr-xr-xtests/futility/test_show_kernel.sh2
-rwxr-xr-xtests/futility/test_show_usbpd1.sh2
-rwxr-xr-xtests/futility/test_show_vs_verify.sh2
-rwxr-xr-xtests/futility/test_sign_firmware.sh2
-rwxr-xr-xtests/futility/test_sign_fw_main.sh2
-rwxr-xr-xtests/futility/test_sign_kernel.sh2
-rwxr-xr-xtests/futility/test_sign_keyblocks.sh2
-rwxr-xr-xtests/futility/test_sign_usbpd1.sh2
-rwxr-xr-xtests/futility/test_update.sh2
-rwxr-xr-xtests/gen_fuzz_test_cases.sh2
-rwxr-xr-xtests/gen_preamble_testdata.sh4
-rwxr-xr-xtests/gen_test_cases.sh2
-rwxr-xr-xtests/gen_test_keys.sh2
-rwxr-xr-xtests/gen_test_vbpubks.sh2
-rwxr-xr-xtests/load_kernel_tests.sh2
-rwxr-xr-xtests/run_cgpt_tests.sh2
-rwxr-xr-xtests/run_preamble_tests.sh2
-rwxr-xr-xtests/run_vbutil_kernel_arg_tests.sh2
-rwxr-xr-xtests/run_vbutil_tests.sh2
-rwxr-xr-xtests/test_using_qemu.sh2
-rwxr-xr-xtests/vb2_firmware_tests.sh2
-rwxr-xr-xtests/vb2_rsa_tests.sh2
-rwxr-xr-xutility/chromeos-tpm-recovery2
-rwxr-xr-xutility/chromeos-tpm-recovery-test2
-rwxr-xr-xutility/dev_debug_vboot2
-rwxr-xr-xutility/dev_make_keypair2
-rwxr-xr-xutility/enable_dev_usb_boot2
-rw-r--r--utility/tpm-dad-lock2
-rwxr-xr-xutility/tpm-nvsize2
-rwxr-xr-xutility/vbutil_what_keys2
114 files changed, 114 insertions, 118 deletions
diff --git a/Android.mk b/Android.mk
index e0ba6aa4..8708c26e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/emerge_test.sh b/emerge_test.sh
index 99c33ec9..ff8f688a 100755
--- a/emerge_test.sh
+++ b/emerge_test.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/firmware/2lib/2sha_utility.c b/firmware/2lib/2sha_utility.c
index 4bc3f6a7..7488cbc6 100644
--- a/firmware/2lib/2sha_utility.c
+++ b/firmware/2lib/2sha_utility.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
diff --git a/firmware/lib/cgptlib/cgptlib_internal.c b/firmware/lib/cgptlib/cgptlib_internal.c
index cb8ad2b9..347d46e0 100644
--- a/firmware/lib/cgptlib/cgptlib_internal.c
+++ b/firmware/lib/cgptlib/cgptlib_internal.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
diff --git a/futility/file_type.inc b/futility/file_type.inc
index 7a32f9b1..a034705b 100644
--- a/futility/file_type.inc
+++ b/futility/file_type.inc
@@ -1,6 +1,6 @@
/* -*- mode:c -*-
*
- * Copyright 2015 The Chromium OS Authors. All rights reserved.
+ * Copyright 2015 The ChromiumOS Authors
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
diff --git a/rust/vboot_reference-sys/build.rs b/rust/vboot_reference-sys/build.rs
index 523602f7..d32bc2fd 100644
--- a/rust/vboot_reference-sys/build.rs
+++ b/rust/vboot_reference-sys/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2019 The Chromium OS Authors. All rights reserved.
+// Copyright 2019 The ChromiumOS Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/rust/vboot_reference-sys/lib.rs b/rust/vboot_reference-sys/lib.rs
index 85b6f2a1..fb589ced 100644
--- a/rust/vboot_reference-sys/lib.rs
+++ b/rust/vboot_reference-sys/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2022 The Chromium OS Authors. All rights reserved.
+// Copyright 2022 The ChromiumOS Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/scripts/getversion.sh b/scripts/getversion.sh
index a5630072..80269057 100755
--- a/scripts/getversion.sh
+++ b/scripts/getversion.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/scripts/image_signing/common.sh b/scripts/image_signing/common.sh
index 81bcac3b..d9187408 100644
--- a/scripts/image_signing/common.sh
+++ b/scripts/image_signing/common.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/common_minimal.sh b/scripts/image_signing/common_minimal.sh
index e8f03369..e4560960 100644
--- a/scripts/image_signing/common_minimal.sh
+++ b/scripts/image_signing/common_minimal.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
@@ -517,4 +517,3 @@ no_chronos_password() {
is_ec_rw_signed() {
${FUTILITY} dump_fmap "$1" | grep -q KEY_RO
}
-
diff --git a/scripts/image_signing/convert_recovery_to_full_ssd.sh b/scripts/image_signing/convert_recovery_to_full_ssd.sh
index c249a4f7..5b39ae04 100755
--- a/scripts/image_signing/convert_recovery_to_full_ssd.sh
+++ b/scripts/image_signing/convert_recovery_to_full_ssd.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/convert_recovery_to_ssd.sh b/scripts/image_signing/convert_recovery_to_ssd.sh
index bd6c96d0..624ba692 100755
--- a/scripts/image_signing/convert_recovery_to_ssd.sh
+++ b/scripts/image_signing/convert_recovery_to_ssd.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/ensure_amd_psp_flags.sh b/scripts/image_signing/ensure_amd_psp_flags.sh
index 6c4f07e9..0a18c14e 100755
--- a/scripts/image_signing/ensure_amd_psp_flags.sh
+++ b/scripts/image_signing/ensure_amd_psp_flags.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2022 The ChromiumOS Authors.
+# Copyright 2022 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/ensure_no_nonrelease_files.sh b/scripts/image_signing/ensure_no_nonrelease_files.sh
index 9e549edc..16015abd 100755
--- a/scripts/image_signing/ensure_no_nonrelease_files.sh
+++ b/scripts/image_signing/ensure_no_nonrelease_files.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/ensure_no_password.sh b/scripts/image_signing/ensure_no_password.sh
index 5df68456..4e2e6065 100755
--- a/scripts/image_signing/ensure_no_password.sh
+++ b/scripts/image_signing/ensure_no_password.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/ensure_not_ASAN.sh b/scripts/image_signing/ensure_not_ASAN.sh
index f19b1ddf..a0552421 100755
--- a/scripts/image_signing/ensure_not_ASAN.sh
+++ b/scripts/image_signing/ensure_not_ASAN.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/ensure_not_tainted_license.sh b/scripts/image_signing/ensure_not_tainted_license.sh
index 7eab1c9a..f289cde6 100755
--- a/scripts/image_signing/ensure_not_tainted_license.sh
+++ b/scripts/image_signing/ensure_not_tainted_license.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Copyright 2020 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/scripts/image_signing/ensure_sane_lsb-release.sh b/scripts/image_signing/ensure_sane_lsb-release.sh
index 08469639..4fae1c8c 100755
--- a/scripts/image_signing/ensure_sane_lsb-release.sh
+++ b/scripts/image_signing/ensure_sane_lsb-release.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/ensure_secure_kernelparams.sh b/scripts/image_signing/ensure_secure_kernelparams.sh
index b971ab4e..13b31b40 100755
--- a/scripts/image_signing/ensure_secure_kernelparams.sh
+++ b/scripts/image_signing/ensure_secure_kernelparams.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/ensure_update_verification.sh b/scripts/image_signing/ensure_update_verification.sh
index e3929c50..b81f9c8e 100755
--- a/scripts/image_signing/ensure_update_verification.sh
+++ b/scripts/image_signing/ensure_update_verification.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/get_gbb_flags.sh b/scripts/image_signing/get_gbb_flags.sh
index 84acaa0e..eae8acfe 100755
--- a/scripts/image_signing/get_gbb_flags.sh
+++ b/scripts/image_signing/get_gbb_flags.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/scripts/image_signing/insert_au_publickey.sh b/scripts/image_signing/insert_au_publickey.sh
index fe0dbcc3..a0b22b23 100755
--- a/scripts/image_signing/insert_au_publickey.sh
+++ b/scripts/image_signing/insert_au_publickey.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/insert_container_publickey.sh b/scripts/image_signing/insert_container_publickey.sh
index 606a2911..717247bb 100755
--- a/scripts/image_signing/insert_container_publickey.sh
+++ b/scripts/image_signing/insert_container_publickey.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/install_gsetup_certs.sh b/scripts/image_signing/install_gsetup_certs.sh
index e51843d8..fd79fe42 100755
--- a/scripts/image_signing/install_gsetup_certs.sh
+++ b/scripts/image_signing/install_gsetup_certs.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/lib/sign_android_lib.sh b/scripts/image_signing/lib/sign_android_lib.sh
index 4c1d25fa..c712cc6e 100644
--- a/scripts/image_signing/lib/sign_android_lib.sh
+++ b/scripts/image_signing/lib/sign_android_lib.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/make_dev_firmware.sh b/scripts/image_signing/make_dev_firmware.sh
index 20c8414a..35d23e05 100755
--- a/scripts/image_signing/make_dev_firmware.sh
+++ b/scripts/image_signing/make_dev_firmware.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/scripts/image_signing/make_dev_ssd.sh b/scripts/image_signing/make_dev_ssd.sh
index bddced7d..863e0a45 100755
--- a/scripts/image_signing/make_dev_ssd.sh
+++ b/scripts/image_signing/make_dev_ssd.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/scripts/image_signing/remove_test_label.sh b/scripts/image_signing/remove_test_label.sh
index 18a7978a..f85fc00e 100755
--- a/scripts/image_signing/remove_test_label.sh
+++ b/scripts/image_signing/remove_test_label.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/resign_firmwarefd.sh b/scripts/image_signing/resign_firmwarefd.sh
index ea233157..5fb6c338 100755
--- a/scripts/image_signing/resign_firmwarefd.sh
+++ b/scripts/image_signing/resign_firmwarefd.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/resign_kernel_partition.sh b/scripts/image_signing/resign_kernel_partition.sh
index fd7cfd39..efbef8e2 100755
--- a/scripts/image_signing/resign_kernel_partition.sh
+++ b/scripts/image_signing/resign_kernel_partition.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -43,4 +43,3 @@ vbutil_kernel --repack "${DST_VBLOCK}" \
--oldblob "${SRC_KPART}"
echo "New kernel vblock was output to ${DST_VBLOCK}"
-
diff --git a/scripts/image_signing/sample-test-configs/ensure_no_nonrelease_files.config b/scripts/image_signing/sample-test-configs/ensure_no_nonrelease_files.config
index 3e7556b6..a8d1ef0b 100644
--- a/scripts/image_signing/sample-test-configs/ensure_no_nonrelease_files.config
+++ b/scripts/image_signing/sample-test-configs/ensure_no_nonrelease_files.config
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/sample-test-configs/ensure_sane_lsb-release.config b/scripts/image_signing/sample-test-configs/ensure_sane_lsb-release.config
index 4dfae3c1..c61158e4 100644
--- a/scripts/image_signing/sample-test-configs/ensure_sane_lsb-release.config
+++ b/scripts/image_signing/sample-test-configs/ensure_sane_lsb-release.config
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/sample-test-configs/ensure_secure_kernelparams.config b/scripts/image_signing/sample-test-configs/ensure_secure_kernelparams.config
index 9b78def0..660074a0 100644
--- a/scripts/image_signing/sample-test-configs/ensure_secure_kernelparams.config
+++ b/scripts/image_signing/sample-test-configs/ensure_secure_kernelparams.config
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/security_test_artifact.py b/scripts/image_signing/security_test_artifact.py
index 88357556..5deba2c8 100755
--- a/scripts/image_signing/security_test_artifact.py
+++ b/scripts/image_signing/security_test_artifact.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright 2022 The ChromiumOS Authors.
+# Copyright 2022 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/set_channel.sh b/scripts/image_signing/set_channel.sh
index d4e64ad3..9073c7d6 100755
--- a/scripts/image_signing/set_channel.sh
+++ b/scripts/image_signing/set_channel.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/set_gbb_flags.sh b/scripts/image_signing/set_gbb_flags.sh
index 57fd4c06..871f6cba 100755
--- a/scripts/image_signing/set_gbb_flags.sh
+++ b/scripts/image_signing/set_gbb_flags.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/scripts/image_signing/set_lsb_release.sh b/scripts/image_signing/set_lsb_release.sh
index 55c16537..09e68c8a 100755
--- a/scripts/image_signing/set_lsb_release.sh
+++ b/scripts/image_signing/set_lsb_release.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/sign_android_image.sh b/scripts/image_signing/sign_android_image.sh
index 6b655451..7f693036 100755
--- a/scripts/image_signing/sign_android_image.sh
+++ b/scripts/image_signing/sign_android_image.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2016 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/sign_android_unittests.sh b/scripts/image_signing/sign_android_unittests.sh
index 9bb99a89..2065a57c 100755
--- a/scripts/image_signing/sign_android_unittests.sh
+++ b/scripts/image_signing/sign_android_unittests.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/sign_firmware.sh b/scripts/image_signing/sign_firmware.sh
index ebc6cdc7..b18d3958 100755
--- a/scripts/image_signing/sign_firmware.sh
+++ b/scripts/image_signing/sign_firmware.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/sign_gsc_firmware.sh b/scripts/image_signing/sign_gsc_firmware.sh
index a5945ceb..52091650 100755
--- a/scripts/image_signing/sign_gsc_firmware.sh
+++ b/scripts/image_signing/sign_gsc_firmware.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/sign_official_build.sh b/scripts/image_signing/sign_official_build.sh
index d1c95c93..443c1cc1 100755
--- a/scripts/image_signing/sign_official_build.sh
+++ b/scripts/image_signing/sign_official_build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/sign_psp_verstagebl_fw.sh b/scripts/image_signing/sign_psp_verstagebl_fw.sh
index 9d7fd87f..414230ff 100755
--- a/scripts/image_signing/sign_psp_verstagebl_fw.sh
+++ b/scripts/image_signing/sign_psp_verstagebl_fw.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Copyright 2020 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/sign_uefi.sh b/scripts/image_signing/sign_uefi.sh
index a053a4a0..1bd0c2b1 100755
--- a/scripts/image_signing/sign_uefi.sh
+++ b/scripts/image_signing/sign_uefi.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/strip_boot_from_image.sh b/scripts/image_signing/strip_boot_from_image.sh
index 0f363902..de81b4f4 100755
--- a/scripts/image_signing/strip_boot_from_image.sh
+++ b/scripts/image_signing/strip_boot_from_image.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# Copyright 2013 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/tag_image.sh b/scripts/image_signing/tag_image.sh
index fb9492e7..8a393caf 100755
--- a/scripts/image_signing/tag_image.sh
+++ b/scripts/image_signing/tag_image.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/image_signing/verify_uefi.sh b/scripts/image_signing/verify_uefi.sh
index 0d305117..4d472cef 100755
--- a/scripts/image_signing/verify_uefi.sh
+++ b/scripts/image_signing/verify_uefi.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/accessory/common_leverage_hammer.sh b/scripts/keygeneration/accessory/common_leverage_hammer.sh
index 7c51af1e..0a80bcca 100644
--- a/scripts/keygeneration/accessory/common_leverage_hammer.sh
+++ b/scripts/keygeneration/accessory/common_leverage_hammer.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/accessory/create_new_ec_efs_key.sh b/scripts/keygeneration/accessory/create_new_ec_efs_key.sh
index 54725e20..3af291a7 100755
--- a/scripts/keygeneration/accessory/create_new_ec_efs_key.sh
+++ b/scripts/keygeneration/accessory/create_new_ec_efs_key.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/accessory/create_new_gsc_key.sh b/scripts/keygeneration/accessory/create_new_gsc_key.sh
index a7e81c1a..61f13038 100755
--- a/scripts/keygeneration/accessory/create_new_gsc_key.sh
+++ b/scripts/keygeneration/accessory/create_new_gsc_key.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Copyright 2022 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/accessory/create_new_hammer_like_keys.sh b/scripts/keygeneration/accessory/create_new_hammer_like_keys.sh
index 96d2da01..f239993c 100755
--- a/scripts/keygeneration/accessory/create_new_hammer_like_keys.sh
+++ b/scripts/keygeneration/accessory/create_new_hammer_like_keys.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/accessory/create_new_hps_key.sh b/scripts/keygeneration/accessory/create_new_hps_key.sh
index 6d175c80..3d9ef427 100755
--- a/scripts/keygeneration/accessory/create_new_hps_key.sh
+++ b/scripts/keygeneration/accessory/create_new_hps_key.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Copyright 2022 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/add_loem_keys.sh b/scripts/keygeneration/add_loem_keys.sh
index 4cf8f4ca..7ceb3bba 100755
--- a/scripts/keygeneration/add_loem_keys.sh
+++ b/scripts/keygeneration/add_loem_keys.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/common.sh b/scripts/keygeneration/common.sh
index af6cd717..c4cbb3fb 100644
--- a/scripts/keygeneration/common.sh
+++ b/scripts/keygeneration/common.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/create_new_android_keys.sh b/scripts/keygeneration/create_new_android_keys.sh
index 9701d417..53883f6e 100755
--- a/scripts/keygeneration/create_new_android_keys.sh
+++ b/scripts/keygeneration/create_new_android_keys.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Copyright 2016 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/create_new_keys.sh b/scripts/keygeneration/create_new_keys.sh
index 4a2ad33a..44521e7b 100755
--- a/scripts/keygeneration/create_new_keys.sh
+++ b/scripts/keygeneration/create_new_keys.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/scripts/keygeneration/create_psp_verstagebl_key.sh b/scripts/keygeneration/create_psp_verstagebl_key.sh
index aeb79208..366e5541 100755
--- a/scripts/keygeneration/create_psp_verstagebl_key.sh
+++ b/scripts/keygeneration/create_psp_verstagebl_key.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Copyright 2020 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/increment_firmware_data_key.sh b/scripts/keygeneration/increment_firmware_data_key.sh
index c6b65a45..7bba679a 100755
--- a/scripts/keygeneration/increment_firmware_data_key.sh
+++ b/scripts/keygeneration/increment_firmware_data_key.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/increment_kernel_data_key.sh b/scripts/keygeneration/increment_kernel_data_key.sh
index b3ed3ea5..c6b356e2 100755
--- a/scripts/keygeneration/increment_kernel_data_key.sh
+++ b/scripts/keygeneration/increment_kernel_data_key.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/increment_kernel_subkey.sh b/scripts/keygeneration/increment_kernel_subkey.sh
index ccac9373..6d018259 100755
--- a/scripts/keygeneration/increment_kernel_subkey.sh
+++ b/scripts/keygeneration/increment_kernel_subkey.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/increment_kernel_subkey_and_key.sh b/scripts/keygeneration/increment_kernel_subkey_and_key.sh
index dda04166..4cab76b1 100755
--- a/scripts/keygeneration/increment_kernel_subkey_and_key.sh
+++ b/scripts/keygeneration/increment_kernel_subkey_and_key.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/keyset_version_check.sh b/scripts/keygeneration/keyset_version_check.sh
index 2ab33945..fcc8415c 100755
--- a/scripts/keygeneration/keyset_version_check.sh
+++ b/scripts/keygeneration/keyset_version_check.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/make_keyblock.sh b/scripts/keygeneration/make_keyblock.sh
index 565a566c..9baf924e 100755
--- a/scripts/keygeneration/make_keyblock.sh
+++ b/scripts/keygeneration/make_keyblock.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/scripts/keygeneration/make_pair.sh b/scripts/keygeneration/make_pair.sh
index cd5d0c10..aaafc7dd 100755
--- a/scripts/keygeneration/make_pair.sh
+++ b/scripts/keygeneration/make_pair.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/scripts/keygeneration/uefi/create_new_uefi_keys.sh b/scripts/keygeneration/uefi/create_new_uefi_keys.sh
index 2e91b019..4fbbef8e 100755
--- a/scripts/keygeneration/uefi/create_new_uefi_keys.sh
+++ b/scripts/keygeneration/uefi/create_new_uefi_keys.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/uefi/increment_db_child_key.sh b/scripts/keygeneration/uefi/increment_db_child_key.sh
index fe206f82..0ef26b37 100755
--- a/scripts/keygeneration/uefi/increment_db_child_key.sh
+++ b/scripts/keygeneration/uefi/increment_db_child_key.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/uefi/increment_db_key.sh b/scripts/keygeneration/uefi/increment_db_key.sh
index b21454c4..a22463d8 100755
--- a/scripts/keygeneration/uefi/increment_db_key.sh
+++ b/scripts/keygeneration/uefi/increment_db_key.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/uefi/increment_kek_key.sh b/scripts/keygeneration/uefi/increment_kek_key.sh
index 0c813bae..af2ea80d 100755
--- a/scripts/keygeneration/uefi/increment_kek_key.sh
+++ b/scripts/keygeneration/uefi/increment_kek_key.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/uefi/increment_pk_key.sh b/scripts/keygeneration/uefi/increment_pk_key.sh
index 75442e75..8d990364 100755
--- a/scripts/keygeneration/uefi/increment_pk_key.sh
+++ b/scripts/keygeneration/uefi/increment_pk_key.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/scripts/keygeneration/uefi/uefi_common.sh b/scripts/keygeneration/uefi/uefi_common.sh
index ba5369b6..85a16f6e 100644
--- a/scripts/keygeneration/uefi/uefi_common.sh
+++ b/scripts/keygeneration/uefi/uefi_common.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/common.sh b/tests/common.sh
index a2079228..78512254 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/external_rsa_signer.sh b/tests/external_rsa_signer.sh
index 405df420..d313997a 100755
--- a/tests/external_rsa_signer.sh
+++ b/tests/external_rsa_signer.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/models/customtip/setvars.sh b/tests/futility/models/customtip/setvars.sh
index a4bb55a9..798af26d 100755
--- a/tests/futility/models/customtip/setvars.sh
+++ b/tests/futility/models/customtip/setvars.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/models/link/setvars.sh b/tests/futility/models/link/setvars.sh
index 19180998..7befaf44 100755
--- a/tests/futility/models/link/setvars.sh
+++ b/tests/futility/models/link/setvars.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/models/peppy/setvars.sh b/tests/futility/models/peppy/setvars.sh
index 855e815a..bb98e2ed 100755
--- a/tests/futility/models/peppy/setvars.sh
+++ b/tests/futility/models/peppy/setvars.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/run_test_scripts.sh b/tests/futility/run_test_scripts.sh
index aeb3477b..e0c8292d 100755
--- a/tests/futility/run_test_scripts.sh
+++ b/tests/futility/run_test_scripts.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eu
-# Copyright 2013 The Chromium OS Authors. All rights reserved.
+# Copyright 2013 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_create.sh b/tests/futility/test_create.sh
index 77c7eb45..1554c161 100755
--- a/tests/futility/test_create.sh
+++ b/tests/futility/test_create.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_dump_fmap.sh b/tests/futility/test_dump_fmap.sh
index b8e418af..70be0f5c 100755
--- a/tests/futility/test_dump_fmap.sh
+++ b/tests/futility/test_dump_fmap.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2013 The Chromium OS Authors. All rights reserved.
+# Copyright 2013 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_file_types.sh b/tests/futility/test_file_types.sh
index 313e4087..7fc0633b 100755
--- a/tests/futility/test_file_types.sh
+++ b/tests/futility/test_file_types.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_gbb_utility.sh b/tests/futility/test_gbb_utility.sh
index 5b783c42..7ec90d5a 100755
--- a/tests/futility/test_gbb_utility.sh
+++ b/tests/futility/test_gbb_utility.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_load_fmap.sh b/tests/futility/test_load_fmap.sh
index 78212431..dabd46d4 100755
--- a/tests/futility/test_load_fmap.sh
+++ b/tests/futility/test_load_fmap.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_main.sh b/tests/futility/test_main.sh
index 725abe3a..3cfee6d6 100755
--- a/tests/futility/test_main.sh
+++ b/tests/futility/test_main.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_rwsig.sh b/tests/futility/test_rwsig.sh
index 3a0a6e39..009e7428 100755
--- a/tests/futility/test_rwsig.sh
+++ b/tests/futility/test_rwsig.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Copyright 2017 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_show_contents.sh b/tests/futility/test_show_contents.sh
index 9b3431d2..8b35ebca 100755
--- a/tests/futility/test_show_contents.sh
+++ b/tests/futility/test_show_contents.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_show_kernel.sh b/tests/futility/test_show_kernel.sh
index f2610a39..587c2173 100755
--- a/tests/futility/test_show_kernel.sh
+++ b/tests/futility/test_show_kernel.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_show_usbpd1.sh b/tests/futility/test_show_usbpd1.sh
index 3998fa77..08b535b5 100755
--- a/tests/futility/test_show_usbpd1.sh
+++ b/tests/futility/test_show_usbpd1.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_show_vs_verify.sh b/tests/futility/test_show_vs_verify.sh
index c0c0872c..119af053 100755
--- a/tests/futility/test_show_vs_verify.sh
+++ b/tests/futility/test_show_vs_verify.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_sign_firmware.sh b/tests/futility/test_sign_firmware.sh
index fe8462c8..016c724c 100755
--- a/tests/futility/test_sign_firmware.sh
+++ b/tests/futility/test_sign_firmware.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_sign_fw_main.sh b/tests/futility/test_sign_fw_main.sh
index e22f9072..fc65e249 100755
--- a/tests/futility/test_sign_fw_main.sh
+++ b/tests/futility/test_sign_fw_main.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_sign_kernel.sh b/tests/futility/test_sign_kernel.sh
index bba1164f..12a6af82 100755
--- a/tests/futility/test_sign_kernel.sh
+++ b/tests/futility/test_sign_kernel.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_sign_keyblocks.sh b/tests/futility/test_sign_keyblocks.sh
index 75d367d0..bbdd003d 100755
--- a/tests/futility/test_sign_keyblocks.sh
+++ b/tests/futility/test_sign_keyblocks.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_sign_usbpd1.sh b/tests/futility/test_sign_usbpd1.sh
index 2324fae1..137222fa 100755
--- a/tests/futility/test_sign_usbpd1.sh
+++ b/tests/futility/test_sign_usbpd1.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2015 The Chromium OS Authors. All rights reserved.
+# Copyright 2015 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/futility/test_update.sh b/tests/futility/test_update.sh
index df6c77bc..e71a2a35 100755
--- a/tests/futility/test_update.sh
+++ b/tests/futility/test_update.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eux
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
+# Copyright 2018 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/gen_fuzz_test_cases.sh b/tests/gen_fuzz_test_cases.sh
index 3e4ca992..1dede33d 100755
--- a/tests/gen_fuzz_test_cases.sh
+++ b/tests/gen_fuzz_test_cases.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/gen_preamble_testdata.sh b/tests/gen_preamble_testdata.sh
index 607e05ab..0d3281cd 100755
--- a/tests/gen_preamble_testdata.sh
+++ b/tests/gen_preamble_testdata.sh
@@ -1,6 +1,6 @@
#!/bin/bash -eu
#
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
@@ -80,5 +80,3 @@ for d in $algs; do
--config "${DATADIR}/dummy_config.txt"
done
done
-
-
diff --git a/tests/gen_test_cases.sh b/tests/gen_test_cases.sh
index 80ed90c0..c888cbd0 100755
--- a/tests/gen_test_cases.sh
+++ b/tests/gen_test_cases.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/gen_test_keys.sh b/tests/gen_test_keys.sh
index 37722fb9..3128f2ac 100755
--- a/tests/gen_test_keys.sh
+++ b/tests/gen_test_keys.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/tests/gen_test_vbpubks.sh b/tests/gen_test_vbpubks.sh
index a318d3dc..877481ec 100755
--- a/tests/gen_test_vbpubks.sh
+++ b/tests/gen_test_vbpubks.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/tests/load_kernel_tests.sh b/tests/load_kernel_tests.sh
index cd1bd635..4cfdca75 100755
--- a/tests/load_kernel_tests.sh
+++ b/tests/load_kernel_tests.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/tests/run_cgpt_tests.sh b/tests/run_cgpt_tests.sh
index 7f59205a..daf758c2 100755
--- a/tests/run_cgpt_tests.sh
+++ b/tests/run_cgpt_tests.sh
@@ -1,6 +1,6 @@
#!/bin/bash -eu
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/tests/run_preamble_tests.sh b/tests/run_preamble_tests.sh
index 23902158..98d14e0b 100755
--- a/tests/run_preamble_tests.sh
+++ b/tests/run_preamble_tests.sh
@@ -1,6 +1,6 @@
#!/bin/bash -u
#
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/tests/run_vbutil_kernel_arg_tests.sh b/tests/run_vbutil_kernel_arg_tests.sh
index 6367662b..237ae663 100755
--- a/tests/run_vbutil_kernel_arg_tests.sh
+++ b/tests/run_vbutil_kernel_arg_tests.sh
@@ -1,6 +1,6 @@
#!/bin/bash -u
#
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/tests/run_vbutil_tests.sh b/tests/run_vbutil_tests.sh
index b9db2a7c..8a18abcb 100755
--- a/tests/run_vbutil_tests.sh
+++ b/tests/run_vbutil_tests.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# Copyright 2013 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/tests/test_using_qemu.sh b/tests/test_using_qemu.sh
index 5ed29740..99669d5e 100755
--- a/tests/test_using_qemu.sh
+++ b/tests/test_using_qemu.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# Copyright 2013 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/tests/vb2_firmware_tests.sh b/tests/vb2_firmware_tests.sh
index 51803e22..d2498adc 100755
--- a/tests/vb2_firmware_tests.sh
+++ b/tests/vb2_firmware_tests.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/tests/vb2_rsa_tests.sh b/tests/vb2_rsa_tests.sh
index 58d99b2c..19a7a6ca 100755
--- a/tests/vb2_rsa_tests.sh
+++ b/tests/vb2_rsa_tests.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/utility/chromeos-tpm-recovery b/utility/chromeos-tpm-recovery
index 12616b41..b5c10d8a 100755
--- a/utility/chromeos-tpm-recovery
+++ b/utility/chromeos-tpm-recovery
@@ -1,5 +1,5 @@
#!/bin/sh -u
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/utility/chromeos-tpm-recovery-test b/utility/chromeos-tpm-recovery-test
index 42331e25..20be1364 100755
--- a/utility/chromeos-tpm-recovery-test
+++ b/utility/chromeos-tpm-recovery-test
@@ -1,5 +1,5 @@
#!/bin/sh -u
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/utility/dev_debug_vboot b/utility/dev_debug_vboot
index 48c48a1a..a5d34eda 100755
--- a/utility/dev_debug_vboot
+++ b/utility/dev_debug_vboot
@@ -1,5 +1,5 @@
#!/bin/sh -ue
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Copyright 2011 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/utility/dev_make_keypair b/utility/dev_make_keypair
index 7486d9e1..3f8d7b63 100755
--- a/utility/dev_make_keypair
+++ b/utility/dev_make_keypair
@@ -1,5 +1,5 @@
#!/bin/bash -e
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/utility/enable_dev_usb_boot b/utility/enable_dev_usb_boot
index 8cf16bab..f6704cbb 100755
--- a/utility/enable_dev_usb_boot
+++ b/utility/enable_dev_usb_boot
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+# Copyright 2012 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/utility/tpm-dad-lock b/utility/tpm-dad-lock
index ba5527c9..463bef83 100644
--- a/utility/tpm-dad-lock
+++ b/utility/tpm-dad-lock
@@ -1,6 +1,6 @@
#!/bin/bash -e
#
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/utility/tpm-nvsize b/utility/tpm-nvsize
index ec2d0337..b2d4f728 100755
--- a/utility/tpm-nvsize
+++ b/utility/tpm-nvsize
@@ -1,5 +1,5 @@
#! /bin/sh -e
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright 2010 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/utility/vbutil_what_keys b/utility/vbutil_what_keys
index b4427a30..5314292e 100755
--- a/utility/vbutil_what_keys
+++ b/utility/vbutil_what_keys
@@ -1,5 +1,5 @@
#!/bin/sh -u
-# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.