diff options
| author | Heiko Stuebner <heiko.stuebner@vrull.eu> | 2023-07-04 18:16:41 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-07-06 12:53:27 +1000 |
| commit | 3e76b388521ccafddd8ba19d9ab62c8d25e83e0c (patch) | |
| tree | 497e3e6b498a4d7ba582519255af7c9b9df374dd /crypto/aes | |
| parent | db2f98c4ebb17a60307f70c330834beffb8f1253 (diff) | |
riscv: Clarify dual-licensing wording for GCM and AES
The original text for the Apache + BSD dual licensing for riscv GCM and AES
perlasm was taken from other openSSL users like crypto/crypto/LPdir_unix.c .
Though Eric pointed out that the dual-licensing text could be read in a
way negating the second license [0] and suggested to clarify the text
even more.
So do this here for all of the GCM, AES and shared riscv.pm .
We already had the agreement of all involved developers for the actual
dual licensing in [0] and [1], so this is only a better clarification
for this.
[0] https://github.com/openssl/openssl/pull/20649#issuecomment-1589558790
[1] https://github.com/openssl/openssl/pull/21018
Signed-off-by: Heiko Stuebner <heiko.stuebner@vrull.eu>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21357)
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/asm/aes-riscv32-zkn.pl | 13 | ||||
| -rw-r--r-- | crypto/aes/asm/aes-riscv64-zkn.pl | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/crypto/aes/asm/aes-riscv32-zkn.pl b/crypto/aes/asm/aes-riscv32-zkn.pl index 00d5d77359..67ec63230e 100644 --- a/crypto/aes/asm/aes-riscv32-zkn.pl +++ b/crypto/aes/asm/aes-riscv32-zkn.pl @@ -1,13 +1,14 @@ #! /usr/bin/env perl +# This file is dual-licensed, meaning that you can use it under your +# choice of either of the following two licenses: +# # Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. # -# 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 +# Licensed under the Apache License 2.0 (the "License"). You can obtain +# a copy in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html - -# This file is dual-licensed and is also available under the following -# terms: +# +# or # # Copyright (c) 2022, Hongren (Zenithal) Zheng <i@zenithal.me> # All rights reserved. diff --git a/crypto/aes/asm/aes-riscv64-zkn.pl b/crypto/aes/asm/aes-riscv64-zkn.pl index 5c68242751..a0689ae645 100644 --- a/crypto/aes/asm/aes-riscv64-zkn.pl +++ b/crypto/aes/asm/aes-riscv64-zkn.pl @@ -1,13 +1,14 @@ #! /usr/bin/env perl +# This file is dual-licensed, meaning that you can use it under your +# choice of either of the following two licenses: +# # Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. # -# 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 +# Licensed under the Apache License 2.0 (the "License"). You can obtain +# a copy in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html - -# This file is dual-licensed and is also available under the following -# terms: +# +# or # # Copyright (c) 2022, Hongren (Zenithal) Zheng <i@zenithal.me> # All rights reserved. |