From 4225b1a966622c9d33b3e757f61b50ee34839d69 Mon Sep 17 00:00:00 2001 From: Peter Kolbus Date: Fri, 31 May 2019 06:38:06 -0500 Subject: [PATCH] Clean up file prologue comments Update new files to include the same legalese as in aes.h. Editorial touchups in Dockerfile and ssl-opt-in-docker.sh. --- tests/compat-in-docker.sh | 21 +++++++++++++++++---- tests/docker/xenial/Dockerfile | 24 +++++++++++++++++++----- tests/make-in-docker.sh | 21 +++++++++++++++++---- tests/scripts/all-in-docker.sh | 21 +++++++++++++++++---- tests/scripts/basic-in-docker.sh | 21 +++++++++++++++++---- tests/scripts/docker_env.sh | 21 +++++++++++++++++---- tests/ssl-opt-in-docker.sh | 23 ++++++++++++++++++----- 7 files changed, 122 insertions(+), 30 deletions(-) diff --git a/tests/compat-in-docker.sh b/tests/compat-in-docker.sh index bbb860a3d..67a0807b3 100755 --- a/tests/compat-in-docker.sh +++ b/tests/compat-in-docker.sh @@ -2,10 +2,6 @@ # compat-in-docker.sh # -# This file is part of mbed TLS (https://tls.mbed.org) -# -# Copyright (c) 2019, ARM Limited, All Rights Reserved -# # Purpose # ------- # This runs compat.sh in a Docker container. @@ -21,6 +17,23 @@ # - scripts/docker_env.sh for general Docker prerequisites and other information. # - compat.sh for notes about invocation of that script. +# Copyright (C) 2006-2019, Arm Limited (or its affiliates), All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file is part of Mbed TLS (https://tls.mbed.org) + source tests/scripts/docker_env.sh case "${OPENSSL_CMD:-default}" in diff --git a/tests/docker/xenial/Dockerfile b/tests/docker/xenial/Dockerfile index 4573af9ed..f16ae752c 100644 --- a/tests/docker/xenial/Dockerfile +++ b/tests/docker/xenial/Dockerfile @@ -1,13 +1,27 @@ -# -# This file is part of mbed TLS (https://tls.mbed.org) -# -# Copyright (c) 2018-2019, ARM Limited, All Rights Reserved +# Dockerfile # # Purpose -# +# ------- # Defines a Docker container suitable to build and run all tests (all.sh), # except for those that use a proprietary toolchain. +# Copyright (C) 2006-2019, Arm Limited (or its affiliates), All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file is part of Mbed TLS (https://tls.mbed.org) + FROM ubuntu:xenial ARG MAKEFLAGS_PARALLEL="" diff --git a/tests/make-in-docker.sh b/tests/make-in-docker.sh index 2f8b90109..4fbfe1ccb 100755 --- a/tests/make-in-docker.sh +++ b/tests/make-in-docker.sh @@ -2,10 +2,6 @@ # make-in-docker.sh # -# This file is part of mbed TLS (https://tls.mbed.org) -# -# Copyright (c) 2019, ARM Limited, All Rights Reserved -# # Purpose # ------- # This runs make in a Docker container. @@ -13,6 +9,23 @@ # See also: # - scripts/docker_env.sh for general Docker prerequisites and other information. +# Copyright (C) 2006-2019, Arm Limited (or its affiliates), All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file is part of Mbed TLS (https://tls.mbed.org) + source tests/scripts/docker_env.sh run_in_docker make $@ diff --git a/tests/scripts/all-in-docker.sh b/tests/scripts/all-in-docker.sh index 3d5dbf2a8..ee9a09290 100755 --- a/tests/scripts/all-in-docker.sh +++ b/tests/scripts/all-in-docker.sh @@ -2,10 +2,6 @@ # all-in-docker.sh # -# This file is part of mbed TLS (https://tls.mbed.org) -# -# Copyright (c) 2018-2019, ARM Limited, All Rights Reserved -# # Purpose # ------- # This runs all.sh (except for armcc) in a Docker container. @@ -16,6 +12,23 @@ # # See also all.sh for notes about invocation of that script. +# Copyright (C) 2006-2019, Arm Limited (or its affiliates), All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file is part of Mbed TLS (https://tls.mbed.org) + source tests/scripts/docker_env.sh # Run tests that are possible with openly available compilers diff --git a/tests/scripts/basic-in-docker.sh b/tests/scripts/basic-in-docker.sh index cfb72f4cc..37ed5ea50 100755 --- a/tests/scripts/basic-in-docker.sh +++ b/tests/scripts/basic-in-docker.sh @@ -2,10 +2,6 @@ # basic-in-docker.sh # -# This file is part of mbed TLS (https://tls.mbed.org) -# -# Copyright (c) 2018-2019, ARM Limited, All Rights Reserved -# # Purpose # ------- # This runs a rough equivalent of the travis.yml in a Docker container. @@ -15,6 +11,23 @@ # --------------- # See docker_env.sh for prerequisites and other information. +# Copyright (C) 2006-2019, Arm Limited (or its affiliates), All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file is part of Mbed TLS (https://tls.mbed.org) + source tests/scripts/docker_env.sh run_in_docker tests/scripts/recursion.pl library/*.c diff --git a/tests/scripts/docker_env.sh b/tests/scripts/docker_env.sh index 3e1ce6125..6b65b034e 100755 --- a/tests/scripts/docker_env.sh +++ b/tests/scripts/docker_env.sh @@ -2,10 +2,6 @@ # docker_env.sh # -# This file is part of mbed TLS (https://tls.mbed.org) -# -# Copyright (c) 2018-2019, ARM Limited, All Rights Reserved -# # Purpose # ------- # @@ -23,6 +19,23 @@ # Running this script directly will check for Docker availability and set up # the Docker image. +# Copyright (C) 2006-2019, Arm Limited (or its affiliates), All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file is part of Mbed TLS (https://tls.mbed.org) + # default values, can be overridden by the environment : ${MBEDTLS_DOCKER_GUEST:=xenial} diff --git a/tests/ssl-opt-in-docker.sh b/tests/ssl-opt-in-docker.sh index b3a23fb32..e6e469d82 100755 --- a/tests/ssl-opt-in-docker.sh +++ b/tests/ssl-opt-in-docker.sh @@ -2,17 +2,13 @@ # ssl-opt-in-docker.sh # -# This file is part of mbed TLS (https://tls.mbed.org) -# -# Copyright (c) 2019, ARM Limited, All Rights Reserved -# # Purpose # ------- # This runs ssl-opt.sh in a Docker container. # # Notes for users # --------------- -# If OPENSSL_CMD, GNUTLS_CLI, or GNUTLS_SERV are specified the path must +# If OPENSSL_CMD, GNUTLS_CLI, or GNUTLS_SERV are specified, the path must # correspond to an executable inside the Docker container. The special # values "next" and "legacy" are also allowed as shorthand for the # installations inside the container. @@ -21,6 +17,23 @@ # - scripts/docker_env.sh for general Docker prerequisites and other information. # - ssl-opt.sh for notes about invocation of that script. +# Copyright (C) 2006-2019, Arm Limited (or its affiliates), All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file is part of Mbed TLS (https://tls.mbed.org) + source tests/scripts/docker_env.sh case "${OPENSSL_CMD:-default}" in