All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 2/2] package/libopenssl: Patch for riscv32 builds
@ 2023-12-23  6:40 Grant Nichol
  2023-12-23  7:07 ` [Buildroot] [PATCH v2 " Grant Nichol
  0 siblings, 1 reply; 3+ messages in thread
From: Grant Nichol @ 2023-12-23  6:40 UTC (permalink / raw)
  To: buildroot

Fixes a mispelling in upstream causing builds for riscv32 to fail when
linking.

Signed-off-by: Grant Nichol <me@grantnichol.com>
---
 ...x-mispelling-of-extension-test-macro.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch

diff --git a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch
new file mode 100644
index 0000000000..aa2a531977
--- /dev/null
+++ b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch
@@ -0,0 +1,29 @@
+From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001
+From: Grant Nichol <me@grantnichol.com>
+Date: Fri, 22 Dec 2023 23:46:39 -0600
+Subject: [PATCH] riscv: Fix mispelling of extension test macro
+
+When refactoring the riscv extension test macros,
+RISCV_HAS_ZKND_AND_ZKNE was mispelled.
+
+Upstream: https://github.com/openssl/openssl/pull/23139
+---
+ providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c
+index b35b71020e..65adc47d1f 100644
+--- a/providers/implementations/ciphers/cipher_aes_xts_hw.c
++++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c
+@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = {                   \
+ # define PROV_CIPHER_HW_select_xts()                                           \
+ if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE())                                        \
+     return &aes_xts_rv32i_zbkb_zknd_zkne;                                      \
+-if (RISCV_HAS_ZKND_ZKNE())                                                     \
++if (RISCV_HAS_ZKND_AND_ZKNE())                                                     \
+     return &aes_xts_rv32i_zknd_zkne;
+ # else
+ /* The generic case */
+--
+2.43.0
+
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2 2/2] package/libopenssl: Patch for riscv32 builds
  2023-12-23  6:40 [Buildroot] [PATCH 2/2] package/libopenssl: Patch for riscv32 builds Grant Nichol
@ 2023-12-23  7:07 ` Grant Nichol
  2023-12-23 10:45   ` Yann E. MORIN
  0 siblings, 1 reply; 3+ messages in thread
From: Grant Nichol @ 2023-12-23  7:07 UTC (permalink / raw)
  To: buildroot; +Cc: Grant Nichol

Fixes a mispelling in upstream causing builds for riscv32 to fail when
linking.

Signed-off-by: Grant Nichol <me@grantnichol.com>
---
Changes v1 -> v2:
  - Adding missing signoff in the patch file.

 ...x-mispelling-of-extension-test-macro.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch

diff --git a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch
new file mode 100644
index 0000000000..93b191a61c
--- /dev/null
+++ b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch
@@ -0,0 +1,30 @@
+From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001
+From: Grant Nichol <me@grantnichol.com>
+Date: Fri, 22 Dec 2023 23:46:39 -0600
+Subject: [PATCH] riscv: Fix mispelling of extension test macro
+
+When refactoring the riscv extension test macros,
+RISCV_HAS_ZKND_AND_ZKNE was mispelled.
+
+Upstream: https://github.com/openssl/openssl/pull/23139
+Signed-off-by: Grant Nichol <me@grantnichol.com>
+---
+ providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c
+index b35b71020e..65adc47d1f 100644
+--- a/providers/implementations/ciphers/cipher_aes_xts_hw.c
++++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c
+@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = {                   \
+ # define PROV_CIPHER_HW_select_xts()                                           \
+ if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE())                                        \
+     return &aes_xts_rv32i_zbkb_zknd_zkne;                                      \
+-if (RISCV_HAS_ZKND_ZKNE())                                                     \
++if (RISCV_HAS_ZKND_AND_ZKNE())                                                     \
+     return &aes_xts_rv32i_zknd_zkne;
+ # else
+ /* The generic case */
+--
+2.43.0
+
--
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v2 2/2] package/libopenssl: Patch for riscv32 builds
  2023-12-23  7:07 ` [Buildroot] [PATCH v2 " Grant Nichol
@ 2023-12-23 10:45   ` Yann E. MORIN
  0 siblings, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2023-12-23 10:45 UTC (permalink / raw)
  To: Grant Nichol; +Cc: buildroot

Grant, All,

On 2023-12-23 01:07 -0600, Grant Nichol spake thusly:
> Fixes a mispelling in upstream causing builds for riscv32 to fail when
> linking.

This whould have been submitted in the same patch that adds the riscv
specific target. Otherwise, if we only applied the first, the build
would be known-broken; furthermore, that also breaks bisectability.

So, I squashed the two changes together, and applied to master, thanks.

Regards,
Yann E. MORIN.

> Signed-off-by: Grant Nichol <me@grantnichol.com>
> ---
> Changes v1 -> v2:
>   - Adding missing signoff in the patch file.
> 
>  ...x-mispelling-of-extension-test-macro.patch | 30 +++++++++++++++++++
>  1 file changed, 30 insertions(+)
>  create mode 100644 package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch
> 
> diff --git a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch
> new file mode 100644
> index 0000000000..93b191a61c
> --- /dev/null
> +++ b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch
> @@ -0,0 +1,30 @@
> +From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001
> +From: Grant Nichol <me@grantnichol.com>
> +Date: Fri, 22 Dec 2023 23:46:39 -0600
> +Subject: [PATCH] riscv: Fix mispelling of extension test macro
> +
> +When refactoring the riscv extension test macros,
> +RISCV_HAS_ZKND_AND_ZKNE was mispelled.
> +
> +Upstream: https://github.com/openssl/openssl/pull/23139
> +Signed-off-by: Grant Nichol <me@grantnichol.com>
> +---
> + providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c
> +index b35b71020e..65adc47d1f 100644
> +--- a/providers/implementations/ciphers/cipher_aes_xts_hw.c
> ++++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c
> +@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = {                   \
> + # define PROV_CIPHER_HW_select_xts()                                           \
> + if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE())                                        \
> +     return &aes_xts_rv32i_zbkb_zknd_zkne;                                      \
> +-if (RISCV_HAS_ZKND_ZKNE())                                                     \
> ++if (RISCV_HAS_ZKND_AND_ZKNE())                                                     \
> +     return &aes_xts_rv32i_zknd_zkne;
> + # else
> + /* The generic case */
> +--
> +2.43.0
> +
> --
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-23 10:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-23  6:40 [Buildroot] [PATCH 2/2] package/libopenssl: Patch for riscv32 builds Grant Nichol
2023-12-23  7:07 ` [Buildroot] [PATCH v2 " Grant Nichol
2023-12-23 10:45   ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.