From a3704353c9701b4c1de0aa64d353a909f7a93512 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 07:10:53 +0100 Subject: [PATCH] [PR #7858/002208f4 backport][stable-7] Make compatible with newer reuse versions (#7859) Make compatible with newer reuse versions (#7858) Make compatible with newer reuse versions. (cherry picked from commit 002208f425785caf367eccdc47ee04fb7af66e63) Co-authored-by: Felix Fontein --- tests/integration/targets/setup_tls/files/ca_certificate.pem | 4 ---- .../targets/setup_tls/files/ca_certificate.pem.license | 3 +++ tests/integration/targets/setup_tls/files/ca_key.pem | 4 ---- tests/integration/targets/setup_tls/files/ca_key.pem.license | 3 +++ .../targets/setup_tls/files/client_certificate.pem | 4 ---- .../targets/setup_tls/files/client_certificate.pem.license | 3 +++ tests/integration/targets/setup_tls/files/client_key.pem | 4 ---- .../targets/setup_tls/files/client_key.pem.license | 3 +++ .../targets/setup_tls/files/server_certificate.pem | 4 ---- .../targets/setup_tls/files/server_certificate.pem.license | 3 +++ tests/integration/targets/setup_tls/files/server_key.pem | 4 ---- .../targets/setup_tls/files/server_key.pem.license | 3 +++ 12 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 tests/integration/targets/setup_tls/files/ca_certificate.pem.license create mode 100644 tests/integration/targets/setup_tls/files/ca_key.pem.license create mode 100644 tests/integration/targets/setup_tls/files/client_certificate.pem.license create mode 100644 tests/integration/targets/setup_tls/files/client_key.pem.license create mode 100644 tests/integration/targets/setup_tls/files/server_certificate.pem.license create mode 100644 tests/integration/targets/setup_tls/files/server_key.pem.license diff --git a/tests/integration/targets/setup_tls/files/ca_certificate.pem b/tests/integration/targets/setup_tls/files/ca_certificate.pem index 130e0a2daf..a438d9266e 100644 --- a/tests/integration/targets/setup_tls/files/ca_certificate.pem +++ b/tests/integration/targets/setup_tls/files/ca_certificate.pem @@ -1,7 +1,3 @@ -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -----BEGIN CERTIFICATE----- MIIDAjCCAeqgAwIBAgIJANguFROhaWocMA0GCSqGSIb3DQEBCwUAMDExIDAeBgNV BAMMF1RMU0dlblNlbGZTaWduZWR0Um9vdENBMQ0wCwYDVQQHDAQkJCQkMB4XDTE5 diff --git a/tests/integration/targets/setup_tls/files/ca_certificate.pem.license b/tests/integration/targets/setup_tls/files/ca_certificate.pem.license new file mode 100644 index 0000000000..a1390a69ed --- /dev/null +++ b/tests/integration/targets/setup_tls/files/ca_certificate.pem.license @@ -0,0 +1,3 @@ +Copyright (c) Ansible Project +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/integration/targets/setup_tls/files/ca_key.pem b/tests/integration/targets/setup_tls/files/ca_key.pem index d9dc5ca0f5..0a950eda06 100644 --- a/tests/integration/targets/setup_tls/files/ca_key.pem +++ b/tests/integration/targets/setup_tls/files/ca_key.pem @@ -1,7 +1,3 @@ -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -----BEGIN PRIVATE KEY----- MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDqVt84czSxWnWW 4Ng6hmKE3NarbLsycwtjrYBokV7Kk7Mp7PrBbYF05FOgSdJLvL6grlRSQK2VPsXd diff --git a/tests/integration/targets/setup_tls/files/ca_key.pem.license b/tests/integration/targets/setup_tls/files/ca_key.pem.license new file mode 100644 index 0000000000..a1390a69ed --- /dev/null +++ b/tests/integration/targets/setup_tls/files/ca_key.pem.license @@ -0,0 +1,3 @@ +Copyright (c) Ansible Project +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/integration/targets/setup_tls/files/client_certificate.pem b/tests/integration/targets/setup_tls/files/client_certificate.pem index 9e956e6b0f..501d83897f 100644 --- a/tests/integration/targets/setup_tls/files/client_certificate.pem +++ b/tests/integration/targets/setup_tls/files/client_certificate.pem @@ -1,7 +1,3 @@ -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -----BEGIN CERTIFICATE----- MIIDRjCCAi6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAxMSAwHgYDVQQDDBdUTFNH ZW5TZWxmU2lnbmVkdFJvb3RDQTENMAsGA1UEBwwEJCQkJDAeFw0xOTAxMTEwODMz diff --git a/tests/integration/targets/setup_tls/files/client_certificate.pem.license b/tests/integration/targets/setup_tls/files/client_certificate.pem.license new file mode 100644 index 0000000000..a1390a69ed --- /dev/null +++ b/tests/integration/targets/setup_tls/files/client_certificate.pem.license @@ -0,0 +1,3 @@ +Copyright (c) Ansible Project +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/integration/targets/setup_tls/files/client_key.pem b/tests/integration/targets/setup_tls/files/client_key.pem index 3848ad7cf1..850260a87f 100644 --- a/tests/integration/targets/setup_tls/files/client_key.pem +++ b/tests/integration/targets/setup_tls/files/client_key.pem @@ -1,7 +1,3 @@ -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -----BEGIN RSA PRIVATE KEY----- MIIEowIBAAKCAQEAqDPjkNxwpwlAAM/Shhk8FgfYUG1HwGV5v7LZW9v7jgKd6zcM QJQrP4IspgRxOiLupqytNOlZ/mfYm6iKw9i7gjsXLtucvIKKhutk4HT+bGvcEfuf diff --git a/tests/integration/targets/setup_tls/files/client_key.pem.license b/tests/integration/targets/setup_tls/files/client_key.pem.license new file mode 100644 index 0000000000..a1390a69ed --- /dev/null +++ b/tests/integration/targets/setup_tls/files/client_key.pem.license @@ -0,0 +1,3 @@ +Copyright (c) Ansible Project +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/integration/targets/setup_tls/files/server_certificate.pem b/tests/integration/targets/setup_tls/files/server_certificate.pem index b714ddbfb8..4a0ebc6ec0 100644 --- a/tests/integration/targets/setup_tls/files/server_certificate.pem +++ b/tests/integration/targets/setup_tls/files/server_certificate.pem @@ -1,7 +1,3 @@ -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -----BEGIN CERTIFICATE----- MIIDRjCCAi6gAwIBAgIBATANBgkqhkiG9w0BAQsFADAxMSAwHgYDVQQDDBdUTFNH ZW5TZWxmU2lnbmVkdFJvb3RDQTENMAsGA1UEBwwEJCQkJDAeFw0xOTAxMTEwODMz diff --git a/tests/integration/targets/setup_tls/files/server_certificate.pem.license b/tests/integration/targets/setup_tls/files/server_certificate.pem.license new file mode 100644 index 0000000000..a1390a69ed --- /dev/null +++ b/tests/integration/targets/setup_tls/files/server_certificate.pem.license @@ -0,0 +1,3 @@ +Copyright (c) Ansible Project +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/integration/targets/setup_tls/files/server_key.pem b/tests/integration/targets/setup_tls/files/server_key.pem index ec0134993e..c79ab64804 100644 --- a/tests/integration/targets/setup_tls/files/server_key.pem +++ b/tests/integration/targets/setup_tls/files/server_key.pem @@ -1,7 +1,3 @@ -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -----BEGIN RSA PRIVATE KEY----- MIIEowIBAAKCAQEAyMBKx8AHrEQX3fR4mZJgd1WIdvHNUJBPSPJ2MhySl9mQVIQM yvofNAZHEySfeNuualsgAh/8JeeF3v6HxVBaxmuL89Ks+FJC/yiNDhsNvGOKpyna diff --git a/tests/integration/targets/setup_tls/files/server_key.pem.license b/tests/integration/targets/setup_tls/files/server_key.pem.license new file mode 100644 index 0000000000..a1390a69ed --- /dev/null +++ b/tests/integration/targets/setup_tls/files/server_key.pem.license @@ -0,0 +1,3 @@ +Copyright (c) Ansible Project +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later