From aaa4c64d28cfb8ab9ef8276fa0ca1c0d5ddd516a Mon Sep 17 00:00:00 2001 From: fandehui Date: Thu, 28 Dec 2023 10:47:47 +0800 Subject: [PATCH] update ASM files for Linux (#70) remove unnecessary .title Signed-off-by: fandehui --- backport-update-ASM-files-for-Linux-70.patch | 115 +++++++++++++++++++ intel-sgx-ssl.spec | 6 +- 2 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 backport-update-ASM-files-for-Linux-70.patch diff --git a/backport-update-ASM-files-for-Linux-70.patch b/backport-update-ASM-files-for-Linux-70.patch new file mode 100644 index 0000000..9ac938e --- /dev/null +++ b/backport-update-ASM-files-for-Linux-70.patch @@ -0,0 +1,115 @@ +From f812fe9d7e69720f30275d484aa061ee49fd9107 Mon Sep 17 00:00:00 2001 +From: jinghe-INTC <58922257+jinghe-INTC@users.noreply.github.com> +Date: Fri, 21 Aug 2020 09:23:00 +0800 +Subject: [PATCH] update ASM files for Linux (#70) + +remove unnecessary .title +--- + openssl_source/Linux/aesni-x86_64.s | 2 -- + openssl_source/Linux/keccak1600-x86_64.s | 2 -- + openssl_source/Linux/rsaz-avx2.s | 2 -- + openssl_source/Linux/rsaz-x86_64.s | 2 -- + openssl_source/Linux/x86_64-mont.s | 2 -- + openssl_source/Linux/x86_64-mont5.s | 2 -- + 6 files changed, 12 deletions(-) + +diff --git a/openssl_source/Linux/aesni-x86_64.s b/openssl_source/Linux/aesni-x86_64.s +index fbd70a3..6e0fc71 100644 +--- a/openssl_source/Linux/aesni-x86_64.s ++++ b/openssl_source/Linux/aesni-x86_64.s +@@ -4482,7 +4482,6 @@ __aesni_set_encrypt_key: + .size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key + .align 64 + +-.title "begin table" + .Lbswap_mask: + .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 + .Lincrement32: +@@ -4503,6 +4502,5 @@ __aesni_set_encrypt_key: + .long 0x1b,0x1b,0x1b,0x1b + + .byte 65,69,83,32,102,111,114,32,73,110,116,101,108,32,65,69,83,45,78,73,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 +-.title "end table" + + .align 64 +diff --git a/openssl_source/Linux/keccak1600-x86_64.s b/openssl_source/Linux/keccak1600-x86_64.s +index 8770b5d..67b66a2 100644 +--- a/openssl_source/Linux/keccak1600-x86_64.s ++++ b/openssl_source/Linux/keccak1600-x86_64.s +@@ -495,7 +495,6 @@ SHA3_squeeze: + .size SHA3_squeeze,.-SHA3_squeeze + .align 256 + +-.title "begin table" + .quad 0,0,0,0,0,0,0,0 + .type iotas,@object + iotas: +@@ -525,5 +524,4 @@ iotas: + .quad 0x8000000080008008 + .size iotas,.-iotas + .byte 75,101,99,99,97,107,45,49,54,48,48,32,97,98,115,111,114,98,32,97,110,100,32,115,113,117,101,101,122,101,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 +-.title "end table" + +diff --git a/openssl_source/Linux/rsaz-avx2.s b/openssl_source/Linux/rsaz-avx2.s +index 1277abc..b0f2702 100644 +--- a/openssl_source/Linux/rsaz-avx2.s ++++ b/openssl_source/Linux/rsaz-avx2.s +@@ -1734,7 +1734,6 @@ rsaz_avx2_eligible: + + .align 64 + +-.title "begin table" + .Land_mask: + .quad 0x1fffffff,0x1fffffff,0x1fffffff,0x1fffffff + .Lscatter_permd: +@@ -1745,6 +1744,5 @@ rsaz_avx2_eligible: + .long 0,0,0,0, 1,1,1,1 + .long 2,2,2,2, 3,3,3,3 + .long 4,4,4,4, 4,4,4,4 +-.title "end table" + + .align 64 +diff --git a/openssl_source/Linux/rsaz-x86_64.s b/openssl_source/Linux/rsaz-x86_64.s +index b386254..eb1a54f 100644 +--- a/openssl_source/Linux/rsaz-x86_64.s ++++ b/openssl_source/Linux/rsaz-x86_64.s +@@ -2032,8 +2032,6 @@ rsaz_512_gather4: + + .align 64 + +-.title "begin table" + .Linc: + .long 0,0, 1,1 + .long 2,2, 2,2 +-.title "end table" +diff --git a/openssl_source/Linux/x86_64-mont.s b/openssl_source/Linux/x86_64-mont.s +index 3d0d69a..b7a0a2c 100644 +--- a/openssl_source/Linux/x86_64-mont.s ++++ b/openssl_source/Linux/x86_64-mont.s +@@ -1237,8 +1237,6 @@ bn_mulx4x_mont: + .cfi_endproc + .size bn_mulx4x_mont,.-bn_mulx4x_mont + +-.title "begin table" + .byte 77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 +-.title "end table" + + .align 16 +diff --git a/openssl_source/Linux/x86_64-mont5.s b/openssl_source/Linux/x86_64-mont5.s +index 6606f29..fcc279d 100644 +--- a/openssl_source/Linux/x86_64-mont5.s ++++ b/openssl_source/Linux/x86_64-mont5.s +@@ -3791,10 +3791,8 @@ bn_gather5: + .size bn_gather5,.-bn_gather5 + .align 64 + +-.title "begin table" + .Linc: + .long 0,0, 1,1 + .long 2,2, 2,2 + .byte 77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,119,105,116,104,32,115,99,97,116,116,101,114,47,103,97,116,104,101,114,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 +-.title "end table" + +-- +2.27.0 + diff --git a/intel-sgx-ssl.spec b/intel-sgx-ssl.spec index d25f8b4..711d076 100644 --- a/intel-sgx-ssl.spec +++ b/intel-sgx-ssl.spec @@ -1,7 +1,7 @@ %define openssl_version 1.1.1g Name: intel-sgx-ssl Version: 2.10 -Release: 4 +Release: 5 Summary: Intel® Software Guard Extensions SSL ExclusiveArch: x86_64 License: OpenSSL and BSD 3-clause "New" or "Revised" License @@ -15,6 +15,7 @@ Patch2: backport-CVE-2022-1292.patch Patch3: backport-CVE-2022-2068-Fix-file-operations-in-c_rehash.patch Patch4: backport-CVE-2022-0778.patch Patch5: backport-CVE-2022-0778_test.patch +Patch6: backport-update-ASM-files-for-Linux-70.patch BuildRequires: gcc BuildRequires: libsgx-launch libsgx-urts sgxsdk @@ -73,6 +74,9 @@ cp License.txt $RPM_BUILD_ROOT/opt/intel/sgxssl/docs/ /opt/intel/sgxssl/include/* %changelog +* Thu Dec 28 2023 fandehui - 2.10-5 +- update ASM files for Linux (#70) + * Sat Sep 03 2022 wangyu - 2.10-4 - Fix CVE-2022-2068 CVE-2022-0778 CVE-2022-1292 CVE-2022-2097 -- Gitee