From 98258510697aefa1dfe88fdb5f991f80adde9bc5d75df97bb937d39be57ae30a Mon Sep 17 00:00:00 2001
From: Otto Hollmann <otto.hollmann@suse.com>
Date: Fri, 8 Dec 2023 07:15:05 +0000
Subject: [PATCH] Accepting request 1131607 from home:Guillaume_G:PAC_BTI

- Add patch to fix BTI enablement on aarch64:
  * openssl-Enable-BTI-feature-for-md5-on-aarch64.patch

OBS-URL: https://build.opensuse.org/request/show/1131607
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=82
---
 openssl-3.changes                             |  6 ++++
 openssl-3.spec                                |  2 ++
 ...nable-BTI-feature-for-md5-on-aarch64.patch | 28 +++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 openssl-Enable-BTI-feature-for-md5-on-aarch64.patch

diff --git a/openssl-3.changes b/openssl-3.changes
index 287066b..4eed028 100644
--- a/openssl-3.changes
+++ b/openssl-3.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec  7 09:54:17 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add patch to fix BTI enablement on aarch64:
+  * openssl-Enable-BTI-feature-for-md5-on-aarch64.patch
+
 -------------------------------------------------------------------
 Thu Nov 23 16:07:51 UTC 2023 - Otto Hollmann <otto.hollmann@suse.com>
 
diff --git a/openssl-3.spec b/openssl-3.spec
index 8a6f866..7126567 100644
--- a/openssl-3.spec
+++ b/openssl-3.spec
@@ -53,6 +53,8 @@ Patch9:         openssl-Add-FIPS_mode-compatibility-macro.patch
 Patch10:        openssl-Add-Kernel-FIPS-mode-flag-support.patch
 # PATCH-FIX-UPSTREAM Fix test/recipes/01-test_symbol_presence.t
 Patch11:        openssl-Fix_test_symbol_presence.patch
+# PATCH-FIX-UPSTREAM https://github.com/openssl/openssl/pull/22971
+Patch12:        openssl-Enable-BTI-feature-for-md5-on-aarch64.patch
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(zlib)
 Requires:       libopenssl3 = %{version}-%{release}
diff --git a/openssl-Enable-BTI-feature-for-md5-on-aarch64.patch b/openssl-Enable-BTI-feature-for-md5-on-aarch64.patch
new file mode 100644
index 0000000..031bef4
--- /dev/null
+++ b/openssl-Enable-BTI-feature-for-md5-on-aarch64.patch
@@ -0,0 +1,28 @@
+From d2bfec6e464aeb247a2d6853668d4e473f19e15f Mon Sep 17 00:00:00 2001
+From: "fangming.fang" <fangming.fang@arm.com>
+Date: Thu, 7 Dec 2023 06:17:51 +0000
+Subject: [PATCH] Enable BTI feature for md5 on aarch64
+
+Fixes: #22959
+---
+ crypto/md5/asm/md5-aarch64.pl | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/crypto/md5/asm/md5-aarch64.pl b/crypto/md5/asm/md5-aarch64.pl
+index 3200a0fa9bff0..5a8608069691d 100755
+--- a/crypto/md5/asm/md5-aarch64.pl
++++ b/crypto/md5/asm/md5-aarch64.pl
+@@ -28,10 +28,13 @@
+ *STDOUT=*OUT;
+ 
+ $code .= <<EOF;
++#include "arm_arch.h"
++
+ .text
+ .globl  ossl_md5_block_asm_data_order
+ .type   ossl_md5_block_asm_data_order,\@function
+ ossl_md5_block_asm_data_order:
++        AARCH64_VALID_CALL_TARGET
+         // Save all callee-saved registers
+         stp     x19,x20,[sp,#-80]!
+         stp     x21,x22,[sp,#16]