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)

diff --git a/crypto/aes/asm/aes-riscv32-zkn.pl b/crypto/aes/asm/aes-riscv32-zkn.pl
index 00d5d773597effaae6ba41fa275a4544344b10a4..67ec63230e5dc1a17cbd73221a6c26ec24e810a3 100644 (file)
--- 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 5c682427516beb8261c2d19f5ad91e0e9c1f97db..a0689ae645eb1db27e366d52d73810d7b853c203 100644 (file)
--- 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.

diff --git a/crypto/modes/asm/ghash-riscv64.pl b/crypto/modes/asm/ghash-riscv64.pl
index 8ec323d3bcdec225aeef639be60f0fd6e3f2c78f..2ed4740b496467d25d9a20c5ac17c0e0c0741c6a 100644 (file)
--- a/crypto/modes/asm/ghash-riscv64.pl
+++ b/crypto/modes/asm/ghash-riscv64.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) 2023, Christoph Müllner <christoph.muellner@vrull.eu>
 # All rights reserved.

diff --git a/crypto/perlasm/riscv.pm b/crypto/perlasm/riscv.pm
index 85d0af7d9a427d9c2602b6311da944337bc16aa1..90540b7dde164629a1f4a41eab6b33183cba47c2 100644 (file)
--- a/crypto/perlasm/riscv.pm
+++ b/crypto/perlasm/riscv.pm
@@ -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 2023 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) 2023, Christoph Müllner <christoph.muellner@vrull.eu>
 # All rights reserved.