diff --git a/openssl-Add-sw64-8A-architecture.patch b/openssl-Add-sw64-8A-architecture.patch new file mode 100644 index 0000000000000000000000000000000000000000..e62035505d310c25550d4cf11b4d4b95ca7ac34a --- /dev/null +++ b/openssl-Add-sw64-8A-architecture.patch @@ -0,0 +1,75 @@ +diff -uNar openssl-1.1.1m.org/crypto/sw_64cpuid.pl openssl-1.1.1m.sw/crypto/sw_64cpuid.pl +--- openssl-1.1.1m.org/crypto/sw_64cpuid.pl 2024-09-11 21:58:23.172909396 +0800 ++++ openssl-1.1.1m.sw/crypto/sw_64cpuid.pl 2024-09-11 22:01:18.926908726 +0800 +@@ -83,11 +83,8 @@ + .prologue 0 + 1: ldi $2,0($16) + lldw $0,0($2) +- ldi $3,1 +- rd_f $3 + addw $0,$17,$1 + lstw $1,0($2) +- rd_f $1 + beq $1,1b + addw $0,$17,$0 + ret ($26) +@@ -172,7 +169,6 @@ + my ($tick,$lasttick)=("\$19","\$20"); + my ($diff,$lastdiff)=("\$21","\$22"); + my ($v0,$ra,$sp,$zero)=("\$0","\$26","\$30","\$31"); +-my ($tmp)=("\$4"); + + print <<___; + .globl OPENSSL_instrument_bus +@@ -186,12 +182,9 @@ + mov 0,$diff + + lldw $tick,0($out) +- ldi $tmp,1 +- wr_f $tmp + addw $diff,$tick,$tick + mov $tick,$diff + lstw $tick,0($out) +- rd_f $tick + stl $diff,0($out) + + .Loop: rtc $tick +@@ -199,12 +192,9 @@ + mov $tick,$lasttick + + lldw $tick,0($out) +- ldi $tmp,1 +- wr_f $tmp + addw $diff,$tick,$tick + mov $tick,$diff + lstw $tick,0($out) +- rd_f $tick + stl $diff,0($out) + + subw $cnt,1,$cnt +@@ -225,12 +215,9 @@ + mov 0,$diff + + lldw $tick,0($out) +- ldi $tmp,1 +- wr_f $tmp + addw $diff,$tick,$tick + mov $tick,$diff + lstw $tick,0($out) +- rd_f $tick + stl $diff,0($out) + + rtc $tick +@@ -239,12 +226,9 @@ + mov $diff,$lastdiff + .Loop2: + lldw $tick,0($out) +- ldi $tmp,1 +- wr_f $tmp + addw $diff,$tick,$tick + mov $tick,$diff + lstw $tick,0($out) +- rd_f $tick + stl $diff,0($out) + + subw $max,1,$max diff --git a/openssl.spec b/openssl.spec index ec6a223ae9f7e257c7f091055d5286059d02cc57..b7badb130399907a9e1018552f6aaf001cab040b 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,7 +2,7 @@ Name: openssl Epoch: 1 Version: 1.1.1m -Release: 37 +Release: 38 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay URL: https://www.openssl.org/ @@ -157,6 +157,7 @@ Patch146: backport-CVE-2024-5535-Add-a-test-for-ALPN-and-NPN.patch Patch1000: 1000-add-sw_64-support-not-upstream-modified-files.patch Patch1001: 1001-add-loongarch64-support-not-upstream-modified-files.patch +Patch1002: openssl-Add-sw64-8A-architecture.patch BuildRequires: gcc perl make lksctp-tools-devel coreutils util-linux zlib-devel Requires: coreutils %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -367,6 +368,9 @@ make test || : %ldconfig_scriptlets libs %changelog +* Fri Sep 13 2024 wuzx - 1:1.1.1m-38 +- add sw64-8A support + * Tue Jul 2 2024 gengqihu - 1:1.1.1m-37 - fix CVE-2024-5535