From e5313f20486f86be42059fce6b0d9e43a35e8655 Mon Sep 17 00:00:00 2001 From: Shakti Shah Date: Wed, 14 Feb 2024 00:33:19 +0530 Subject: OpenSSL License is applied for some source files, change to Apache 2 The following files include/openssl/hpke.h crypto/hpke/hpke.c crypto/ec/asm/ecp_sm2p256-armv8.pl crypto/chacha/asm/chacha-loongarch64.pl still seem to be released under the OpenSSL License instead of the Apache 2 license. Fixes #23570 Reviewed-by: Shane Lontis Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/23576) --- crypto/chacha/asm/chacha-loongarch64.pl | 2 +- crypto/ec/asm/ecp_sm2p256-armv8.pl | 2 +- crypto/hpke/hpke.c | 2 +- include/openssl/hpke.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/chacha/asm/chacha-loongarch64.pl b/crypto/chacha/asm/chacha-loongarch64.pl index 0a194dd799..161df42ffa 100644 --- a/crypto/chacha/asm/chacha-loongarch64.pl +++ b/crypto/chacha/asm/chacha-loongarch64.pl @@ -2,7 +2,7 @@ # Author: Min Zhou # Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. # -# Licensed under the OpenSSL license (the "License"). You may not use +# Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html diff --git a/crypto/ec/asm/ecp_sm2p256-armv8.pl b/crypto/ec/asm/ecp_sm2p256-armv8.pl index 91894e49d0..de2f96964d 100644 --- a/crypto/ec/asm/ecp_sm2p256-armv8.pl +++ b/crypto/ec/asm/ecp_sm2p256-armv8.pl @@ -1,7 +1,7 @@ #! /usr/bin/env perl # Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. # -# Licensed under the OpenSSL license (the "License"). You may not use +# Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html diff --git a/crypto/hpke/hpke.c b/crypto/hpke/hpke.c index 5e976d6150..ef272e1369 100644 --- a/crypto/hpke/hpke.c +++ b/crypto/hpke/hpke.c @@ -1,7 +1,7 @@ /* * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html diff --git a/include/openssl/hpke.h b/include/openssl/hpke.h index cf8b49dd56..ab32d9d892 100644 --- a/include/openssl/hpke.h +++ b/include/openssl/hpke.h @@ -1,7 +1,7 @@ /* * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html -- cgit v1.2.3