开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm:openssl.spec Changed

@@ -1,39 +1,37 @@
-%define soversion 1.1
+%define soversion 3
 Name:        openssl
 Epoch:       1
-Version:     1.1.1m
+Version:     3.0.8
 Release:     6
 Summary:     Cryptography and SSL/TLS Toolkit
 License:     OpenSSL and SSLeay
 URL:         https://www.openssl.org/
 Source0:     https://www.openssl.org/source/%{name}-%{version}.tar.gz
 Source1:     Makefile.certificate
-Patch1:      openssl-1.1.1-build.patch
-Patch2:      openssl-1.1.1-fips.patch
-Patch3:      CVE-2022-0778-Add-a-negative-testcase-for-BN_mod_sqrt.patch
-Patch4:      CVE-2022-0778-Fix-possible-infinite-loop-in-BN_mod_sqrt.patch
-Patch5:      CVE-2022-1292.patch
-Patch6:      Backport-Support-raw-input-data-in-apps-pkeyutl.patch
-Patch7:      Backport-Fix-no-ec-no-sm2-and-no-sm3.patch
-Patch8:      Backport-Support-SM2-certificate-verification.patch
-Patch9:      Backport-Guard-some-SM2-functions-with-OPENSSL_NO_SM2.patch
-Patch10:     Backport-Add-test-cases-for-SM2-cert-verification.patch
-Patch11:     Backport-Add-documents-for-SM2-cert-verification.patch
-Patch12:     Backport-Fix-a-memleak-in-apps-verify.patch
-Patch13:     Backport-Skip-the-correct-number-of-tests-if-SM2-is-disabled.patch
-Patch14:     Backport-Make-X509_set_sm2_id-consistent-with-other-setters.patch
-Patch15:     Backport-Support-SM2-certificate-signing.patch
-Patch16:     Backport-Support-parsing-of-SM2-ID-in-hexdecimal.patch
-Patch17:     Backport-Fix-a-double-free-issue-when-signing-SM2-cert.patch
-Patch18:     Backport-Fix-a-document-description-in-apps-req.patch
-Patch19:     Backport-Update-expired-SCT-certificates.patch
-Patch20:     Backport-ct_test.c-Update-the-epoch-time.patch
-Patch21:     Feature-Support-TLCP-protocol.patch
-Patch22:     Feature-X509-command-supports-SM2-certificate-signing-with-default-sm2id.patch
-Patch23:     CVE-2022-2068-Fix-file-operations-in-c_rehash.patch
-Patch24:     CVE-2022-2097-Fix-AES-OCB-encrypt-decrypt-for-x86-AES-NI.patch
-
-BuildRequires: gcc perl make lksctp-tools-devel coreutils util-linux zlib-devel
+
+Patch1:      openssl-3.0-build.patch
+Patch2:      Backport-aarch64-support-BTI-and-pointer-authentication-in-as.patch
+Patch3:      Backport-SM3-acceleration-with-SM3-hardware-instruction-on-aa.patch
+Patch4:      Backport-Fix-sm3ss1-translation-issue-in-sm3-armv8.pl.patch
+Patch5:      Backport-providers-Add-SM4-GCM-implementation.patch
+Patch6:      Backport-SM4-optimization-for-ARM-by-HW-instruction.patch
+Patch7:      Backport-Further-acceleration-for-SM4-GCM-on-ARM.patch
+Patch8:      Backport-SM4-optimization-for-ARM-by-ASIMD.patch
+Patch9:      Backport-providers-Add-SM4-XTS-implementation.patch
+Patch10:     Backport-Fix-SM4-CBC-regression-on-Armv8.patch
+Patch11:     Backport-Fix-SM4-test-failures-on-big-endian-ARM-processors.patch
+Patch12:     Backport-Apply-SM4-optimization-patch-to-Kunpeng-920.patch
+Patch13:     Backport-SM4-AESE-optimization-for-ARMv8.patch
+Patch14:     Backport-Fix-SM4-XTS-build-failure-on-Mac-mini-M1.patch
+Patch15:     Backport-CVE-2023-0464-x509-excessive-resource-use-verifying-policy-constra.patch
+Patch16:     Backport-test-add-test-cases-for-the-policy-resource-overuse.patch
+Patch17:     backport-Add-a-Certificate-Policies-Test.patch
+Patch18:     backport-Ensure-that-EXFLAG_INVALID_POLICY-is-checked-even-in.patch
+Patch19:     backport-Generate-some-certificates-with-the-certificatePolic.patch
+Patch20:     backport-Fix-documentation-of-X509_VERIFY_PARAM_add0_policy.patch
+Patch21:     backport-CVE-2023-1255.patch
+
+BuildRequires: gcc gcc-c++ perl make lksctp-tools-devel coreutils util-linux zlib-devel
 Requires:    coreutils %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description
@@ -46,9 +44,6 @@
 Requires:     ca-certificates >= 2008-5
 Requires:     crypto-policies >= 20180730
 Recommends:   openssl-pkcs11%{?_isa}
-Obsoletes:    openssl < 1:1.0.1-0.3.beta3
-Obsoletes:    openssl-fips < 1:1.0.1e-28
-Provides:     openssl-fips = %{epoch}:%{version}-%{release}
 
 %description libs
 The openssl-libs package contains the libraries that are used
@@ -68,14 +63,18 @@
 %package devel
 Summary:   Development files for openssl
 Requires:  %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: krb5-devel zlib-devel pkgconfig
-Obsoletes: openssl-static < %{epoch}:%{version}-%{release}
-Provides:  openssl-static = %{epoch}:%{version}-%{release} openssl-static%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 %{summary}.
 
-%package_help
+%package        help
+Summary:        Documents for %{name}
+Buildarch:      noarch
+Requires:       man info
+
+%description help
+Man pages and other related documents for %{name}.
 
 %prep
 %autosetup -n %{name}-%{version} -p1
@@ -83,33 +82,34 @@
 %build
 
 sslarch=%{_os}-%{_target_cpu}
+%ifarch i686
+sslarch=linux-elf
+%endif
+%ifarch riscv64
+sslarch=%{_os}64-%{_target_cpu}
+sslflags="--libdir=%{_libdir}"
+%endif
+
 %ifarch x86_64 aarch64
 sslflags=enable-ec_nistp_64_gcc_128
 %endif
 
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -DPURIFY $RPM_LD_FLAGS"
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -Wa,--generate-missing-build-notes=yes -DPURIFY $RPM_LD_FLAGS"
 ./Configure \
-    --prefix=%{_prefix} \
-    --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
-    zlib enable-camellia enable-seed enable-rfc3779 enable-sctp \
-    enable-cms enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method \
-    enable-weak-ssl-ciphers \
-    no-mdc2 no-ec2m enable-sm2 enable-sm3 enable-sm4 enable-tlcp \
-    shared ${sslarch} $RPM_OPT_FLAGS '-DDEVRANDOM="\"/dev/urandom\""'
+	--prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
+	zlib enable-camellia enable-seed enable-rfc3779 \
+	enable-cms enable-md2 enable-rc5 ${ktlsopt} enable-fips\
+	no-mdc2 no-ec2m enable-sm2 enable-sm4 enable-buildtest-c++\
+	shared  ${sslarch} $RPM_OPT_FLAGS '-DDEVRANDOM="\"/dev/urandom\""' \
+	-Wl,--allow-multiple-definition
 
-%make_build all
 
-%define __spec_install_post \
-    %{?__debug_package:%{__debug_install_post}} \
-    %{__arch_install_post} \
-    %{__os_install_post} \
-    crypto/fips/fips_standalone_hmac $RPM_BUILD_ROOT%{_libdir}/libcrypto.so.%{version} >$RPM_BUILD_ROOT%{_libdir}/.libcrypto.so.%{version}.hmac \
-    ln -sf .libcrypto.so.%{version}.hmac $RPM_BUILD_ROOT%{_libdir}/.libcrypto.so.%{soversion}.hmac \
-    crypto/fips/fips_standalone_hmac $RPM_BUILD_ROOT%{_libdir}/libssl.so.%{version} >$RPM_BUILD_ROOT%{_libdir}/.libssl.so.%{version}.hmac \
-    ln -sf .libssl.so.%{version}.hmac $RPM_BUILD_ROOT%{_libdir}/.libssl.so.%{soversion}.hmac \
-%{nil}
+%make_build all
 
 %install
+ "$RPM_BUILD_ROOT" != "/"  && rm -rf $RPM_BUILD_ROOT
+# Install OpenSSL.
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir},%{_mandir},%{_libdir}/openssl,%{_pkgdocdir}}
 
 %make_install
 
@@ -156,15 +156,16 @@
 # define OPENSSL_NO_SSL3\
 #endif' $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h
 
+basearch=%{_arch}
+%ifarch %{ix86}
+basearch=i386
+%endif
+
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/*.dist
 
 %check
 LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 export LD_LIBRARY_PATH
-crypto/fips/fips_standalone_hmac libcrypto.so.%{soversion} >.libcrypto.so.%{soversion}.hmac
-ln -s .libcrypto.so.%{soversion}.hmac .libcrypto.so.hmac
-crypto/fips/fips_standalone_hmac libssl.so.%{soversion} >.libssl.so.%{soversion}.hmac
-ln -s .libssl.so.%{soversion}.hmac .libssl.so.hmac
 OPENSSL_ENABLE_MD5_VERIFY=
 export OPENSSL_ENABLE_MD5_VERIFY
 OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file
@@ -176,49 +177,50 @@
 %postun libs -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%license LICENSE
-%doc AUTHORS CHANGES FAQ NEWS README
-%{_pkgdocdir}/Makefile.certificate
+%license LICENSE.txt
+%doc NEWS.md README.md
 %{_bindir}/openssl
+%{_pkgdocdir}/Makefile.certificate
 
 %files libs
-%defattr(-,root,root)
-%license LICENSE
+%license LICENSE.txt
 %dir %{_sysconfdir}/pki/tls
 %dir %{_sysconfdir}/pki/tls/certs
 %dir %{_sysconfdir}/pki/tls/misc
 %dir %{_sysconfdir}/pki/tls/private
 %config(noreplace) %{_sysconfdir}/pki/tls/openssl.cnf
 %config(noreplace) %{_sysconfdir}/pki/tls/ct_log_list.cnf
-%{_libdir}/libcrypto.so.%{version}
+%config(noreplace) %{_sysconfdir}/pki/tls/fipsmodule.cnf
+%attr(0755,root,root) %{_libdir}/libcrypto.so.%{version}
 %{_libdir}/libcrypto.so.%{soversion}

_service:tar_scm:Backport-Add-documents-for-SM2-cert-verification.patch Deleted

@@ -1,108 +0,0 @@
-From 400e9ffc906d66318e4f9364494809d5a519c718 Mon Sep 17 00:00:00 2001
-From: Paul Yang <yang.yang@baishancloud.com>
-Date: Wed, 13 Mar 2019 17:22:31 +0800
-Subject: PATCH 06/15 Add documents for SM2 cert verification
-
-This follows #8321 which added the SM2 certificate verification feature.
-This commit adds the related docs - the newly added 2 APIs and options
-in apps/verify.
-
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-(Merged from https://github.com/openssl/openssl/pull/8465)
----
- doc/man1/verify.pod           | 14 ++++++++++++
- doc/man3/X509_get0_sm2_id.pod | 43 +++++++++++++++++++++++++++++++++++
- 2 files changed, 57 insertions(+)
- create mode 100644 doc/man3/X509_get0_sm2_id.pod
-
-diff --git a/doc/man1/verify.pod b/doc/man1/verify.pod
-index da2b702..a6b6b2b 100644
---- a/doc/man1/verify.pod
-+++ b/doc/man1/verify.pod
-@@ -50,6 +50,8 @@ B<openssl> B<verify>
- B<-verify_name name>
- B<-x509_strict>
- B<-show_chain>
-+B<-sm2-id string>
-+B<-sm2-hex-id hex-string>
- B<->
- certificates
- 
-@@ -319,6 +321,16 @@ Display information about the certificate chain that has been built (if
- successful). Certificates in the chain that came from the untrusted list will be
- flagged as "untrusted".
- 
-+=item B<-sm2-id>
-+
-+Specify the ID string to use when verifying an SM2 certificate. The ID string is
-+required by the SM2 signature algorithm for signing and verification.
-+
-+=item B<-sm2-hex-id>
-+
-+Specify a binary ID string to use when signing or verifying using an SM2
-+certificate. The argument for this option is string of hexadecimal digits.
-+
- =item B<->
- 
- Indicates the last option. All arguments following this are assumed to be
-@@ -774,6 +786,8 @@ The B<-show_chain> option was added in OpenSSL 1.1.0.
- The B<-issuer_checks> option is deprecated as of OpenSSL 1.1.0 and
- is silently ignored.
- 
-+The B<-sm2-id> and B<-sm2-hex-id> options were added in OpenSSL 3.0.0.
-+
- =head1 COPYRIGHT
- 
- Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
-diff --git a/doc/man3/X509_get0_sm2_id.pod b/doc/man3/X509_get0_sm2_id.pod
-new file mode 100644
-index 0000000..84da71e
---- /dev/null
-+++ b/doc/man3/X509_get0_sm2_id.pod
-@@ -0,0 +1,43 @@
-+=pod
-+
-+=head1 NAME
-+
-+X509_get0_sm2_id, X509_set_sm2_id - get or set SM2 ID for certificate operations
-+
-+=head1 SYNOPSIS
-+
-+ #include <openssl/x509.h>
-+
-+ ASN1_OCTET_STRING *X509_get0_sm2_id(X509 *x);
-+ void X509_set_sm2_id(X509 *x, ASN1_OCTET_STRING *sm2_id);
-+
-+=head1 DESCRIPTION
-+
-+X509_get0_sm2_id() gets the ID value of an SM2 certificate B<x> by returning an
-+B<ASN1_OCTET_STRING> object which should not be freed by the caller.
-+X509_set_sm2_id() sets the B<sm2_id> value to an SM2 certificate B<x>.
-+
-+=head1 NOTES
-+
-+SM2 signature algorithm requires an ID value when generating and verifying a
-+signature. The functions described in this manual provide the user with the
-+ability to set and retrieve the SM2 ID value.
-+
-+=head1 RETURN VALUES
-+
-+X509_set_sm2_id() does not return a value.
-+
-+=head1 SEE ALSO
-+
-+L<X509_verify(3)>, L<SM2(7)>
-+
-+=head1 COPYRIGHT
-+
-+Copyright 2019 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
-+L<https://www.openssl.org/source/license.html>.
-+
-+=cut
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:Backport-Add-test-cases-for-SM2-cert-verification.patch Deleted

@@ -1,127 +0,0 @@
-From c08251384c0405c151a90b315b8f333c38c74eb2 Mon Sep 17 00:00:00 2001
-From: Paul Yang <yang.yang@baishancloud.com>
-Date: Wed, 13 Mar 2019 16:54:11 +0800
-Subject: PATCH 05/15 Add test cases for SM2 cert verification
-
-This follows #8321 which added the SM2 certificate verification feature.
-This commit adds some test cases for #8321.
-
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-(Merged from https://github.com/openssl/openssl/pull/8465)
----
- test/certs/sm2-ca-cert.pem      | 14 +++++++++++++
- test/certs/{sm2.crt => sm2.pem} |  0
- test/recipes/20-test_pkeyutl.t  | 37 +++++++++++++--------------------
- test/recipes/25-test_verify.t   | 14 ++++++++++++-
- 4 files changed, 42 insertions(+), 23 deletions(-)
- create mode 100644 test/certs/sm2-ca-cert.pem
- rename test/certs/{sm2.crt => sm2.pem} (100%)
-
-diff --git a/test/certs/sm2-ca-cert.pem b/test/certs/sm2-ca-cert.pem
-new file mode 100644
-index 0000000..5677ac6
---- /dev/null
-+++ b/test/certs/sm2-ca-cert.pem
-@@ -0,0 +1,14 @@
-+-----BEGIN CERTIFICATE-----
-+MIICJDCCAcqgAwIBAgIJAOlkpDpSrmVbMAoGCCqBHM9VAYN1MGgxCzAJBgNVBAYT
-+AkNOMQswCQYDVQQIDAJMTjERMA8GA1UEBwwIU2hlbnlhbmcxETAPBgNVBAoMCFRl
-+c3QgT3JnMRAwDgYDVQQLDAdUZXN0IE9VMRQwEgYDVQQDDAtUZXN0IFNNMiBDQTAe
-+Fw0xOTAyMTkwNzA1NDhaFw0yMzAzMzAwNzA1NDhaMGgxCzAJBgNVBAYTAkNOMQsw
-+CQYDVQQIDAJMTjERMA8GA1UEBwwIU2hlbnlhbmcxETAPBgNVBAoMCFRlc3QgT3Jn
-+MRAwDgYDVQQLDAdUZXN0IE9VMRQwEgYDVQQDDAtUZXN0IFNNMiBDQTBZMBMGByqG
-+SM49AgEGCCqBHM9VAYItA0IABHRYnqErofBdXPptvvO7+BSVJxcpHuTGnZ+UPrbU
-+5kVEUMaUnNOeMJZl/vRGimZCm/AkReJmRfnb15ESHR+ssp6jXTBbMB0GA1UdDgQW
-+BBTFjcWu/zJgSZ5SKUlU5Vx4/0W5dDAfBgNVHSMEGDAWgBTFjcWu/zJgSZ5SKUlU
-+5Vx4/0W5dDAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjAKBggqgRzPVQGDdQNI
-+ADBFAiEAs6byi1nSQtFELOw/2tQIv5AEsZFR5MJ/oB2ztXzs2LYCIEfIw4xlUH6X
-+YFhs4RnIa0K9Ng1ebsGPrifYkudwBIk3
-+-----END CERTIFICATE-----
-diff --git a/test/certs/sm2.crt b/test/certs/sm2.pem
-similarity index 100%
-rename from test/certs/sm2.crt
-rename to test/certs/sm2.pem
-diff --git a/test/recipes/20-test_pkeyutl.t b/test/recipes/20-test_pkeyutl.t
-index 1457530..a36d41e 100644
---- a/test/recipes/20-test_pkeyutl.t
-+++ b/test/recipes/20-test_pkeyutl.t
-@@ -17,32 +17,25 @@ setup("test_pkeyutl");
- 
- plan tests => 2;
- 
--sub sign
--{
--    # Utilize the sm2.crt as the TBS file
--    return run(app(( 'openssl', 'pkeyutl', '-sign',
--                      '-in', srctop_file('test', 'certs', 'sm2.crt'),
--                      '-inkey', srctop_file('test', 'certs', 'sm2.key'),
--                      '-out', 'signature.sm2', '-rawin',
--                      '-digest', 'sm3', '-pkeyopt', 'sm2_id:someid')));
--}
--
--sub verify
--{
--    # Utilize the sm2.crt as the TBS file
--    return run(app(( 'openssl', 'pkeyutl', '-verify', '-certin',
--                      '-in', srctop_file('test', 'certs', 'sm2.crt'),
--                      '-inkey', srctop_file('test', 'certs', 'sm2.crt'),
--                      '-sigfile', 'signature.sm2', '-rawin',
--                      '-digest', 'sm3', '-pkeyopt', 'sm2_id:someid')));
--}
-+# For the tests below we use the cert itself as the TBS file
- 
- SKIP: {
-     skip "Skipping tests that require EC, SM2 or SM3", 2
-         if disabled("ec") || disabled("sm2") || disabled("sm3");
- 
--    ok(sign, "Sign a piece of data using SM2");
--    ok(verify, "Verify an SM2 signature against a piece of data");
-+    # SM2
-+    ok(run(app(( 'openssl', 'pkeyutl', '-sign',
-+                      '-in', srctop_file('test', 'certs', 'sm2.pem'),
-+                      '-inkey', srctop_file('test', 'certs', 'sm2.key'),
-+                      '-out', 'signature.dat', '-rawin',
-+                      '-digest', 'sm3', '-pkeyopt', 'sm2_id:someid'))),
-+                      "Sign a piece of data using SM2");
-+    ok(run(app(( 'openssl', 'pkeyutl', '-verify', '-certin',
-+                      '-in', srctop_file('test', 'certs', 'sm2.pem'),
-+                      '-inkey', srctop_file('test', 'certs', 'sm2.pem'),
-+                      '-sigfile', 'signature.dat', '-rawin',
-+                      '-digest', 'sm3', '-pkeyopt', 'sm2_id:someid'))),
-+                      "Verify an SM2 signature against a piece of data");
- }
- 
--unlink 'signature.sm2';
-+unlink 'signature.dat';
-diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t
-index ffa48ed..b340833 100644
---- a/test/recipes/25-test_verify.t
-+++ b/test/recipes/25-test_verify.t
-@@ -27,7 +27,7 @@ sub verify {
-     run(app(@args));
- }
- 
--plan tests => 146;
-+plan tests => 148;
- 
- # Canonical success
- ok(verify("ee-cert", "sslserver", "root-cert", "ca-cert"),
-@@ -409,3 +409,15 @@ SKIP: {
-        "ED25519 signature");
- 
- }
-+
-+SKIP: {
-+    skip "SM2 is not supported by this OpenSSL build", 1
-+	      if disabled("sm2");
-+
-+   # Test '-sm2-id' and '-sm2-hex-id'  option
-+   ok(verify("sm2", "any", "sm2-ca-cert", , "-sm2-id", "1234567812345678"),
-+       "SM2 ID test");
-+   ok(verify("sm2", "any", "sm2-ca-cert", , "-sm2-hex-id",
-+             "31323334353637383132333435363738"),
-+       "SM2 hex ID test");
-+}
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:Backport-Apply-SM4-optimization-patch-to-Kunpeng-920.patch Added

@@ -0,0 +1,74 @@
+From 06f13f85ee86cd7fbc546060fbe2d077176b0be4 Mon Sep 17 00:00:00 2001
+From: Xu Yizhou <xuyizhou1@huawei.com>
+Date: Mon, 31 Oct 2022 11:28:15 +0800
+Subject: PATCH 11/13 Apply SM4 optimization patch to Kunpeng-920
+
+In the ideal scenario, performance can reach up to 2.2X.
+But in single block input or CFB/OFB mode, CBC encryption,
+performance could drop about 50%.
+
+Perf data on Kunpeng-920 2.6GHz hardware, before and after optimization:
+
+Before:
+type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes 16384 bytes
+SM4-CTR 75318.96k 79089.62k 79736.15k 79934.12k 80325.44k 80068.61k
+SM4-ECB 80211.39k 84998.36k 86472.28k 87024.93k 87144.80k 86862.51k
+SM4-GCM 72156.19k 82012.08k 83848.02k 84322.65k 85103.65k 84896.43k
+SM4-CBC 77956.13k 80638.81k 81976.17k 81606.31k 82078.91k 81750.70k
+SM4-CFB 78078.20k 81054.87k 81841.07k 82396.38k 82203.99k 82236.76k
+SM4-OFB 78282.76k 82074.03k 82765.74k 82989.06k 83200.68k 83487.17k
+
+After:
+type    16 bytes  64 bytes   256 bytes  1024 bytes 8192 bytes 16384 bytes
+SM4-CTR 35678.07k 120687.25k 176632.27k 177192.62k 177586.18k 178295.18k
+SM4-ECB 35540.32k 122628.07k 175067.90k 178007.84k 178298.88k 178328.92k
+SM4-GCM 34215.75k 116720.50k 170275.16k 171770.88k 172714.21k 172272.30k
+SM4-CBC 35645.60k 36544.86k  36515.50k  36732.15k  36618.24k  36629.16k
+SM4-CFB 35528.14k 35690.99k  35954.86k  35843.42k  35809.18k  35809.96k
+SM4-OFB 35563.55k 35853.56k  35963.05k  36203.52k  36233.85k  36307.82k
+
+Signed-off-by: Xu Yizhou <xuyizhou1@huawei.com>
+
+Reviewed-by: Hugo Landau <hlandau@openssl.org>
+Reviewed-by: Paul Dale <pauli@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/19547)
+---
+ crypto/arm_arch.h             | 4 ++++
+ include/crypto/sm4_platform.h | 3 ++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
+index 5b5af31d92..c10748e5f8 100644
+--- a/crypto/arm_arch.h
++++ b/crypto/arm_arch.h
+@@ -98,9 +98,13 @@ extern unsigned int OPENSSL_armv8_rsa_neonized;
+  */
+ 
+ # define ARM_CPU_IMP_ARM           0x41
++# define HISI_CPU_IMP              0x48
+ 
+ # define ARM_CPU_PART_CORTEX_A72   0xD08
+ # define ARM_CPU_PART_N1           0xD0C
++# define ARM_CPU_PART_V1           0xD40
++# define ARM_CPU_PART_N2           0xD49
++# define HISI_CPU_PART_KP920       0xD01
+ 
+ # define MIDR_PARTNUM_SHIFT       4
+ # define MIDR_PARTNUM_MASK        (0xfffU << MIDR_PARTNUM_SHIFT)
+diff --git a/include/crypto/sm4_platform.h b/include/crypto/sm4_platform.h
+index 11f9b9d88b..15d8abbcb1 100644
+--- a/include/crypto/sm4_platform.h
++++ b/include/crypto/sm4_platform.h
+@@ -20,7 +20,8 @@ static inline int vpsm4_capable(void)
+ {
+     return (OPENSSL_armcap_P & ARMV8_CPUID) &&
+             (MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) ||
+-             MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1));
++             MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1) ||
++             MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, HISI_CPU_IMP, HISI_CPU_PART_KP920));
+ }
+ #    if defined(VPSM4_ASM)
+ #     define VPSM4_CAPABLE vpsm4_capable()
+-- 
+2.37.3.windows.1
+

_service:tar_scm:Backport-CVE-2023-0464-x509-excessive-resource-use-verifying-policy-constra.patch Added

@@ -0,0 +1,221 @@
+From 959c59c7a0164117e7f8366466a32bb1f8d77ff1 Mon Sep 17 00:00:00 2001
+From: Pauli <pauli@openssl.org>
+Date: Wed, 8 Mar 2023 15:28:20 +1100
+Subject: PATCH x509: excessive resource use verifying policy constraints
+
+A security vulnerability has been identified in all supported versions
+of OpenSSL related to the verification of X.509 certificate chains
+that include policy constraints.  Attackers may be able to exploit this
+vulnerability by creating a malicious certificate chain that triggers
+exponential use of computational resources, leading to a denial-of-service
+(DoS) attack on affected systems.
+
+Fixes CVE-2023-0464
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/20568)
+---
+ crypto/x509/pcy_local.h |  8 +++++++-
+ crypto/x509/pcy_node.c  | 12 +++++++++---
+ crypto/x509/pcy_tree.c  | 36 ++++++++++++++++++++++++++----------
+ 3 files changed, 42 insertions(+), 14 deletions(-)
+
+diff --git a/crypto/x509/pcy_local.h b/crypto/x509/pcy_local.h
+index 18b53cc09e..cba107ca03 100644
+--- a/crypto/x509/pcy_local.h
++++ b/crypto/x509/pcy_local.h
+@@ -111,6 +111,11 @@ struct X509_POLICY_LEVEL_st {
+ };
+ 
+ struct X509_POLICY_TREE_st {
++    /* The number of nodes in the tree */
++    size_t node_count;
++    /* The maximum number of nodes in the tree */
++    size_t node_maximum;
++
+     /* This is the tree 'level' data */
+     X509_POLICY_LEVEL *levels;
+     int nlevel;
+@@ -157,7 +162,8 @@ X509_POLICY_NODE *ossl_policy_tree_find_sk(STACK_OF(X509_POLICY_NODE) *sk,
+ X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
+                                              X509_POLICY_DATA *data,
+                                              X509_POLICY_NODE *parent,
+-                                             X509_POLICY_TREE *tree);
++                                             X509_POLICY_TREE *tree,
++                                             int extra_data);
+ void ossl_policy_node_free(X509_POLICY_NODE *node);
+ int ossl_policy_node_match(const X509_POLICY_LEVEL *lvl,
+                            const X509_POLICY_NODE *node, const ASN1_OBJECT *oid);
+diff --git a/crypto/x509/pcy_node.c b/crypto/x509/pcy_node.c
+index 9d9a7ea179..450f95a655 100644
+--- a/crypto/x509/pcy_node.c
++++ b/crypto/x509/pcy_node.c
+@@ -59,10 +59,15 @@ X509_POLICY_NODE *ossl_policy_level_find_node(const X509_POLICY_LEVEL *level,
+ X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
+                                              X509_POLICY_DATA *data,
+                                              X509_POLICY_NODE *parent,
+-                                             X509_POLICY_TREE *tree)
++                                             X509_POLICY_TREE *tree,
++                                             int extra_data)
+ {
+     X509_POLICY_NODE *node;
+ 
++    /* Verify that the tree isn't too large.  This mitigates CVE-2023-0464 */
++    if (tree->node_maximum > 0 && tree->node_count >= tree->node_maximum)
++        return NULL;
++
+     node = OPENSSL_zalloc(sizeof(*node));
+     if (node == NULL) {
+         ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE);
+@@ -70,7 +75,7 @@ X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
+     }
+     node->data = data;
+     node->parent = parent;
+-    if (level) {
++    if (level != NULL) {
+         if (OBJ_obj2nid(data->valid_policy) == NID_any_policy) {
+             if (level->anyPolicy)
+                 goto node_error;
+@@ -90,7 +95,7 @@ X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
+         }
+     }
+ 
+-    if (tree) {
++    if (extra_data) {
+         if (tree->extra_data == NULL)
+             tree->extra_data = sk_X509_POLICY_DATA_new_null();
+         if (tree->extra_data == NULL){
+@@ -103,6 +108,7 @@ X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
+         }
+     }
+ 
++    tree->node_count++;
+     if (parent)
+         parent->nchild++;
+ 
+diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c
+index fa45da5117..f953a05a41 100644
+--- a/crypto/x509/pcy_tree.c
++++ b/crypto/x509/pcy_tree.c
+@@ -14,6 +14,17 @@
+ 
+ #include "pcy_local.h"
+ 
++/*
++ * If the maximum number of nodes in the policy tree isn't defined, set it to
++ * a generous default of 1000 nodes.
++ *
++ * Defining this to be zero means unlimited policy tree growth which opens the
++ * door on CVE-2023-0464.
++ */
++#ifndef OPENSSL_POLICY_TREE_NODES_MAX
++# define OPENSSL_POLICY_TREE_NODES_MAX 1000
++#endif
++
+ static void expected_print(BIO *channel,
+                            X509_POLICY_LEVEL *lev, X509_POLICY_NODE *node,
+                            int indent)
+@@ -163,6 +174,9 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
+         return X509_PCY_TREE_INTERNAL;
+     }
+ 
++    /* Limit the growth of the tree to mitigate CVE-2023-0464 */
++    tree->node_maximum = OPENSSL_POLICY_TREE_NODES_MAX;
++
+     /*
+      * http://tools.ietf.org/html/rfc5280#section-6.1.2, figure 3.
+      *
+@@ -180,7 +194,7 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
+     if ((data = ossl_policy_data_new(NULL,
+                                      OBJ_nid2obj(NID_any_policy), 0)) == NULL)
+         goto bad_tree;
+-    if (ossl_policy_level_add_node(level, data, NULL, tree) == NULL) {
++    if (ossl_policy_level_add_node(level, data, NULL, tree, 1) == NULL) {
+         ossl_policy_data_free(data);
+         goto bad_tree;
+     }
+@@ -239,7 +253,8 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
+  * Return value: 1 on success, 0 otherwise
+  */
+ static int tree_link_matching_nodes(X509_POLICY_LEVEL *curr,
+-                                    X509_POLICY_DATA *data)
++                                    X509_POLICY_DATA *data,
++                                    X509_POLICY_TREE *tree)
+ {
+     X509_POLICY_LEVEL *last = curr - 1;
+     int i, matched = 0;
+@@ -249,13 +264,13 @@ static int tree_link_matching_nodes(X509_POLICY_LEVEL *curr,
+         X509_POLICY_NODE *node = sk_X509_POLICY_NODE_value(last->nodes, i);
+ 
+         if (ossl_policy_node_match(last, node, data->valid_policy)) {
+-            if (ossl_policy_level_add_node(curr, data, node, NULL) == NULL)
++            if (ossl_policy_level_add_node(curr, data, node, tree, 0) == NULL)
+                 return 0;
+             matched = 1;
+         }
+     }
+     if (!matched && last->anyPolicy) {
+-        if (ossl_policy_level_add_node(curr, data, last->anyPolicy, NULL) == NULL)
++        if (ossl_policy_level_add_node(curr, data, last->anyPolicy, tree, 0) == NULL)
+             return 0;
+     }
+     return 1;
+@@ -268,7 +283,8 @@ static int tree_link_matching_nodes(X509_POLICY_LEVEL *curr,
+  * Return value: 1 on success, 0 otherwise.
+  */
+ static int tree_link_nodes(X509_POLICY_LEVEL *curr,
+-                           const X509_POLICY_CACHE *cache)
++                           const X509_POLICY_CACHE *cache,
++                           X509_POLICY_TREE *tree)
+ {
+     int i;
+ 
+@@ -276,7 +292,7 @@ static int tree_link_nodes(X509_POLICY_LEVEL *curr,
+         X509_POLICY_DATA *data = sk_X509_POLICY_DATA_value(cache->data, i);
+ 
+         /* Look for matching nodes in previous level */
+-        if (!tree_link_matching_nodes(curr, data))
++        if (!tree_link_matching_nodes(curr, data, tree))
+             return 0;
+     }
+     return 1;
+@@ -307,7 +323,7 @@ static int tree_add_unmatched(X509_POLICY_LEVEL *curr,
+     /* Curr may not have anyPolicy */
+     data->qualifier_set = cache->anyPolicy->qualifier_set;
+     data->flags |= POLICY_DATA_FLAG_SHARED_QUALIFIERS;
+-    if (ossl_policy_level_add_node(curr, data, node, tree) == NULL) {
++    if (ossl_policy_level_add_node(curr, data, node, tree, 1) == NULL) {
+         ossl_policy_data_free(data);
+         return 0;
+     }
+@@ -370,7 +386,7 @@ static int tree_link_any(X509_POLICY_LEVEL *curr,
+     /* Finally add link to anyPolicy */
+     if (last->anyPolicy &&
+             ossl_policy_level_add_node(curr, cache->anyPolicy,
+-                                       last->anyPolicy, NULL) == NULL)
++                                       last->anyPolicy, tree, 0) == NULL)
+         return 0;
+     return 1;

_service:tar_scm:Backport-Fix-SM4-CBC-regression-on-Armv8.patch Added

@@ -0,0 +1,60 @@
+From d7d5490d7201dcfb1f3811ad1bfc57ed9b2c0b77 Mon Sep 17 00:00:00 2001
+From: "fangming.fang" <fangming.fang@arm.com>
+Date: Thu, 8 Dec 2022 10:46:27 +0000
+Subject: PATCH 09/13 Fix SM4-CBC regression on Armv8
+
+Fixes #19858
+
+During decryption, the last ciphertext is not fed to next block
+correctly when the number of input blocks is exactly 4. Fix this
+and add the corresponding test cases.
+
+Thanks xu-yi-zhou for reporting this issue and proposing the fix.
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Paul Dale <pauli@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/19872)
+---
+ crypto/sm4/asm/vpsm4-armv8.pl                 |  2 +-
+ test/recipes/30-test_evp_data/evpciph_sm4.txt | 12 ++++++++++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/crypto/sm4/asm/vpsm4-armv8.pl b/crypto/sm4/asm/vpsm4-armv8.pl
+index 095d9dae64..c842ef61d5 100755
+--- a/crypto/sm4/asm/vpsm4-armv8.pl
++++ b/crypto/sm4/asm/vpsm4-armv8.pl
+@@ -880,7 +880,7 @@ $code.=<<___;
+ 	subs	$blocks,$blocks,#4
+ 	b.gt	.Lcbc_4_blocks_dec
+ 	// save back IV
+-	st1	{@vtmp3.16b}, $ivp
++	st1	{@data3.16b}, $ivp
+ 	b	100f
+ 1:	// last block
+ 	subs	$blocks,$blocks,#1
+diff --git a/test/recipes/30-test_evp_data/evpciph_sm4.txt b/test/recipes/30-test_evp_data/evpciph_sm4.txt
+index 9fb16ca15c..e9a98c9898 100644
+--- a/test/recipes/30-test_evp_data/evpciph_sm4.txt
++++ b/test/recipes/30-test_evp_data/evpciph_sm4.txt
+@@ -19,6 +19,18 @@ IV  = 0123456789ABCDEFFEDCBA9876543210
+ Plaintext = 0123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA9876543210
+ Ciphertext = 2677F46B09C122CC975533105BD4A22AF6125F7275CE552C3A2BBCF533DE8A3B
+ 
++Cipher = SM4-CBC
++Key = 0123456789ABCDEFFEDCBA9876543210
++IV  = 0123456789ABCDEFFEDCBA9876543210
++Plaintext = 0123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA9876543210
++Ciphertext = 2677F46B09C122CC975533105BD4A22AF6125F7275CE552C3A2BBCF533DE8A3BFFF5A4F208092C0901BA02D5772977369915E3FA2356C9F4EB6460ECC457E7f8E3CFA3DEEBFE9883E3A48BCF7C4A11AA3EC9E0D317C5D319BE72A5CDDDEC640C
++
++Cipher = SM4-CBC
++Key = 0123456789ABCDEFFEDCBA9876543210
++IV  = 0123456789ABCDEFFEDCBA9876543210
++Plaintext = 0123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA98765432100123456789ABCDEFFEDCBA9876543210
++Ciphertext = 2677f46b09c122cc975533105bd4a22af6125f7275ce552c3a2bbcf533de8a3bfff5a4f208092c0901ba02d5772977369915e3fa2356c9f4eb6460ecc457e7f8e3cfa3deebfe9883e3a48bcf7c4a11aa3ec9e0d317c5d319be72a5cdddec640c6fc70bfa3ddaafffdd7c09b2774dcb2cec29f0c6f0b6773e985b3e395e924238505a8f120d9ca84de5c3cf7e45f097b14b3a46c5b1068669982a5c1f5f61be291b984f331d44ffb2758f771672448fc957fa1416c446427a41e25d5524a2418b9d96b2f17582f0f1aa9c204c6807f54f7b6833c5f00856659ddabc245936868c
++
+ Cipher = SM4-OFB
+ Key = 0123456789ABCDEFFEDCBA9876543210
+ IV  = 0123456789ABCDEFFEDCBA9876543210
+-- 
+2.37.3.windows.1
+

_service:tar_scm:Backport-Fix-SM4-XTS-build-failure-on-Mac-mini-M1.patch Added

@@ -0,0 +1,87 @@
+From 6df7707fb22e8bd1c7d778a2041c1403f9852060 Mon Sep 17 00:00:00 2001
+From: Xu Yizhou <xuyizhou1@huawei.com>
+Date: Fri, 3 Feb 2023 15:59:59 +0800
+Subject: PATCH 13/13 Fix SM4-XTS build failure on Mac mini M1
+
+Reviewed-by: Paul Dale <pauli@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/20202)
+---
+ crypto/sm4/asm/vpsm4-armv8.pl    |  4 +++-
+ crypto/sm4/asm/vpsm4_ex-armv8.pl | 23 ++++++++++++++++-------
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/crypto/sm4/asm/vpsm4-armv8.pl b/crypto/sm4/asm/vpsm4-armv8.pl
+index e19de30901..d30e78f3ce 100755
+--- a/crypto/sm4/asm/vpsm4-armv8.pl
++++ b/crypto/sm4/asm/vpsm4-armv8.pl
+@@ -524,7 +524,7 @@ sub compute_tweak_vec() {
+ 	my $std = shift;
+ 	&rbit(@vtmp2,$src,$std);
+ $code.=<<___;
+-	ldr  @qtmp0, =0x01010101010101010101010101010187
++	ldr  @qtmp0, .Lxts_magic
+ 	shl  $des.16b, @vtmp2.16b, #1
+ 	ext  @vtmp1.16b, @vtmp2.16b, @vtmp2.16b,#15
+ 	ushr @vtmp1.16b, @vtmp1.16b, #7
+@@ -572,6 +572,8 @@ _vpsm4_consts:
+ 	.dword 0x56aa3350a3b1bac6,0xb27022dc677d9197
+ .Lshuffles:
+ 	.dword 0x0B0A090807060504,0x030201000F0E0D0C
++.Lxts_magic:
++	.dword 0x0101010101010187,0x0101010101010101
+ 
+ .size	_vpsm4_consts,.-_vpsm4_consts
+ ___
+diff --git a/crypto/sm4/asm/vpsm4_ex-armv8.pl b/crypto/sm4/asm/vpsm4_ex-armv8.pl
+index 3d094aa535..f2d5b6debf 100644
+--- a/crypto/sm4/asm/vpsm4_ex-armv8.pl
++++ b/crypto/sm4/asm/vpsm4_ex-armv8.pl
+@@ -475,12 +475,12 @@ sub load_sbox () {
+ 	my $data = shift;
+ 
+ $code.=<<___;
+-	ldr $MaskQ,	   =0x0306090c0f0205080b0e0104070a0d00
+-	ldr $TAHMatQ,	=0x22581a6002783a4062185a2042387a00
+-	ldr $TALMatQ,	=0xc10bb67c4a803df715df62a89e54e923
+-	ldr $ATAHMatQ,   =0x1407c6d56c7fbeadb9aa6b78c1d21300
+-	ldr $ATALMatQ,   =0xe383c1a1fe9edcbc6404462679195b3b
+-	ldr $ANDMaskQ,	=0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
++	ldr $MaskQ, .Lsbox_magic
++	ldr $TAHMatQ, .Lsbox_magic+16
++	ldr $TALMatQ, .Lsbox_magic+32
++	ldr $ATAHMatQ, .Lsbox_magic+48
++	ldr $ATALMatQ, .Lsbox_magic+64
++	ldr $ANDMaskQ, .Lsbox_magic+80
+ ___
+ }
+ 
+@@ -525,7 +525,7 @@ sub compute_tweak_vec() {
+ 	my $std = shift;
+ 	&rbit(@vtmp2,$src,$std);
+ $code.=<<___;
+-	ldr  @qtmp0, =0x01010101010101010101010101010187
++	ldr  @qtmp0, .Lxts_magic
+ 	shl  $des.16b, @vtmp2.16b, #1
+ 	ext  @vtmp1.16b, @vtmp2.16b, @vtmp2.16b,#15
+ 	ushr @vtmp1.16b, @vtmp1.16b, #7
+@@ -556,6 +556,15 @@ _${prefix}_consts:
+ 	.dword 0x56aa3350a3b1bac6,0xb27022dc677d9197
+ .Lshuffles:
+ 	.dword 0x0B0A090807060504,0x030201000F0E0D0C
++.Lxts_magic:
++	.dword 0x0101010101010187,0x0101010101010101
++.Lsbox_magic:
++	.dword 0x0b0e0104070a0d00,0x0306090c0f020508
++	.dword 0x62185a2042387a00,0x22581a6002783a40
++	.dword 0x15df62a89e54e923,0xc10bb67c4a803df7
++	.dword 0xb9aa6b78c1d21300,0x1407c6d56c7fbead
++	.dword 0x6404462679195b3b,0xe383c1a1fe9edcbc
++	.dword 0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f
+ 
+ .size	_${prefix}_consts,.-_${prefix}_consts
+ ___
+-- 
+2.37.3.windows.1
+

_service:tar_scm:Backport-Fix-SM4-test-failures-on-big-endian-ARM-processors.patch Added

@@ -0,0 +1,207 @@
+From b8f24cb95dbe70cbeef08b41f35018141b6ce994 Mon Sep 17 00:00:00 2001
+From: Xu Yizhou <xuyizhou1@huawei.com>
+Date: Thu, 15 Dec 2022 10:21:07 +0800
+Subject: PATCH 10/13 Fix SM4 test failures on big-endian ARM processors
+
+Signed-off-by: Xu Yizhou <xuyizhou1@huawei.com>
+
+Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/19910)
+---
+ crypto/sm4/asm/vpsm4-armv8.pl | 52 +++++++++++++++++------------------
+ 1 file changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/crypto/sm4/asm/vpsm4-armv8.pl b/crypto/sm4/asm/vpsm4-armv8.pl
+index c842ef61d5..73797af582 100755
+--- a/crypto/sm4/asm/vpsm4-armv8.pl
++++ b/crypto/sm4/asm/vpsm4-armv8.pl
+@@ -45,7 +45,7 @@ sub rev32() {
+ 
+ 	if ($src and ("$src" ne "$dst")) {
+ $code.=<<___;
+-#ifndef __ARMEB__
++#ifndef __AARCH64EB__
+ 	rev32	$dst.16b,$src.16b
+ #else
+ 	mov	$dst.16b,$src.16b
+@@ -53,7 +53,7 @@ $code.=<<___;
+ ___
+ 	} else {
+ $code.=<<___;
+-#ifndef __ARMEB__
++#ifndef __AARCH64EB__
+ 	rev32	$dst.16b,$dst.16b
+ #endif
+ ___
+@@ -428,10 +428,10 @@ sub load_sbox () {
+ 
+ $code.=<<___;
+ 	adr	$ptr,.Lsbox
+-	ld1	{@sbox0.4s,@sbox1.4s,@sbox2.4s,@sbox3.4s},$ptr,#64
+-	ld1	{@sbox4.4s,@sbox5.4s,@sbox6.4s,@sbox7.4s},$ptr,#64
+-	ld1	{@sbox8.4s,@sbox9.4s,@sbox10.4s,@sbox11.4s},$ptr,#64
+-	ld1	{@sbox12.4s,@sbox13.4s,@sbox14.4s,@sbox15.4s},$ptr
++	ld1	{@sbox0.16b,@sbox1.16b,@sbox2.16b,@sbox3.16b},$ptr,#64
++	ld1	{@sbox4.16b,@sbox5.16b,@sbox6.16b,@sbox7.16b},$ptr,#64
++	ld1	{@sbox8.16b,@sbox9.16b,@sbox10.16b,@sbox11.16b},$ptr,#64
++	ld1	{@sbox12.16b,@sbox13.16b,@sbox14.16b,@sbox15.16b},$ptr
+ ___
+ }
+ 
+@@ -492,9 +492,9 @@ ___
+ 	&rev32($vkey,$vkey);
+ $code.=<<___;
+ 	adr	$pointer,.Lshuffles
+-	ld1	{$vmap.4s},$pointer
++	ld1	{$vmap.2d},$pointer
+ 	adr	$pointer,.Lfk
+-	ld1	{$vfk.4s},$pointer
++	ld1	{$vfk.2d},$pointer
+ 	eor	$vkey.16b,$vkey.16b,$vfk.16b
+ 	mov	$schedules,#32
+ 	adr	$pointer,.Lck
+@@ -615,7 +615,7 @@ $code.=<<___;
+ .align	5
+ ${prefix}_${dir}crypt:
+ 	AARCH64_VALID_CALL_TARGET
+-	ld1	{@data0.16b},$inp
++	ld1	{@data0.4s},$inp
+ ___
+ 	&load_sbox();
+ 	&rev32(@data0,@data0);
+@@ -624,7 +624,7 @@ $code.=<<___;
+ ___
+ 	&encrypt_1blk(@data0);
+ $code.=<<___;
+-	st1	{@data0.16b},$outp
++	st1	{@data0.4s},$outp
+ 	ret
+ .size	${prefix}_${dir}crypt,.-${prefix}_${dir}crypt
+ ___
+@@ -692,12 +692,12 @@ $code.=<<___;
+ 	cmp	$blocks,#1
+ 	b.lt	100f
+ 	b.gt	1f
+-	ld1	{@data0.16b},$inp
++	ld1	{@data0.4s},$inp
+ ___
+ 	&rev32(@data0,@data0);
+ 	&encrypt_1blk(@data0);
+ $code.=<<___;
+-	st1	{@data0.16b},$outp
++	st1	{@data0.4s},$outp
+ 	b	100f
+ 1:	// process last 2 blocks
+ 	ld4	{@data0.s,@data1.s,@data2.s,@data3.s}0,$inp,#16
+@@ -798,11 +798,11 @@ ___
+ 	&rev32($ivec0,$ivec0);
+ 	&encrypt_1blk($ivec0);
+ $code.=<<___;
+-	st1	{$ivec0.16b},$outp,#16
++	st1	{$ivec0.4s},$outp,#16
+ 	b	1b
+ 2:
+ 	// save back IV
+-	st1	{$ivec0.16b},$ivp
++	st1	{$ivec0.4s},$ivp
+ 	ret
+ 
+ .Ldec:
+@@ -834,7 +834,7 @@ ___
+ 	&transpose(@vtmp,@datax);
+ 	&transpose(@data,@datax);
+ $code.=<<___;
+-	ld1	{$ivec1.16b},$ivp
++	ld1	{$ivec1.4s},$ivp
+ 	ld1	{@datax0.4s,@datax1.4s,@datax2.4s,@datax3.4s},$inp,#64
+ 	// note ivec1 and vtmpx3 are resuing the same register
+ 	// care needs to be taken to avoid conflict
+@@ -844,7 +844,7 @@ $code.=<<___;
+ 	eor	@vtmp2.16b,@vtmp2.16b,@datax1.16b
+ 	eor	@vtmp3.16b,$vtmp3.16b,@datax2.16b
+ 	// save back IV
+-	st1	{$vtmpx3.16b}, $ivp
++	st1	{$vtmpx3.4s}, $ivp
+ 	eor	@data0.16b,@data0.16b,$datax3.16b
+ 	eor	@data1.16b,@data1.16b,@vtmpx0.16b
+ 	eor	@data2.16b,@data2.16b,@vtmpx1.16b
+@@ -855,7 +855,7 @@ $code.=<<___;
+ 	b.gt	.Lcbc_8_blocks_dec
+ 	b.eq	100f
+ 1:
+-	ld1	{$ivec1.16b},$ivp
++	ld1	{$ivec1.4s},$ivp
+ .Lcbc_4_blocks_dec:
+ 	cmp	$blocks,#4
+ 	b.lt	1f
+@@ -880,7 +880,7 @@ $code.=<<___;
+ 	subs	$blocks,$blocks,#4
+ 	b.gt	.Lcbc_4_blocks_dec
+ 	// save back IV
+-	st1	{@data3.16b}, $ivp
++	st1	{@data3.4s}, $ivp
+ 	b	100f
+ 1:	// last block
+ 	subs	$blocks,$blocks,#1
+@@ -888,13 +888,13 @@ $code.=<<___;
+ 	b.gt	1f
+ 	ld1	{@data0.4s},$inp,#16
+ 	// save back IV
+-	st1	{$data0.16b}, $ivp
++	st1	{$data0.4s}, $ivp
+ ___
+ 	&rev32(@datax0,@data0);
+ 	&encrypt_1blk(@datax0);
+ $code.=<<___;
+ 	eor	@datax0.16b,@datax0.16b,$ivec1.16b
+-	st1	{@datax0.16b},$outp,#16
++	st1	{@datax0.4s},$outp,#16
+ 	b	100f
+ 1:	// last two blocks
+ 	ld4	{@data0.s,@data1.s,@data2.s,@data3.s}0,$inp
+@@ -917,7 +917,7 @@ $code.=<<___;
+ 	eor	@vtmp1.16b,@vtmp1.16b,@data0.16b
+ 	st1	{@vtmp0.4s,@vtmp1.4s},$outp,#32
+ 	// save back IV
+-	st1	{@data1.16b}, $ivp
++	st1	{@data1.4s}, $ivp
+ 	b	100f
+ 1:	// last 3 blocks
+ 	ld4	{@data0.s,@data1.s,@data2.s,@data3.s}2,$ptr
+@@ -937,7 +937,7 @@ $code.=<<___;
+ 	eor	@vtmp2.16b,@vtmp2.16b,@data1.16b
+ 	st1	{@vtmp0.4s,@vtmp1.4s,@vtmp2.4s},$outp,#48
+ 	// save back IV
+-	st1	{@data2.16b}, $ivp
++	st1	{@data2.4s}, $ivp
+ 100:
+ 	ldp	d10,d11,sp,#16
+ 	ldp	d12,d13,sp,#32
+@@ -973,9 +973,9 @@ $code.=<<___;
+ ___
+ 	&encrypt_1blk($ivec);
+ $code.=<<___;
+-	ld1	{@data0.16b},$inp
++	ld1	{@data0.4s},$inp
+ 	eor	@data0.16b,@data0.16b,$ivec.16b
+-	st1	{@data0.16b},$outp
++	st1	{@data0.4s},$outp
+ 	ret
+ 1:
+ 	AARCH64_SIGN_LINK_REGISTER
+@@ -1053,9 +1053,9 @@ $code.=<<___;
+ ___
+ 	&encrypt_1blk($ivec);
+ $code.=<<___;
+-	ld1	{@data0.16b},$inp
++	ld1	{@data0.4s},$inp
+ 	eor	@data0.16b,@data0.16b,$ivec.16b

_service:tar_scm:Backport-Fix-a-document-description-in-apps-req.patch Deleted

@@ -1,29 +0,0 @@
-From 7e64be50900c4aa8cd040c4e3999540883bdeeb6 Mon Sep 17 00:00:00 2001
-From: Paul Yang <kaishen.yy@antfin.com>
-Date: Thu, 26 Sep 2019 10:57:23 +0800
-Subject: PATCH 13/15 Fix a document description in apps/req
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/9958)
----
- doc/man1/req.pod | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/man1/req.pod b/doc/man1/req.pod
-index 7b00bad..e117ec6 100644
---- a/doc/man1/req.pod
-+++ b/doc/man1/req.pod
-@@ -348,8 +348,8 @@ string is required by the SM2 signature algorithm for signing and verification.
- 
- =item B<-sm2-hex-id>
- 
--Specify a binary ID string to use when signing or verifying using an SM2
--certificate. The argument for this option is string of hexadecimal digits.
-+Specify a binary ID string to use when verifying an SM2 certificate request. The
-+argument for this option is string of hexadecimal digits.
- 
- =back
- 
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:Backport-Fix-a-double-free-issue-when-signing-SM2-cert.patch Deleted

@@ -1,121 +0,0 @@
-From a63238684c1d2e15f417f766f44418a8b52ef383 Mon Sep 17 00:00:00 2001
-From: Paul Yang <kaishen.yy@antfin.com>
-Date: Sat, 21 Sep 2019 00:32:57 +0800
-Subject: PATCH 12/15 Fix a double free issue when signing SM2 cert
-
-If the SM2 ID value has not been passed correctly when signing an SM2
-certificate/certificate request, a double free occurs. For instance:
-
-  openssl req -x509 ... -sm2-id 1234567812345678
-
-The '-sm2-id' should not be used in this scenario, while the '-sigopt' is
-the correct one to use. Documentation has also been updated to make the
-options more clear.
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/9958)
----
- apps/req.c       | 48 ++++++++++++++++++++++++++++++------------------
- doc/man1/req.pod |  4 ++--
- 2 files changed, 32 insertions(+), 20 deletions(-)
-
-diff --git a/apps/req.c b/apps/req.c
-index 96f1edd..95dd0e4 100644
---- a/apps/req.c
-+++ b/apps/req.c
-@@ -1756,15 +1756,19 @@ int do_X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
- #endif
- 
-     rv = do_sign_init(mctx, pkey, md, sigopts);
--    if (rv > 0)
-+    if (rv > 0) {
-         rv = X509_sign_ctx(x, mctx);
- #ifndef OPENSSL_NO_SM2
--    /* only in SM2 case we need to free the pctx explicitly */
--    if (ec_pkey_is_sm2(pkey)) {
--        pctx = EVP_MD_CTX_pkey_ctx(mctx);
--        EVP_PKEY_CTX_free(pctx);
--    }
-+        /*
-+         * only in SM2 case we need to free the pctx explicitly
-+         * if do_sign_init() fails, pctx is already freed in it
-+         */
-+        if (ec_pkey_is_sm2(pkey)) {
-+            pctx = EVP_MD_CTX_pkey_ctx(mctx);
-+            EVP_PKEY_CTX_free(pctx);
-+        }
- #endif
-+    }
-     EVP_MD_CTX_free(mctx);
-     return rv > 0 ? 1 : 0;
- }
-@@ -1779,15 +1783,19 @@ int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
- #endif
- 
-     rv = do_sign_init(mctx, pkey, md, sigopts);
--    if (rv > 0)
-+    if (rv > 0) {
-         rv = X509_REQ_sign_ctx(x, mctx);
- #ifndef OPENSSL_NO_SM2
--    /* only in SM2 case we need to free the pctx explicitly */
--    if (ec_pkey_is_sm2(pkey)) {
--        pctx = EVP_MD_CTX_pkey_ctx(mctx);
--        EVP_PKEY_CTX_free(pctx);
--    }
-+        /*
-+         * only in SM2 case we need to free the pctx explicitly
-+         * if do_sign_init() fails, pctx is already freed in it
-+         */
-+        if (ec_pkey_is_sm2(pkey)) {
-+            pctx = EVP_MD_CTX_pkey_ctx(mctx);
-+            EVP_PKEY_CTX_free(pctx);
-+        }
- #endif
-+    }
-     EVP_MD_CTX_free(mctx);
-     return rv > 0 ? 1 : 0;
- }
-@@ -1802,15 +1810,19 @@ int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
- #endif
- 
-     rv = do_sign_init(mctx, pkey, md, sigopts);
--    if (rv > 0)
-+    if (rv > 0) {
-         rv = X509_CRL_sign_ctx(x, mctx);
- #ifndef OPENSSL_NO_SM2
--    /* only in SM2 case we need to free the pctx explicitly */
--    if (ec_pkey_is_sm2(pkey)) {
--        pctx = EVP_MD_CTX_pkey_ctx(mctx);
--        EVP_PKEY_CTX_free(pctx);
--    }
-+        /*
-+         * only in SM2 case we need to free the pctx explicitly
-+         * if do_sign_init() fails, no need to double free pctx
-+         */
-+        if (ec_pkey_is_sm2(pkey)) {
-+            pctx = EVP_MD_CTX_pkey_ctx(mctx);
-+            EVP_PKEY_CTX_free(pctx);
-+        }
- #endif
-+    }
-     EVP_MD_CTX_free(mctx);
-     return rv > 0 ? 1 : 0;
- }
-diff --git a/doc/man1/req.pod b/doc/man1/req.pod
-index 3b9fcc3..7b00bad 100644
---- a/doc/man1/req.pod
-+++ b/doc/man1/req.pod
-@@ -343,8 +343,8 @@ for key generation operations.
- 
- =item B<-sm2-id>
- 
--Specify the ID string to use when verifying an SM2 certificate. The ID string is
--required by the SM2 signature algorithm for signing and verification.
-+Specify the ID string to use when verifying an SM2 certificate request. The ID
-+string is required by the SM2 signature algorithm for signing and verification.
- 
- =item B<-sm2-hex-id>
- 
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:Backport-Fix-a-memleak-in-apps-verify.patch Deleted

@@ -1,43 +0,0 @@
-From 1c243548ef736329b08344ad9191803e5a93ec17 Mon Sep 17 00:00:00 2001
-From: Paul Yang <yang.yang@baishancloud.com>
-Date: Wed, 13 Mar 2019 18:04:05 +0800
-Subject: PATCH 07/15 Fix a memleak in apps/verify
-
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-(Merged from https://github.com/openssl/openssl/pull/8465)
----
- apps/verify.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/apps/verify.c b/apps/verify.c
-index 09b31cf..5052d80 100644
---- a/apps/verify.c
-+++ b/apps/verify.c
-@@ -80,6 +80,7 @@ int verify_main(int argc, char **argv)
-     OPTION_CHOICE o;
-     unsigned char *sm2_id = NULL;
-     size_t sm2_idlen = 0;
-+    int sm2_free = 0;
- 
-     if ((vpm = X509_VERIFY_PARAM_new()) == NULL)
-         goto end;
-@@ -174,6 +175,7 @@ int verify_main(int argc, char **argv)
-             break;
-         case OPT_SM2HEXID:
-             /* try to parse the input as hex string first */
-+            sm2_free = 1;
-             sm2_id = OPENSSL_hexstr2buf(opt_arg(), (long *)&sm2_idlen);
-             if (sm2_id == NULL) {
-                 BIO_printf(bio_err, "Invalid hex string input\n");
-@@ -216,6 +218,8 @@ int verify_main(int argc, char **argv)
-     }
- 
-  end:
-+    if (sm2_free)
-+        OPENSSL_free(sm2_id);
-     X509_VERIFY_PARAM_free(vpm);
-     X509_STORE_free(store);
-     sk_X509_pop_free(untrusted, X509_free);
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:Backport-Fix-no-ec-no-sm2-and-no-sm3.patch Deleted

@@ -1,67 +0,0 @@
-From 380cf570be1ded495141e16ceab7afb7f7c57ab7 Mon Sep 17 00:00:00 2001
-From: Matt Caswell <matt@openssl.org>
-Date: Thu, 28 Feb 2019 13:47:26 +0000
-Subject: PATCH 02/15 Fix no-ec, no-sm2 and no-sm3
-
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/8372)
----
- apps/pkeyutl.c                 | 11 +++++++----
- test/recipes/20-test_pkeyutl.t |  9 +++++++--
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
-index bca0464..1d3d57b 100644
---- a/apps/pkeyutl.c
-+++ b/apps/pkeyutl.c
-@@ -473,14 +473,16 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
-         }
-         ctx = EVP_PKEY_CTX_new_id(kdfnid, impl);
-     } else {
--        EC_KEY *eckey = NULL;
--        const EC_GROUP *group = NULL;
--        int nid;
--
-         if (pkey == NULL)
-             goto end;
-+
-+#ifndef OPENSSL_NO_EC
-         /* SM2 needs a special treatment */
-         if (EVP_PKEY_id(pkey) == EVP_PKEY_EC) {
-+            EC_KEY *eckey = NULL;
-+            const EC_GROUP *group = NULL;
-+            int nid;
-+
-             if ((eckey = EVP_PKEY_get0_EC_KEY(pkey)) == NULL
-                     || (group = EC_KEY_get0_group(eckey)) == NULL
-                     || (nid = EC_GROUP_get_curve_name(group)) == 0)
-@@ -488,6 +490,7 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
-             if (nid == NID_sm2)
-                 EVP_PKEY_set_alias_type(pkey, EVP_PKEY_SM2);
-         }
-+#endif
-         *pkeysize = EVP_PKEY_size(pkey);
-         ctx = EVP_PKEY_CTX_new(pkey, impl);
-         if (ppkey != NULL)
-diff --git a/test/recipes/20-test_pkeyutl.t b/test/recipes/20-test_pkeyutl.t
-index a051138..1457530 100644
---- a/test/recipes/20-test_pkeyutl.t
-+++ b/test/recipes/20-test_pkeyutl.t
-@@ -37,7 +37,12 @@ sub verify
-                       '-digest', 'sm3', '-pkeyopt', 'sm2_id:someid')));
- }
- 
--ok(sign, "Sign a piece of data using SM2");
--ok(verify, "Verify an SM2 signature against a piece of data");
-+SKIP: {
-+    skip "Skipping tests that require EC, SM2 or SM3", 2
-+        if disabled("ec") || disabled("sm2") || disabled("sm3");
-+
-+    ok(sign, "Sign a piece of data using SM2");
-+    ok(verify, "Verify an SM2 signature against a piece of data");
-+}
- 
- unlink 'signature.sm2';
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:Backport-Fix-sm3ss1-translation-issue-in-sm3-armv8.pl.patch Added

@@ -0,0 +1,67 @@
+From 8746fff8f096fa35c7157199917100aa7b547d7a Mon Sep 17 00:00:00 2001
+From: "fangming.fang" <fangming.fang@arm.com>
+Date: Tue, 18 Jan 2022 02:58:08 +0000
+Subject: PATCH 03/13 Fix sm3ss1 translation issue in sm3-armv8.pl
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Reviewed-by: Paul Dale <pauli@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/17542)
+---
+ crypto/sm3/asm/sm3-armv8.pl | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/crypto/sm3/asm/sm3-armv8.pl b/crypto/sm3/asm/sm3-armv8.pl
+index bb71b2eade..f0555fd3f2 100644
+--- a/crypto/sm3/asm/sm3-armv8.pl
++++ b/crypto/sm3/asm/sm3-armv8.pl
+@@ -109,7 +109,7 @@ ___
+ 
+ $code=<<___;
+ #include "arm_arch.h"
+-.arch	armv8.2-a+sm4
++.arch	armv8.2-a
+ .text
+ ___
+ 
+@@ -222,8 +222,8 @@ my %sm3partopcode = (
+ 	"sm3partw1"         =>   0xce60C000,
+         "sm3partw2"         =>   0xce60C400);
+ 
+-my %sm3sslopcode = (
+-	"sm3ssl"            =>   0xce400000);
++my %sm3ss1opcode = (
++	"sm3ss1"            =>   0xce400000);
+ 
+ my %sm3ttopcode = (
+ 	"sm3tt1a"           =>   0xce408000,
+@@ -241,14 +241,13 @@ sub unsm3part {
+ 			$mnemonic,$arg;
+ }
+ 
+-sub unsm3ssl {
++sub unsm3ss1 {
+ 	my ($mnemonic,$arg)=@_;
+ 
+-	$arg=~ m/qv(\d+)^,*,\s*qv(\d+)^,*,\s*qv(\d+)^,*,
+-                \s*qv(\d+)/o
++	$arg=~ m/qv(\d+)^,*,\s*qv(\d+)^,*,\s*qv(\d+)^,*,\s*qv(\d+)/o
+ 	&&
+ 	sprintf ".inst\t0x%08x\t//%s %s",
+-			$sm3sslopcode{$mnemonic}|$1|($2<<5)|($3<<16)|($4<<10),
++			$sm3ss1opcode{$mnemonic}|$1|($2<<5)|($3<<16)|($4<<10),
+ 			$mnemonic,$arg;
+ }
+ 
+@@ -274,7 +273,7 @@ foreach(split("\n",$code)) {
+ 	s/\`(^\`*)\`/eval($1)/ge;
+ 
+ 	s/\b(sm3partw1-2)\s+(qv.*)/unsm3part($1,$2)/ge;
+-	s/\b(sm3ssl)\s+(qv.*)/unsm3ssl($1,$2)/ge;
++	s/\b(sm3ss1)\s+(qv.*)/unsm3ss1($1,$2)/ge;
+ 	s/\b(sm3tt1-2a-b)\s+(qv.*)/unsm3tt($1,$2)/ge;
+ 	print $_,"\n";
+ }
+-- 
+2.37.3.windows.1
+

_service:tar_scm:Backport-Further-acceleration-for-SM4-GCM-on-ARM.patch Added

@@ -0,0 +1,73 @@
+From 98da8a58f964e279decc1bbbe8f07d807de05f7f Mon Sep 17 00:00:00 2001
+From: Daniel Hu <Daniel.Hu@arm.com>
+Date: Wed, 2 Mar 2022 12:55:39 +0000
+Subject: PATCH 06/13 Further acceleration for SM4-GCM on ARM
+
+This patch will allow the SM4-GCM function to leverage the SM4
+high-performance CTR crypto interface already implemented for ARM,
+which is faster than current single block cipher routine used
+for GCM
+
+It does not address the acceleration of GHASH function of GCM,
+which can be a future task, still we can see immediate uplift of
+performance (up to 4X)
+
+Before this patch:
+type             16 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes  16384 bytes
+SM4-GCM         186432.92k   394234.05k   587916.46k   639365.12k   648486.91k   652924.25k
+
+After the patch:
+SM4-GCM         193924.87k   860940.35k  1696083.71k  2302548.31k  2580411.73k  2607398.91k
+
+Signed-off-by: Daniel Hu <Daniel.Hu@arm.com>
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Paul Dale <pauli@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/17814)
+---
+ .../ciphers/cipher_sm4_gcm_hw.c               | 25 ++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
+index c0c9b22bd3..b9633f83ed 100644
+--- a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
++++ b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
+@@ -42,11 +42,34 @@ static int sm4_gcm_initkey(PROV_GCM_CTX *ctx, const unsigned char *key,
+     return 1;
+ }
+ 
++static int hw_gcm_cipher_update(PROV_GCM_CTX *ctx, const unsigned char *in,
++                                size_t len, unsigned char *out)
++{
++    if (ctx->enc) {
++        if (ctx->ctr != NULL) {
++            if (CRYPTO_gcm128_encrypt_ctr32(&ctx->gcm, in, out, len, ctx->ctr))
++                return 0;
++        } else {
++            if (CRYPTO_gcm128_encrypt(&ctx->gcm, in, out, len))
++                return 0;
++        }
++    } else {
++        if (ctx->ctr != NULL) {
++            if (CRYPTO_gcm128_decrypt_ctr32(&ctx->gcm, in, out, len, ctx->ctr))
++                return 0;
++        } else {
++            if (CRYPTO_gcm128_decrypt(&ctx->gcm, in, out, len))
++                return 0;
++        }
++    }
++    return 1;
++}
++
+ static const PROV_GCM_HW sm4_gcm = {
+     sm4_gcm_initkey,
+     ossl_gcm_setiv,
+     ossl_gcm_aad_update,
+-    ossl_gcm_cipher_update,
++    hw_gcm_cipher_update,
+     ossl_gcm_cipher_final,
+     ossl_gcm_one_shot
+ };
+-- 
+2.37.3.windows.1
+

_service:tar_scm:Backport-Guard-some-SM2-functions-with-OPENSSL_NO_SM2.patch Deleted

@@ -1,44 +0,0 @@
-From 908570d02b683195ddfdc8e8c324638bfaa0d2c2 Mon Sep 17 00:00:00 2001
-From: Matt Caswell <matt@openssl.org>
-Date: Thu, 14 Mar 2019 11:14:38 +0000
-Subject: PATCH 04/15 Guard some SM2 functions with OPENSSL_NO_SM2
-
-Fixes the no-ec build
-
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/8481)
----
- include/openssl/x509.h | 2 ++
- util/libcrypto.num     | 4 ++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/include/openssl/x509.h b/include/openssl/x509.h
-index 5f17057..5c88251 100644
---- a/include/openssl/x509.h
-+++ b/include/openssl/x509.h
-@@ -573,8 +573,10 @@ void X509_get0_signature(const ASN1_BIT_STRING **psig,
-                          const X509_ALGOR **palg, const X509 *x);
- int X509_get_signature_nid(const X509 *x);
- 
-+# ifndef OPENSSL_NO_SM2
- void X509_set_sm2_id(X509 *x, ASN1_OCTET_STRING *sm2_id);
- ASN1_OCTET_STRING *X509_get0_sm2_id(X509 *x);
-+# endif
- 
- int X509_trusted(const X509 *x);
- int X509_alias_set1(X509 *x, const unsigned char *name, int len);
-diff --git a/util/libcrypto.num b/util/libcrypto.num
-index 8635ac4..233d1c7 100644
---- a/util/libcrypto.num
-+++ b/util/libcrypto.num
-@@ -4626,5 +4626,5 @@ FIPS_drbg_get_strength                  6379	1_1_0g	EXIST::FUNCTION:
- FIPS_rand_strength                      6380	1_1_0g	EXIST::FUNCTION:
- FIPS_drbg_get_blocklength               6381	1_1_0g	EXIST::FUNCTION:
- FIPS_drbg_init                          6382	1_1_0g	EXIST::FUNCTION:
--X509_set_sm2_id                         6383	1_1_1m	EXIST::FUNCTION:
--X509_get0_sm2_id                        6384	1_1_1m	EXIST::FUNCTION:
-+X509_set_sm2_id                         6383	1_1_1m	EXIST::FUNCTION:SM2
-+X509_get0_sm2_id                        6384	1_1_1m	EXIST::FUNCTION:SM2
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:Backport-Make-X509_set_sm2_id-consistent-with-other-setters.patch Deleted

@@ -1,320 +0,0 @@
-From 0717cc33d72b011cce4f53661c58d628b684275c Mon Sep 17 00:00:00 2001
-From: Paul Yang <yang.yang@baishancloud.com>
-Date: Mon, 1 Apr 2019 10:21:53 +0900
-Subject: PATCH 09/15 Make X509_set_sm2_id consistent with other setters
-
-This commit makes the X509_set_sm2_id to 'set0' behaviour, which means
-the memory management is passed to X509 and user doesn't need to free
-the sm2_id parameter later. API name also changes to X509_set0_sm2_id.
-
-Document and test case are also updated.
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/8626)
----
- apps/verify.c                 | 40 +++++++++++++++++++-----------
- crypto/x509/x_all.c           |  5 +++-
- crypto/x509/x_x509.c          | 13 +++++++---
- doc/man3/X509_get0_sm2_id.pod | 12 ++++++---
- include/crypto/x509.h         |  2 +-
- include/openssl/x509.h        |  2 +-
- test/verify_extra_test.c      | 46 +++++++++++++++++++++++++++++++++++
- util/libcrypto.num            |  2 +-
- 8 files changed, 97 insertions(+), 25 deletions(-)
-
-diff --git a/apps/verify.c b/apps/verify.c
-index 5052d80..9000567 100644
---- a/apps/verify.c
-+++ b/apps/verify.c
-@@ -246,27 +246,37 @@ static int check(X509_STORE *ctx, const char *file,
- 
-     if (sm2id != NULL) {
- #ifndef OPENSSL_NO_SM2
--        ASN1_OCTET_STRING v;
-+        ASN1_OCTET_STRING *v;
- 
--        v.data = sm2id;
--        v.length = sm2idlen;
-+        v = ASN1_OCTET_STRING_new();
-+        if (v == NULL) {
-+            BIO_printf(bio_err, "error: SM2 ID allocation failed\n");
-+            goto end;
-+        }
- 
--        X509_set_sm2_id(x, &v);
-+        if (!ASN1_OCTET_STRING_set(v, sm2id, sm2idlen)) {
-+            BIO_printf(bio_err, "error: setting SM2 ID failed\n");
-+            ASN1_OCTET_STRING_free(v);
-+            goto end;
-+        }
-+
-+        X509_set0_sm2_id(x, v);
- #endif
-     }
- 
-     csc = X509_STORE_CTX_new();
-     if (csc == NULL) {
--        printf("error %s: X.509 store context allocation failed\n",
--               (file == NULL) ? "stdin" : file);
-+        BIO_printf(bio_err, "error %s: X.509 store context allocation failed\n",
-+                   (file == NULL) ? "stdin" : file);
-         goto end;
-     }
- 
-     X509_STORE_set_flags(ctx, vflags);
-     if (!X509_STORE_CTX_init(csc, ctx, x, uchain)) {
-         X509_STORE_CTX_free(csc);
--        printf("error %s: X.509 store context initialization failed\n",
--               (file == NULL) ? "stdin" : file);
-+        BIO_printf(bio_err,
-+                   "error %s: X.509 store context initialization failed\n",
-+                   (file == NULL) ? "stdin" : file);
-         goto end;
-     }
-     if (tchain != NULL)
-@@ -275,28 +285,30 @@ static int check(X509_STORE *ctx, const char *file,
-         X509_STORE_CTX_set0_crls(csc, crls);
-     i = X509_verify_cert(csc);
-     if (i > 0 && X509_STORE_CTX_get_error(csc) == X509_V_OK) {
--        printf("%s: OK\n", (file == NULL) ? "stdin" : file);
-+        BIO_printf(bio_out, "%s: OK\n", (file == NULL) ? "stdin" : file);
-         ret = 1;
-         if (show_chain) {
-             int j;
- 
-             chain = X509_STORE_CTX_get1_chain(csc);
-             num_untrusted = X509_STORE_CTX_get_num_untrusted(csc);
--            printf("Chain:\n");
-+            BIO_printf(bio_out, "Chain:\n");
-             for (j = 0; j < sk_X509_num(chain); j++) {
-                 X509 *cert = sk_X509_value(chain, j);
--                printf("depth=%d: ", j);
-+                BIO_printf(bio_out, "depth=%d: ", j);
-                 X509_NAME_print_ex_fp(stdout,
-                                       X509_get_subject_name(cert),
-                                       0, get_nameopt());
-                 if (j < num_untrusted)
--                    printf(" (untrusted)");
--                printf("\n");
-+                    BIO_printf(bio_out, " (untrusted)");
-+                BIO_printf(bio_out, "\n");
-             }
-             sk_X509_pop_free(chain, X509_free);
-         }
-     } else {
--        printf("error %s: verification failed\n", (file == NULL) ? "stdin" : file);
-+        BIO_printf(bio_err,
-+                   "error %s: verification failed\n",
-+                   (file == NULL) ? "stdin" : file);
-     }
-     X509_STORE_CTX_free(csc);
- 
-diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c
-index 60a2892..9c8aea5 100644
---- a/crypto/x509/x_all.c
-+++ b/crypto/x509/x_all.c
-@@ -72,7 +72,10 @@ static int x509_verify_sm2(X509 *x, EVP_PKEY *pkey, int mdnid, int pknid)
-         ret = 0;
-         goto err;
-     }
--    if (EVP_PKEY_CTX_set1_id(pctx, x->sm2_id.data, x->sm2_id.length) != 1) {
-+    /* NOTE: we tolerate no actual ID, to provide maximum flexibility */
-+    if (x->sm2_id != NULL
-+            && EVP_PKEY_CTX_set1_id(pctx, x->sm2_id->data,
-+                                    x->sm2_id->length) != 1) {
-         X509err(X509_F_X509_VERIFY_SM2, ERR_R_EVP_LIB);
-         ret = 0;
-         goto err;
-diff --git a/crypto/x509/x_x509.c b/crypto/x509/x_x509.c
-index 1beab78..fb03bb2 100644
---- a/crypto/x509/x_x509.c
-+++ b/crypto/x509/x_x509.c
-@@ -72,6 +72,9 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- #ifndef OPENSSL_NO_RFC3779
-         ret->rfc3779_addr = NULL;
-         ret->rfc3779_asid = NULL;
-+#endif
-+#ifndef OPENSSL_NO_SM2
-+        ret->sm2_id = NULL;
- #endif
-         ret->aux = NULL;
-         ret->crldp = NULL;
-@@ -91,6 +94,9 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
- #ifndef OPENSSL_NO_RFC3779
-         sk_IPAddressFamily_pop_free(ret->rfc3779_addr, IPAddressFamily_free);
-         ASIdentifiers_free(ret->rfc3779_asid);
-+#endif
-+#ifndef OPENSSL_NO_SM2
-+        ASN1_OCTET_STRING_free(ret->sm2_id);
- #endif
-         break;
- 
-@@ -247,13 +253,14 @@ int X509_get_signature_nid(const X509 *x)
- }
- 
- #ifndef OPENSSL_NO_SM2
--void X509_set_sm2_id(X509 *x, ASN1_OCTET_STRING *sm2_id)
-+void X509_set0_sm2_id(X509 *x, ASN1_OCTET_STRING *sm2_id)
- {
--    x->sm2_id = *sm2_id;
-+    ASN1_OCTET_STRING_free(x->sm2_id);
-+    x->sm2_id = sm2_id;
- }
- 
- ASN1_OCTET_STRING *X509_get0_sm2_id(X509 *x)
- {
--    return &x->sm2_id;
-+    return x->sm2_id;
- }
- #endif
-diff --git a/doc/man3/X509_get0_sm2_id.pod b/doc/man3/X509_get0_sm2_id.pod
-index 84da71e..9698c86 100644
---- a/doc/man3/X509_get0_sm2_id.pod
-+++ b/doc/man3/X509_get0_sm2_id.pod
-@@ -2,20 +2,24 @@
- 
- =head1 NAME
- 
--X509_get0_sm2_id, X509_set_sm2_id - get or set SM2 ID for certificate operations
-+X509_get0_sm2_id, X509_set0_sm2_id - get or set SM2 ID for certificate operations
- 
- =head1 SYNOPSIS
- 
-  #include <openssl/x509.h>
- 
-  ASN1_OCTET_STRING *X509_get0_sm2_id(X509 *x);
-- void X509_set_sm2_id(X509 *x, ASN1_OCTET_STRING *sm2_id);
-+ void X509_set0_sm2_id(X509 *x, ASN1_OCTET_STRING *sm2_id);
- 
- =head1 DESCRIPTION
- 
- X509_get0_sm2_id() gets the ID value of an SM2 certificate B<x> by returning an
- B<ASN1_OCTET_STRING> object which should not be freed by the caller.
--X509_set_sm2_id() sets the B<sm2_id> value to an SM2 certificate B<x>.
-+
-+X509_set0_sm2_id() sets the B<sm2_id> value to an SM2 certificate B<x>. Calling
-+this function transfers the memory management of the value to the X509 object,
-+and therefore the value that has been passed in should not be freed by the
-+caller after this function has been called.
-

_service:tar_scm:Backport-SM3-acceleration-with-SM3-hardware-instruction-on-aa.patch Added

@@ -0,0 +1,457 @@
+From 8a83d735057dde1f727eb0921446e4ca8b085267 Mon Sep 17 00:00:00 2001
+From: "fangming.fang" <fangming.fang@arm.com>
+Date: Fri, 24 Dec 2021 08:29:04 +0000
+Subject: PATCH 02/13 SM3 acceleration with SM3 hardware instruction on
+ aarch64
+
+SM3 hardware instruction is optional feature of crypto extension for
+aarch64. This implementation accelerates SM3 via SM3 instructions. For
+the platform not supporting SM3 instruction, the original C
+implementation still works. Thanks to AliBaba for testing and reporting
+the following perf numbers for Yitian710:
+
+Benchmark on T-Head Yitian-710 2.75GHz:
+
+Before:
+type  16 bytes     64 bytes    256 bytes    1024 bytes   8192 bytes   16384 bytes
+sm3   49297.82k   121062.63k   223106.05k   283371.52k   307574.10k   309400.92k
+
+After (33% - 74% faster):
+type  16 bytes     64 bytes    256 bytes    1024 bytes   8192 bytes   16384 bytes
+sm3   65640.01k   179121.79k   359854.59k   481448.96k   534055.59k   538274.47k
+
+Reviewed-by: Paul Dale <pauli@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/17454)
+---
+ crypto/arm64cpuid.pl        |   8 +
+ crypto/arm_arch.h           |   2 +
+ crypto/armcap.c             |  10 ++
+ crypto/sm3/asm/sm3-armv8.pl | 282 ++++++++++++++++++++++++++++++++++++
+ crypto/sm3/build.info       |  21 ++-
+ crypto/sm3/sm3_local.h      |  16 +-
+ 6 files changed, 336 insertions(+), 3 deletions(-)
+ create mode 100644 crypto/sm3/asm/sm3-armv8.pl
+
+diff --git a/crypto/arm64cpuid.pl b/crypto/arm64cpuid.pl
+index 11f0e50279..10d267b7ad 100755
+--- a/crypto/arm64cpuid.pl
++++ b/crypto/arm64cpuid.pl
+@@ -96,6 +96,14 @@ _armv8_cpuid_probe:
+ 	ret
+ .size	_armv8_cpuid_probe,.-_armv8_cpuid_probe
+ 
++.globl	_armv8_sm3_probe
++.type	_armv8_sm3_probe,%function
++_armv8_sm3_probe:
++	AARCH64_VALID_CALL_TARGET
++	.long	0xce63c004	// sm3partw1 v4.4s, v0.4s, v3.4s
++	ret
++.size	_armv8_sm3_probe,.-_armv8_sm3_probe
++
+ .globl	OPENSSL_cleanse
+ .type	OPENSSL_cleanse,%function
+ .align	5
+diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
+index a815a5c72b..c8b501f34c 100644
+--- a/crypto/arm_arch.h
++++ b/crypto/arm_arch.h
+@@ -83,6 +83,8 @@ extern unsigned int OPENSSL_armv8_rsa_neonized;
+ # define ARMV8_PMULL     (1<<5)
+ # define ARMV8_SHA512    (1<<6)
+ # define ARMV8_CPUID     (1<<7)
++# define ARMV8_RNG       (1<<8)
++# define ARMV8_SM3       (1<<9)
+ 
+ /*
+  * MIDR_EL1 system register
+diff --git a/crypto/armcap.c b/crypto/armcap.c
+index c021330e32..365a48df45 100644
+--- a/crypto/armcap.c
++++ b/crypto/armcap.c
+@@ -52,6 +52,7 @@ void _armv8_sha1_probe(void);
+ void _armv8_sha256_probe(void);
+ void _armv8_pmull_probe(void);
+ # ifdef __aarch64__
++void _armv8_sm3_probe(void);
+ void _armv8_sha512_probe(void);
+ unsigned int _armv8_cpuid_probe(void);
+ # endif
+@@ -137,6 +138,7 @@ static unsigned long getauxval(unsigned long key)
+ #  define HWCAP_CE_SHA1          (1 << 5)
+ #  define HWCAP_CE_SHA256        (1 << 6)
+ #  define HWCAP_CPUID            (1 << 11)
++#  define HWCAP_CE_SM3           (1 << 18)
+ #  define HWCAP_CE_SHA512        (1 << 21)
+ # endif
+ 
+@@ -210,6 +212,9 @@ void OPENSSL_cpuid_setup(void)
+ 
+         if (hwcap & HWCAP_CPUID)
+             OPENSSL_armcap_P |= ARMV8_CPUID;
++
++        if (hwcap & HWCAP_CE_SM3)
++            OPENSSL_armcap_P |= ARMV8_SM3;
+ #  endif
+     }
+ # endif
+@@ -253,6 +258,11 @@ void OPENSSL_cpuid_setup(void)
+             _armv8_sha512_probe();
+             OPENSSL_armcap_P |= ARMV8_SHA512;
+         }
++
++        if (sigsetjmp(ill_jmp, 1) == 0) {
++            _armv8_sm3_probe();
++            OPENSSL_armcap_P |= ARMV8_SM3;
++        }
+ #  endif
+     }
+ # endif
+diff --git a/crypto/sm3/asm/sm3-armv8.pl b/crypto/sm3/asm/sm3-armv8.pl
+new file mode 100644
+index 0000000000..bb71b2eade
+--- /dev/null
++++ b/crypto/sm3/asm/sm3-armv8.pl
+@@ -0,0 +1,282 @@
++#! /usr/bin/env perl
++# Copyright 2021 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
++# https://www.openssl.org/source/license.html
++#
++# This module implements support for Armv8 SM3 instructions
++
++# $output is the last argument if it looks like a file (it has an extension)
++# $flavour is the first argument if it doesn't look like a file
++$output = $#ARGV >= 0 && $ARGV$#ARGV =~ m|\.\w+$| ? pop : undef;
++$flavour = $#ARGV >= 0 && $ARGV0 !~ m|\.| ? shift : undef;
++
++$0 =~ m/(.*\/\\)^\/\\+$/; $dir=$1;
++( $xlate="${dir}arm-xlate.pl" and -f $xlate ) or
++( $xlate="${dir}../../perlasm/arm-xlate.pl" and -f $xlate) or
++die "can't locate arm-xlate.pl";
++
++open OUT,"| \"$^X\" $xlate $flavour \"$output\""
++    or die "can't call $xlate: $!";
++*STDOUT=*OUT;
++
++# Message expanding:
++#	Wj <- P1(Wj-16^Wj-9^(Wj-3<<<15))^(Wj-13<<<7)^Wj-6
++# Input: s0, s1, s2, s3
++#	s0 = w0  | w1  | w2  | w3
++#	s1 = w4  | w5  | w6  | w7
++#	s2 = w8  | w9  | w10 | w11
++#	s3 = w12 | w13 | w14 | w15
++# Output: s4
++sub msg_exp () {
++my $s0 = shift;
++my $s1 = shift;
++my $s2 = shift;
++my $s3 = shift;
++my $s4 = shift;
++my $vtmp1 = shift;
++my $vtmp2 = shift;
++$code.=<<___;
++	// s4 = w7  | w8  | w9  | w10
++	ext     $s4.16b, $s1.16b, $s2.16b, #12
++	// vtmp1 = w3  | w4  | w5  | w6
++	ext	$vtmp1.16b, $s0.16b, $s1.16b, #12
++	// vtmp2 = w10 | w11 | w12 | w13
++	ext     $vtmp2.16b, $s2.16b, $s3.16b, #8
++	sm3partw1       $s4.4s, $s0.4s, $s3.4s
++	sm3partw2       $s4.4s, $vtmp2.4s, $vtmp1.4s
++___
++}
++
++# A round of compresson function
++# Input:
++# 	ab - choose instruction among sm3tt1a, sm3tt1b, sm3tt2a, sm3tt2b
++# 	vstate0 - vstate1, store digest status(A - H)
++# 	vconst0 - vconst1, interleaved used to store Tj <<< j
++# 	vtmp - temporary register
++# 	vw - for sm3tt1ab, vw = s0 eor s1
++# 	s0 - for sm3tt2ab, just be s0
++# 	i, choose wj' or wj from vw
++sub round () {
++my $ab = shift;
++my $vstate0 = shift;
++my $vstate1 = shift;
++my $vconst0 = shift;
++my $vconst1 = shift;
++my $vtmp = shift;
++my $vw = shift;
++my $s0 = shift;
++my $i = shift;
++$code.=<<___;
++	sm3ss1  $vtmp.4s, $vstate0.4s, $vconst0.4s, $vstate1.4s
++	shl     $vconst1.4s, $vconst0.4s, #1
++	sri     $vconst1.4s, $vconst0.4s, #31
++	sm3tt1$ab       $vstate0.4s, $vtmp.4s, $vw.4s$i
++	sm3tt2$ab       $vstate1.4s, $vtmp.4s, $s0.4s$i
++___
++}
++
++sub qround () {
++my $ab = shift;
++my $vstate0 = shift;
++my $vstate1 = shift;

_service:tar_scm:Backport-SM4-AESE-optimization-for-ARMv8.patch Added

@@ -0,0 +1,2322 @@
+From 730387aebda57a1bb0af5a74747d4dadc5e033f7 Mon Sep 17 00:00:00 2001
+From: Xu Yizhou <xuyizhou1@huawei.com>
+Date: Wed, 18 Jan 2023 09:55:02 +0800
+Subject: PATCH 12/13 SM4 AESE optimization for ARMv8
+
+Signed-off-by: Xu Yizhou <xuyizhou1@huawei.com>
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Paul Dale <pauli@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/19914)
+---
+ crypto/sm4/asm/vpsm4-armv8.pl                 |  458 +++++
+ crypto/sm4/asm/vpsm4_ex-armv8.pl              | 1544 +++++++++++++++++
+ crypto/sm4/build.info                         |    4 +-
+ include/crypto/sm4_platform.h                 |   41 +-
+ .../implementations/ciphers/cipher_sm4_hw.c   |   26 +-
+ .../implementations/ciphers/cipher_sm4_xts.c  |    4 +-
+ .../implementations/ciphers/cipher_sm4_xts.h  |    2 +-
+ .../ciphers/cipher_sm4_xts_hw.c               |   33 +-
+ 8 files changed, 2090 insertions(+), 22 deletions(-)
+ create mode 100644 crypto/sm4/asm/vpsm4_ex-armv8.pl
+
+diff --git a/crypto/sm4/asm/vpsm4-armv8.pl b/crypto/sm4/asm/vpsm4-armv8.pl
+index 73797af582..e19de30901 100755
+--- a/crypto/sm4/asm/vpsm4-armv8.pl
++++ b/crypto/sm4/asm/vpsm4-armv8.pl
+@@ -28,6 +28,7 @@ open OUT,"| \"$^X\" $xlate $flavour \"$output\""
+ 
+ $prefix="vpsm4";
+ my @vtmp=map("v$_",(0..3));
++my @qtmp=map("q$_",(0..3));
+ my @data=map("v$_",(4..7));
+ my @datax=map("v$_",(8..11));
+ my ($rk0,$rk1)=("v12","v13");
+@@ -36,6 +37,7 @@ my @vtmpx=map("v$_",(12..15));
+ my @sbox=map("v$_",(16..31));
+ my ($inp,$outp,$blocks,$rks)=("x0","x1","w2","x3");
+ my ($tmpw,$tmp,$wtmp0,$wtmp1,$wtmp2)=("w6","x6","w7","w8","w9");
++my ($xtmp1,$xtmp2)=("x8","x9");
+ my ($ptr,$counter)=("x10","w11");
+ my ($word0,$word1,$word2,$word3)=("w12","w13","w14","w15");
+ 
+@@ -60,6 +62,51 @@ ___
+ 	}
+ }
+ 
++sub rev32_armeb() {
++	my $dst = shift;
++	my $src = shift;
++
++	if ($src and ("$src" ne "$dst")) {
++$code.=<<___;
++#ifdef __AARCH64EB__
++	rev32	$dst.16b,$src.16b
++#else
++	mov	$dst.16b,$src.16b
++#endif
++___
++	} else {
++$code.=<<___;
++#ifdef __AARCH64EB__
++	rev32	$dst.16b,$dst.16b
++#endif
++___
++	}
++}
++
++sub rbit() {
++	my $dst = shift;
++	my $src = shift;
++	my $std = shift;
++
++	if ($src and ("$src" ne "$dst")) {
++		if ($std eq "_gb") {
++$code.=<<___;
++			rbit $dst.16b,$src.16b
++___
++		} else {
++$code.=<<___;
++			mov $dst.16b,$src.16b
++___
++		}
++	} else {
++		if ($std eq "_gb") {
++$code.=<<___;
++			rbit $dst.16b,$src.16b
++___
++		}
++	}
++}
++
+ sub transpose() {
+ 	my ($dat0,$dat1,$dat2,$dat3,$vt0,$vt1,$vt2,$vt3) = @_;
+ 
+@@ -435,6 +482,58 @@ $code.=<<___;
+ ___
+ }
+ 
++
++sub mov_reg_to_vec() {
++	my $src0 = shift;
++	my $src1 = shift;
++	my $desv = shift;
++$code.=<<___;
++	mov $desv.d0,$src0
++	mov $desv.d1,$src1
++___
++	&rev32_armeb($desv,$desv);
++}
++
++sub mov_vec_to_reg() {
++	my $srcv = shift;
++	my $des0 = shift;
++	my $des1 = shift;
++$code.=<<___;
++	mov $des0,$srcv.d0
++	mov $des1,$srcv.d1
++___
++}
++
++sub compute_tweak() {
++	my $src0 = shift;
++	my $src1 = shift;
++	my $des0 = shift;
++	my $des1 = shift;
++$code.=<<___;
++	mov $wtmp0,0x87
++	extr	$xtmp2,$src1,$src1,#32
++	extr	$des1,$src1,$src0,#63
++	and	$wtmp1,$wtmp0,$wtmp2,asr#31
++	eor	$des0,$xtmp1,$src0,lsl#1
++___
++}
++
++sub compute_tweak_vec() {
++	my $src = shift;
++	my $des = shift;
++	my $std = shift;
++	&rbit(@vtmp2,$src,$std);
++$code.=<<___;
++	ldr  @qtmp0, =0x01010101010101010101010101010187
++	shl  $des.16b, @vtmp2.16b, #1
++	ext  @vtmp1.16b, @vtmp2.16b, @vtmp2.16b,#15
++	ushr @vtmp1.16b, @vtmp1.16b, #7
++	mul  @vtmp1.16b, @vtmp1.16b, @vtmp0.16b
++	eor  $des.16b, $des.16b, @vtmp1.16b
++___
++	&rbit($des,$des,$std);
++}
++
+ $code=<<___;
+ #include "arm_arch.h"
+ .arch	armv8-a
+@@ -1101,6 +1200,365 @@ $code.=<<___;
+ .size	${prefix}_ctr32_encrypt_blocks,.-${prefix}_ctr32_encrypt_blocks
+ ___
+ }}}
++
++{{{
++my ($blocks,$len)=("x2","x2");
++my $ivp=("x5");
++my @twx=map("x$_",(12..27));
++my ($rks1,$rks2)=("x26","x27");
++my $lastBlk=("x26");
++my $enc=("w28");
++my $remain=("x29");
++
++my @tweak=@datax;
++
++sub gen_xts_cipher() {
++	my $std = shift;
++$code.=<<___;
++.globl	${prefix}_xts_encrypt${std}
++.type	${prefix}_xts_encrypt${std},%function
++.align	5
++${prefix}_xts_encrypt${std}:
++	AARCH64_SIGN_LINK_REGISTER
++	stp	x15, x16, sp, #-0x10!
++	stp	x17, x18, sp, #-0x10!
++	stp	x19, x20, sp, #-0x10!
++	stp	x21, x22, sp, #-0x10!
++	stp	x23, x24, sp, #-0x10!
++	stp	x25, x26, sp, #-0x10!
++	stp	x27, x28, sp, #-0x10!
++	stp	x29, x30, sp, #-0x10!
++	stp	d8, d9, sp, #-0x10!
++	stp	d10, d11, sp, #-0x10!
++	stp	d12, d13, sp, #-0x10!
++	stp	d14, d15, sp, #-0x10!
++	mov	$rks1,x3
++	mov	$rks2,x4
++	mov	$enc,w6
++	ld1	{@tweak0.4s}, $ivp
++	mov	$rks,$rks2
++___
++	&load_sbox();
++	&rev32(@tweak0,@tweak0);
++	&encrypt_1blk(@tweak0);
++$code.=<<___;

_service:tar_scm:Backport-SM4-optimization-for-ARM-by-ASIMD.patch Added

@@ -0,0 +1,1334 @@
+From ca0b08e39bb619b6e62ef58c80edc784e8f20966 Mon Sep 17 00:00:00 2001
+From: Daniel Hu <Daniel.Hu@arm.com>
+Date: Mon, 14 Feb 2022 14:36:34 +0000
+Subject: PATCH 07/13 SM4 optimization for ARM by ASIMD
+
+This patch optimizes SM4 for ARM processor using ASIMD instruction
+
+It will improve performance if both of following conditions are met:
+1) Input data equal to or more than 4 blocks
+2) Cipher mode allows parallelism, including ECB,CTR,GCM or CBC decryption
+
+This patch implements SM4 SBOX lookup in vector registers, with the
+benefit of constant processing time over existing C implementation.
+
+It is only enabled for micro-architecture N1/V1. In the ideal scenario,
+performance can reach up to 2.7X
+
+When either of above two conditions is not met, e.g. single block input
+or CFB/OFB mode, CBC encryption, performance could drop about 50%.
+
+The assembly code has been reviewed internally by ARM engineer
+Fangming.Fang@arm.com
+
+Signed-off-by: Daniel Hu <Daniel.Hu@arm.com>
+
+Reviewed-by: Paul Dale <pauli@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/17951)
+---
+ crypto/evp/e_sm4.c                            |   24 +
+ crypto/sm4/asm/vpsm4-armv8.pl                 | 1118 +++++++++++++++++
+ crypto/sm4/build.info                         |    6 +-
+ include/crypto/sm4_platform.h                 |   29 +
+ .../ciphers/cipher_sm4_gcm_hw.c               |    7 +
+ .../implementations/ciphers/cipher_sm4_hw.c   |   24 +
+ 6 files changed, 1206 insertions(+), 2 deletions(-)
+ create mode 100755 crypto/sm4/asm/vpsm4-armv8.pl
+
+diff --git a/crypto/evp/e_sm4.c b/crypto/evp/e_sm4.c
+index bff79ff197..c8e8cfe9c9 100644
+--- a/crypto/evp/e_sm4.c
++++ b/crypto/evp/e_sm4.c
+@@ -76,6 +76,17 @@ static int sm4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                 dat->stream.ecb = (ecb128_f) HWSM4_ecb_encrypt;
+ # endif
+         } else
++#endif
++#ifdef VPSM4_CAPABLE
++        if (VPSM4_CAPABLE) {
++            vpsm4_set_decrypt_key(key, &dat->ks.ks);
++            dat->block = (block128_f) vpsm4_decrypt;
++            dat->stream.cbc = NULL;
++            if (mode == EVP_CIPH_CBC_MODE)
++                dat->stream.cbc = (cbc128_f) vpsm4_cbc_encrypt;
++            else if (mode == EVP_CIPH_ECB_MODE)
++                dat->stream.ecb = (ecb128_f) vpsm4_ecb_encrypt;
++        } else
+ #endif
+         {
+             dat->block = (block128_f) ossl_sm4_decrypt;
+@@ -104,6 +115,19 @@ static int sm4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+ # endif
+             (void)0;            /* terminate potentially open 'else' */
+     } else
++#endif
++#ifdef VPSM4_CAPABLE
++    if (VPSM4_CAPABLE) {
++        vpsm4_set_encrypt_key(key, &dat->ks.ks);
++        dat->block = (block128_f) vpsm4_encrypt;
++        dat->stream.cbc = NULL;
++        if (mode == EVP_CIPH_CBC_MODE)
++            dat->stream.cbc = (cbc128_f) vpsm4_cbc_encrypt;
++        else if (mode == EVP_CIPH_ECB_MODE)
++            dat->stream.ecb = (ecb128_f) vpsm4_ecb_encrypt;
++        else if (mode == EVP_CIPH_CTR_MODE)
++            dat->stream.ctr = (ctr128_f) vpsm4_ctr32_encrypt_blocks;
++    } else
+ #endif
+     {
+         dat->block = (block128_f) ossl_sm4_encrypt;
+diff --git a/crypto/sm4/asm/vpsm4-armv8.pl b/crypto/sm4/asm/vpsm4-armv8.pl
+new file mode 100755
+index 0000000000..095d9dae64
+--- /dev/null
++++ b/crypto/sm4/asm/vpsm4-armv8.pl
+@@ -0,0 +1,1118 @@
++#! /usr/bin/env perl
++# Copyright 2020-2021 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
++# https://www.openssl.org/source/license.html
++
++#
++# This module implements SM4 with ASIMD on aarch64
++#
++# Feb 2022
++#
++
++# $output is the last argument if it looks like a file (it has an extension)
++# $flavour is the first argument if it doesn't look like a file
++$output = $#ARGV >= 0 && $ARGV$#ARGV =~ m|\.\w+$| ? pop : undef;
++$flavour = $#ARGV >= 0 && $ARGV0 !~ m|\.| ? shift : undef;
++
++$0 =~ m/(.*\/\\)^\/\\+$/; $dir=$1;
++( $xlate="${dir}arm-xlate.pl" and -f $xlate ) or
++( $xlate="${dir}../../perlasm/arm-xlate.pl" and -f $xlate) or
++die "can't locate arm-xlate.pl";
++
++open OUT,"| \"$^X\" $xlate $flavour \"$output\""
++    or die "can't call $xlate: $!";
++*STDOUT=*OUT;
++
++$prefix="vpsm4";
++my @vtmp=map("v$_",(0..3));
++my @data=map("v$_",(4..7));
++my @datax=map("v$_",(8..11));
++my ($rk0,$rk1)=("v12","v13");
++my ($rka,$rkb)=("v14","v15");
++my @vtmpx=map("v$_",(12..15));
++my @sbox=map("v$_",(16..31));
++my ($inp,$outp,$blocks,$rks)=("x0","x1","w2","x3");
++my ($tmpw,$tmp,$wtmp0,$wtmp1,$wtmp2)=("w6","x6","w7","w8","w9");
++my ($ptr,$counter)=("x10","w11");
++my ($word0,$word1,$word2,$word3)=("w12","w13","w14","w15");
++
++sub rev32() {
++	my $dst = shift;
++	my $src = shift;
++
++	if ($src and ("$src" ne "$dst")) {
++$code.=<<___;
++#ifndef __ARMEB__
++	rev32	$dst.16b,$src.16b
++#else
++	mov	$dst.16b,$src.16b
++#endif
++___
++	} else {
++$code.=<<___;
++#ifndef __ARMEB__
++	rev32	$dst.16b,$dst.16b
++#endif
++___
++	}
++}
++
++sub transpose() {
++	my ($dat0,$dat1,$dat2,$dat3,$vt0,$vt1,$vt2,$vt3) = @_;
++
++$code.=<<___;
++	zip1	$vt0.4s,$dat0.4s,$dat1.4s
++	zip2	$vt1.4s,$dat0.4s,$dat1.4s
++	zip1	$vt2.4s,$dat2.4s,$dat3.4s
++	zip2	$vt3.4s,$dat2.4s,$dat3.4s
++	zip1	$dat0.2d,$vt0.2d,$vt2.2d
++	zip2	$dat1.2d,$vt0.2d,$vt2.2d
++	zip1	$dat2.2d,$vt1.2d,$vt3.2d
++	zip2	$dat3.2d,$vt1.2d,$vt3.2d
++___
++}
++
++# sbox operations for 4-lane of words
++sub sbox() {
++	my $dat = shift;
++
++$code.=<<___;
++	movi	@vtmp0.16b,#64
++	movi	@vtmp1.16b,#128
++	movi	@vtmp2.16b,#192
++	sub	@vtmp0.16b,$dat.16b,@vtmp0.16b
++	sub	@vtmp1.16b,$dat.16b,@vtmp1.16b
++	sub	@vtmp2.16b,$dat.16b,@vtmp2.16b
++	tbl	$dat.16b,{@sbox0.16b,@sbox1.16b,@sbox2.16b,@sbox3.16b},$dat.16b
++	tbl	@vtmp0.16b,{@sbox4.16b,@sbox5.16b,@sbox6.16b,@sbox7.16b},@vtmp0.16b
++	tbl	@vtmp1.16b,{@sbox8.16b,@sbox9.16b,@sbox10.16b,@sbox11.16b},@vtmp1.16b
++	tbl	@vtmp2.16b,{@sbox12.16b,@sbox13.16b,@sbox14.16b,@sbox15.16b},@vtmp2.16b
++	add	@vtmp0.2d,@vtmp0.2d,@vtmp1.2d
++	add	@vtmp2.2d,@vtmp2.2d,$dat.2d
++	add	$dat.2d,@vtmp0.2d,@vtmp2.2d
++
++	ushr	@vtmp0.4s,$dat.4s,32-2
++	sli	@vtmp0.4s,$dat.4s,2
++	ushr	@vtmp2.4s,$dat.4s,32-10
++	eor	@vtmp1.16b,@vtmp0.16b,$dat.16b
++	sli	@vtmp2.4s,$dat.4s,10
++	eor	@vtmp1.16b,@vtmp2.16b,$vtmp1.16b
++	ushr	@vtmp0.4s,$dat.4s,32-18
++	sli	@vtmp0.4s,$dat.4s,18
++	ushr	@vtmp2.4s,$dat.4s,32-24
++	eor	@vtmp1.16b,@vtmp0.16b,$vtmp1.16b
++	sli	@vtmp2.4s,$dat.4s,24
++	eor	$dat.16b,@vtmp2.16b,@vtmp1.16b
++___
++}
++
++# sbox operation for 8-lane of words
++sub sbox_double() {

_service:tar_scm:Backport-SM4-optimization-for-ARM-by-HW-instruction.patch Added

@@ -0,0 +1,1228 @@
+From 1cd480c10b8bbaa6f72d503494ff2973672ec0e4 Mon Sep 17 00:00:00 2001
+From: Daniel Hu <Daniel.Hu@arm.com>
+Date: Tue, 19 Oct 2021 22:49:05 +0100
+Subject: PATCH 05/13 SM4 optimization for ARM by HW instruction
+
+This patch implements the SM4 optimization for ARM processor,
+using SM4 HW instruction, which is an optional feature of
+crypto extension for aarch64 V8.
+
+Tested on some modern ARM micro-architectures with SM4 support, the
+performance uplift can be observed around 8X~40X over existing
+C implementation in openssl. Algorithms that can be parallelized
+(like CTR, ECB, CBC decryption) are on higher end, with algorithm
+like CBC encryption on lower end (due to inter-block dependency)
+
+Perf data on Yitian-710 2.75GHz hardware, before and after optimization:
+
+Before:
+  type      16 bytes     64 bytes    256 bytes    1024 bytes   8192 bytes  16384 bytes
+  SM4-CTR  105787.80k   107837.87k   108380.84k   108462.08k   108549.46k   108554.92k
+  SM4-ECB  111924.58k   118173.76k   119776.00k   120093.70k   120264.02k   120274.94k
+  SM4-CBC  106428.09k   109190.98k   109674.33k   109774.51k   109827.41k   109827.41k
+
+After (7.4x - 36.6x faster):
+  type      16 bytes     64 bytes    256 bytes    1024 bytes   8192 bytes  16384 bytes
+  SM4-CTR  781979.02k  2432994.28k  3437753.86k  3834177.88k  3963715.58k  3974556.33k
+  SM4-ECB  937590.69k  2941689.02k  3945751.81k  4328655.87k  4459181.40k  4468692.31k
+  SM4-CBC  890639.88k  1027746.58k  1050621.78k  1056696.66k  1058613.93k  1058701.31k
+
+Signed-off-by: Daniel Hu <Daniel.Hu@arm.com>
+
+Reviewed-by: Paul Dale <pauli@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/17455)
+---
+ crypto/arm64cpuid.pl                          |   8 +
+ crypto/arm_arch.h                             |   1 +
+ crypto/armcap.c                               |  10 +
+ crypto/evp/e_sm4.c                            | 193 ++++--
+ crypto/sm4/asm/sm4-armv8.pl                   | 635 ++++++++++++++++++
+ crypto/sm4/build.info                         |  32 +-
+ include/crypto/sm4_platform.h                 |  48 ++
+ .../implementations/ciphers/cipher_sm4.h      |   1 +
+ .../ciphers/cipher_sm4_gcm_hw.c               |  20 +-
+ .../implementations/ciphers/cipher_sm4_hw.c   |  57 +-
+ 10 files changed, 945 insertions(+), 60 deletions(-)
+ create mode 100755 crypto/sm4/asm/sm4-armv8.pl
+ create mode 100644 include/crypto/sm4_platform.h
+
+diff --git a/crypto/arm64cpuid.pl b/crypto/arm64cpuid.pl
+index 10d267b7ad..36af3e075b 100755
+--- a/crypto/arm64cpuid.pl
++++ b/crypto/arm64cpuid.pl
+@@ -80,6 +80,14 @@ _armv8_pmull_probe:
+ 	ret
+ .size	_armv8_pmull_probe,.-_armv8_pmull_probe
+ 
++.globl	_armv8_sm4_probe
++.type	_armv8_sm4_probe,%function
++_armv8_sm4_probe:
++	AARCH64_VALID_CALL_TARGET
++	.long	0xcec08400	// sm4e	v0.4s, v0.4s
++	ret
++.size	_armv8_sm4_probe,.-_armv8_sm4_probe
++
+ .globl	_armv8_sha512_probe
+ .type	_armv8_sha512_probe,%function
+ _armv8_sha512_probe:
+diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
+index c8b501f34c..5b5af31d92 100644
+--- a/crypto/arm_arch.h
++++ b/crypto/arm_arch.h
+@@ -85,6 +85,7 @@ extern unsigned int OPENSSL_armv8_rsa_neonized;
+ # define ARMV8_CPUID     (1<<7)
+ # define ARMV8_RNG       (1<<8)
+ # define ARMV8_SM3       (1<<9)
++# define ARMV8_SM4       (1<<10)
+ 
+ /*
+  * MIDR_EL1 system register
+diff --git a/crypto/armcap.c b/crypto/armcap.c
+index 365a48df45..c5aa062767 100644
+--- a/crypto/armcap.c
++++ b/crypto/armcap.c
+@@ -53,6 +53,7 @@ void _armv8_sha256_probe(void);
+ void _armv8_pmull_probe(void);
+ # ifdef __aarch64__
+ void _armv8_sm3_probe(void);
++void _armv8_sm4_probe(void);
+ void _armv8_sha512_probe(void);
+ unsigned int _armv8_cpuid_probe(void);
+ # endif
+@@ -139,6 +140,7 @@ static unsigned long getauxval(unsigned long key)
+ #  define HWCAP_CE_SHA256        (1 << 6)
+ #  define HWCAP_CPUID            (1 << 11)
+ #  define HWCAP_CE_SM3           (1 << 18)
++#  define HWCAP_CE_SM4           (1 << 19)
+ #  define HWCAP_CE_SHA512        (1 << 21)
+ # endif
+ 
+@@ -207,6 +209,9 @@ void OPENSSL_cpuid_setup(void)
+             OPENSSL_armcap_P |= ARMV8_SHA256;
+ 
+ #  ifdef __aarch64__
++        if (hwcap & HWCAP_CE_SM4)
++            OPENSSL_armcap_P |= ARMV8_SM4;
++
+         if (hwcap & HWCAP_CE_SHA512)
+             OPENSSL_armcap_P |= ARMV8_SHA512;
+ 
+@@ -254,6 +259,11 @@ void OPENSSL_cpuid_setup(void)
+             OPENSSL_armcap_P |= ARMV8_SHA256;
+         }
+ #  if defined(__aarch64__) && !defined(__APPLE__)
++        if (sigsetjmp(ill_jmp, 1) == 0) {
++            _armv8_sm4_probe();
++            OPENSSL_armcap_P |= ARMV8_SM4;
++        }
++
+         if (sigsetjmp(ill_jmp, 1) == 0) {
+             _armv8_sha512_probe();
+             OPENSSL_armcap_P |= ARMV8_SHA512;
+diff --git a/crypto/evp/e_sm4.c b/crypto/evp/e_sm4.c
+index abd603015c..bff79ff197 100644
+--- a/crypto/evp/e_sm4.c
++++ b/crypto/evp/e_sm4.c
+@@ -17,92 +17,187 @@
+ # include <openssl/modes.h>
+ # include "crypto/sm4.h"
+ # include "crypto/evp.h"
++# include "crypto/sm4_platform.h"
+ # include "evp_local.h"
+ 
+ typedef struct {
+-    SM4_KEY ks;
++    union {
++        OSSL_UNION_ALIGN;
++        SM4_KEY ks;
++    } ks;
++    block128_f block;
++    union {
++        ecb128_f ecb;
++        cbc128_f cbc;
++        ctr128_f ctr;
++    } stream;
+ } EVP_SM4_KEY;
+ 
++# define BLOCK_CIPHER_generic(nid,blocksize,ivlen,nmode,mode,MODE,flags) \
++static const EVP_CIPHER sm4_##mode = { \
++        nid##_##nmode,blocksize,128/8,ivlen, \
++        flags|EVP_CIPH_##MODE##_MODE,   \
++        EVP_ORIG_GLOBAL,                \
++        sm4_init_key,                   \
++        sm4_##mode##_cipher,            \
++        NULL,                           \
++        sizeof(EVP_SM4_KEY),            \
++        NULL,NULL,NULL,NULL }; \
++const EVP_CIPHER *EVP_sm4_##mode(void) \
++{ return &sm4_##mode; }
++
++#define DEFINE_BLOCK_CIPHERS(nid,flags)             \
++        BLOCK_CIPHER_generic(nid,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)     \
++        BLOCK_CIPHER_generic(nid,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)      \
++        BLOCK_CIPHER_generic(nid,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
++        BLOCK_CIPHER_generic(nid,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
++        BLOCK_CIPHER_generic(nid,1,16,ctr,ctr,CTR,flags)
++
+ static int sm4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                         const unsigned char *iv, int enc)
+ {
+-    ossl_sm4_set_key(key, EVP_CIPHER_CTX_get_cipher_data(ctx));
++    int mode;
++    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
++
++    mode = EVP_CIPHER_CTX_get_mode(ctx);
++    if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
++        && !enc) {
++#ifdef HWSM4_CAPABLE
++        if (HWSM4_CAPABLE) {
++            HWSM4_set_decrypt_key(key, &dat->ks.ks);
++            dat->block = (block128_f) HWSM4_decrypt;
++            dat->stream.cbc = NULL;
++# ifdef HWSM4_cbc_encrypt
++            if (mode == EVP_CIPH_CBC_MODE)
++                dat->stream.cbc = (cbc128_f) HWSM4_cbc_encrypt;
++# endif
++# ifdef HWSM4_ecb_encrypt
++            if (mode == EVP_CIPH_ECB_MODE)
++                dat->stream.ecb = (ecb128_f) HWSM4_ecb_encrypt;
++# endif
++        } else
++#endif
++        {
++            dat->block = (block128_f) ossl_sm4_decrypt;
++            ossl_sm4_set_key(key, EVP_CIPHER_CTX_get_cipher_data(ctx));
++        }
++    } else
++#ifdef HWSM4_CAPABLE
++    if (HWSM4_CAPABLE) {

_service:tar_scm:Backport-Skip-the-correct-number-of-tests-if-SM2-is-disabled.patch Deleted

_service:tar_scm:Backport-Support-SM2-certificate-signing.patch Deleted

@@ -1,1189 +0,0 @@
-From 0bacd53ecedfef3ca8af4a8884c46ec8e47c83fa Mon Sep 17 00:00:00 2001
-From: Paul Yang <yang.yang@baishancloud.com>
-Date: Wed, 5 Jun 2019 14:46:48 +0800
-Subject: PATCH 10/15 Support SM2 certificate signing
-
-SM2 certificate signing request can be created and signed by OpenSSL
-now, both in library and apps.
-
-Documentation and test cases are added.
-
-Reviewed-by: Tim Hudson <tjh@openssl.org>
-Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
-(Merged from https://github.com/openssl/openssl/pull/9085)
----
- CHANGES                             |   3 +
- apps/ca.c                           |  68 ++++++++++++-
- apps/req.c                          | 149 ++++++++++++++++++++++++++--
- crypto/asn1/a_sign.c                |  13 ++-
- crypto/ec/ec_pmeth.c                |   3 +-
- crypto/err/openssl.txt              |   3 +
- crypto/x509/x509_err.c              |   4 +
- crypto/x509/x_all.c                 |  85 ++++++++++++----
- crypto/x509/x_req.c                 |  38 ++++++-
- crypto/x509/x_x509.c                |   3 +
- doc/man1/ca.pod                     |  16 +++
- doc/man1/req.pod                    |  21 ++++
- doc/man3/X509_get0_sm2_id.pod       |  12 ++-
- include/crypto/x509.h               |   3 +
- include/openssl/x509.h              |   2 +
- include/openssl/x509err.h           |   3 +
- test/certs/sm2-csr.pem              |   9 ++
- test/certs/sm2-root.crt             |  14 +++
- test/certs/sm2-root.key             |   5 +
- test/recipes/25-test_req.t          |  21 +++-
- test/recipes/70-test_verify_extra.t |   3 +-
- test/recipes/80-test_ca.t           |  20 +++-
- test/verify_extra_test.c            |  45 ++++++++-
- util/libcrypto.num                  |   2 +
- 24 files changed, 501 insertions(+), 44 deletions(-)
- create mode 100644 test/certs/sm2-csr.pem
- create mode 100644 test/certs/sm2-root.crt
- create mode 100644 test/certs/sm2-root.key
-
-diff --git a/CHANGES b/CHANGES
-index 9d58cb0..6ab70fe 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -9,6 +9,9 @@
- 
-  Changes between 1.1.1l and 1.1.1m 14 Dec 2021
- 
-+  *) Support SM2 signing and verification schemes with X509 certificate.
-+     Paul Yang
-+
-   *) Avoid loading of a dynamic engine twice.
- 
-      Bernd Edlinger
-diff --git a/apps/ca.c b/apps/ca.c
-index 390ac37..795ee2c 100755
---- a/apps/ca.c
-+++ b/apps/ca.c
-@@ -96,7 +96,8 @@ static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
-                    const char *enddate,
-                    long days, int batch, const char *ext_sect, CONF *conf,
-                    int verbose, unsigned long certopt, unsigned long nameopt,
--                   int default_op, int ext_copy, int selfsign);
-+                   int default_op, int ext_copy, int selfsign,
-+                   unsigned char *sm2_id, size_t sm2idlen);
- static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
-                         const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
-                         STACK_OF(CONF_VALUE) *policy, CA_DB *db,
-@@ -147,7 +148,7 @@ typedef enum OPTION_choice {
-     OPT_INFILES, OPT_SS_CERT, OPT_SPKAC, OPT_REVOKE, OPT_VALID,
-     OPT_EXTENSIONS, OPT_EXTFILE, OPT_STATUS, OPT_UPDATEDB, OPT_CRLEXTS,
-     OPT_RAND_SERIAL,
--    OPT_R_ENUM,
-+    OPT_R_ENUM, OPT_SM2ID, OPT_SM2HEXID,
-     /* Do not change the order here; see related case statements below */
-     OPT_CRL_REASON, OPT_CRL_HOLD, OPT_CRL_COMPROMISE, OPT_CRL_CA_COMPROMISE
- } OPTION_CHOICE;
-@@ -217,6 +218,12 @@ const OPTIONS ca_options = {
-     OPT_R_OPTIONS,
- #ifndef OPENSSL_NO_ENGINE
-     {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
-+#endif
-+#ifndef OPENSSL_NO_SM2
-+    {"sm2-id", OPT_SM2ID, 's',
-+     "Specify an ID string to verify an SM2 certificate request"},
-+    {"sm2-hex-id", OPT_SM2HEXID, 's',
-+     "Specify a hex ID string to verify an SM2 certificate request"},
- #endif
-     {NULL}
- };
-@@ -262,6 +269,9 @@ int ca_main(int argc, char **argv)
-     REVINFO_TYPE rev_type = REV_NONE;
-     X509_REVOKED *r = NULL;
-     OPTION_CHOICE o;
-+    unsigned char *sm2_id = NULL;
-+    size_t sm2_idlen = 0;
-+    int sm2_free = 0;
- 
-     prog = opt_init(argc, argv, ca_options);
-     while ((o = opt_next()) != OPT_EOF) {
-@@ -425,6 +435,30 @@ opthelp:
-         case OPT_ENGINE:
-             e = setup_engine(opt_arg(), 0);
-             break;
-+        case OPT_SM2ID:
-+            /* we assume the input is not a hex string */
-+            if (sm2_id != NULL) {
-+                BIO_printf(bio_err,
-+                           "Use one of the options 'sm2-hex-id' or 'sm2-id'\n");
-+                goto end;
-+            }
-+            sm2_id = (unsigned char *)opt_arg();
-+            sm2_idlen = strlen((const char *)sm2_id);
-+            break;
-+        case OPT_SM2HEXID:
-+            /* try to parse the input as hex string first */
-+            if (sm2_id != NULL) {
-+                BIO_printf(bio_err,
-+                           "Use one of the options 'sm2-hex-id' or 'sm2-id'\n");
-+                goto end;
-+            }
-+            sm2_free = 1;
-+            sm2_id = OPENSSL_hexstr2buf(opt_arg(), (long *)&sm2_idlen);
-+            if (sm2_id == NULL) {
-+                BIO_printf(bio_err, "Invalid hex string input\n");
-+                goto end;
-+            }
-+            break;
-         }
-     }
- end_of_options:
-@@ -913,7 +947,8 @@ end_of_options:
-             j = certify(&x, infile, pkey, x509p, dgst, sigopts, attribs, db,
-                         serial, subj, chtype, multirdn, email_dn, startdate,
-                         enddate, days, batch, extensions, conf, verbose,
--                        certopt, get_nameopt(), default_op, ext_copy, selfsign);
-+                        certopt, get_nameopt(), default_op, ext_copy, selfsign,
-+                        sm2_id, sm2_idlen);
-             if (j < 0)
-                 goto end;
-             if (j > 0) {
-@@ -932,7 +967,8 @@ end_of_options:
-             j = certify(&x, argvi, pkey, x509p, dgst, sigopts, attribs, db,
-                         serial, subj, chtype, multirdn, email_dn, startdate,
-                         enddate, days, batch, extensions, conf, verbose,
--                        certopt, get_nameopt(), default_op, ext_copy, selfsign);
-+                        certopt, get_nameopt(), default_op, ext_copy, selfsign,
-+                        sm2_id, sm2_idlen);
-             if (j < 0)
-                 goto end;
-             if (j > 0) {
-@@ -1230,6 +1266,8 @@ end_of_options:
-     ret = 0;
- 
-  end:
-+    if (sm2_free)
-+        OPENSSL_free(sm2_id);
-     if (ret)
-         ERR_print_errors(bio_err);
-     BIO_free_all(Sout);
-@@ -1268,7 +1306,8 @@ static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
-                    const char *enddate,
-                    long days, int batch, const char *ext_sect, CONF *lconf,
-                    int verbose, unsigned long certopt, unsigned long nameopt,
--                   int default_op, int ext_copy, int selfsign)
-+                   int default_op, int ext_copy, int selfsign,
-+                   unsigned char *sm2id, size_t sm2idlen)
- {
-     X509_REQ *req = NULL;
-     BIO *in = NULL;
-@@ -1300,6 +1339,25 @@ static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
-         BIO_printf(bio_err, "error unpacking public key\n");
-         goto end;
-     }
-+    if (sm2id != NULL) {
-+#ifndef OPENSSL_NO_SM2
-+        ASN1_OCTET_STRING *v;
-+
-+        v = ASN1_OCTET_STRING_new();
-+        if (v == NULL) {
-+            BIO_printf(bio_err, "error: SM2 ID allocation failed\n");
-+            goto end;
-+        }
-+
-+        if (!ASN1_OCTET_STRING_set(v, sm2id, sm2idlen)) {
-+            BIO_printf(bio_err, "error: setting SM2 ID failed\n");
-+            ASN1_OCTET_STRING_free(v);
-+            goto end;
-+        }
-+
-+        X509_REQ_set0_sm2_id(req, v);
-+#endif
-+    }
-     i = X509_REQ_verify(req, pktmp);
-     pktmp = NULL;
-     if (i < 0) {

_service:tar_scm:Backport-Support-SM2-certificate-verification.patch Deleted

@@ -1,579 +0,0 @@
-From 7d86ccd1282aeff8f6d564c5d37625ffcc048f2d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E6=9D=A8=E6=B4=8B?= <yang.yang@baishancloud.com>
-Date: Fri, 26 Oct 2018 21:34:08 +0800
-Subject: PATCH 03/15 Support SM2 certificate verification
-
-Reviewed-by: Tim Hudson <tjh@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/8321)
----
- apps/verify.c               |  45 +++++++++++++--
- crypto/asn1/a_verify.c      |   3 +-
- crypto/err/openssl.txt      |   2 +
- crypto/objects/obj_dat.h    |  17 ++++--
- crypto/objects/obj_mac.num  |   1 +
- crypto/objects/obj_xref.h   |   4 +-
- crypto/objects/obj_xref.txt |   2 +
- crypto/objects/objects.txt  |   2 +
- crypto/x509/x509_err.c      |   2 +
- crypto/x509/x_all.c         | 110 ++++++++++++++++++++++++++++++++++++
- crypto/x509/x_x509.c        |  12 ++++
- fuzz/oids.txt               |   1 +
- include/crypto/x509.h       |   5 +-
- include/openssl/obj_mac.h   |   7 ++-
- include/openssl/x509.h      |   3 +
- include/openssl/x509err.h   |   2 +
- util/libcrypto.num          |   2 +
- 17 files changed, 204 insertions(+), 16 deletions(-)
-
-diff --git a/apps/verify.c b/apps/verify.c
-index 1f93856..09b31cf 100644
---- a/apps/verify.c
-+++ b/apps/verify.c
-@@ -21,7 +21,8 @@
- static int cb(int ok, X509_STORE_CTX *ctx);
- static int check(X509_STORE *ctx, const char *file,
-                  STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
--                 STACK_OF(X509_CRL) *crls, int show_chain);
-+                 STACK_OF(X509_CRL) *crls, int show_chain,
-+                 unsigned char *sm2id, size_t sm2idlen);
- static int v_verbose = 0, vflags = 0;
- 
- typedef enum OPTION_choice {
-@@ -29,7 +30,7 @@ typedef enum OPTION_choice {
-     OPT_ENGINE, OPT_CAPATH, OPT_CAFILE, OPT_NOCAPATH, OPT_NOCAFILE,
-     OPT_UNTRUSTED, OPT_TRUSTED, OPT_CRLFILE, OPT_CRL_DOWNLOAD, OPT_SHOW_CHAIN,
-     OPT_V_ENUM, OPT_NAMEOPT,
--    OPT_VERBOSE
-+    OPT_VERBOSE, OPT_SM2ID, OPT_SM2HEXID
- } OPTION_CHOICE;
- 
- const OPTIONS verify_options = {
-@@ -56,6 +57,12 @@ const OPTIONS verify_options = {
-     OPT_V_OPTIONS,
- #ifndef OPENSSL_NO_ENGINE
-     {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
-+#endif
-+#ifndef OPENSSL_NO_SM2
-+    {"sm2-id", OPT_SM2ID, 's',
-+     "Specify an ID string to verify an SM2 certificate"},
-+    {"sm2-hex-id", OPT_SM2HEXID, 's',
-+     "Specify a hex ID string to verify an SM2 certificate"},
- #endif
-     {NULL}
- };
-@@ -71,6 +78,8 @@ int verify_main(int argc, char **argv)
-     int noCApath = 0, noCAfile = 0;
-     int vpmtouched = 0, crl_download = 0, show_chain = 0, i = 0, ret = 1;
-     OPTION_CHOICE o;
-+    unsigned char *sm2_id = NULL;
-+    size_t sm2_idlen = 0;
- 
-     if ((vpm = X509_VERIFY_PARAM_new()) == NULL)
-         goto end;
-@@ -158,6 +167,19 @@ int verify_main(int argc, char **argv)
-         case OPT_VERBOSE:
-             v_verbose = 1;
-             break;
-+        case OPT_SM2ID:
-+            /* we assume the input is not a hex string */
-+            sm2_id = (unsigned char *)opt_arg();
-+            sm2_idlen = strlen((const char *)sm2_id);
-+            break;
-+        case OPT_SM2HEXID:
-+            /* try to parse the input as hex string first */
-+            sm2_id = OPENSSL_hexstr2buf(opt_arg(), (long *)&sm2_idlen);
-+            if (sm2_id == NULL) {
-+                BIO_printf(bio_err, "Invalid hex string input\n");
-+                goto end;
-+            }
-+            break;
-         }
-     }
-     argc = opt_num_rest();
-@@ -183,12 +205,13 @@ int verify_main(int argc, char **argv)
- 
-     ret = 0;
-     if (argc < 1) {
--        if (check(store, NULL, untrusted, trusted, crls, show_chain) != 1)
-+        if (check(store, NULL, untrusted, trusted, crls, show_chain,
-+                  sm2_id, sm2_idlen) != 1)
-             ret = -1;
-     } else {
-         for (i = 0; i < argc; i++)
-             if (check(store, argvi, untrusted, trusted, crls,
--                      show_chain) != 1)
-+                      show_chain, sm2_id, sm2_idlen) != 1)
-                 ret = -1;
-     }
- 
-@@ -204,7 +227,8 @@ int verify_main(int argc, char **argv)
- 
- static int check(X509_STORE *ctx, const char *file,
-                  STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
--                 STACK_OF(X509_CRL) *crls, int show_chain)
-+                 STACK_OF(X509_CRL) *crls, int show_chain,
-+                 unsigned char *sm2id, size_t sm2idlen)
- {
-     X509 *x = NULL;
-     int i = 0, ret = 0;
-@@ -216,6 +240,17 @@ static int check(X509_STORE *ctx, const char *file,
-     if (x == NULL)
-         goto end;
- 
-+    if (sm2id != NULL) {
-+#ifndef OPENSSL_NO_SM2
-+        ASN1_OCTET_STRING v;
-+
-+        v.data = sm2id;
-+        v.length = sm2idlen;
-+
-+        X509_set_sm2_id(x, &v);
-+#endif
-+    }
-+
-     csc = X509_STORE_CTX_new();
-     if (csc == NULL) {
-         printf("error %s: X.509 store context allocation failed\n",
-diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
-index 4b5f542..f543aa1 100644
---- a/crypto/asn1/a_verify.c
-+++ b/crypto/asn1/a_verify.c
-@@ -94,7 +94,7 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
-     int mdnid, pknid;
-     size_t inll = 0;
- 
--    if (!pkey) {
-+    if (pkey == NULL) {
-         ASN1err(ASN1_F_ASN1_ITEM_VERIFY, ERR_R_PASSED_NULL_PARAMETER);
-         return -1;
-     }
-@@ -150,7 +150,6 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
-             ret = 0;
-             goto err;
-         }
--
-     }
- 
-     inl = ASN1_item_i2d(asn, &buf_in, it);
-diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
-index 902e97b..5e71e65 100644
---- a/crypto/err/openssl.txt
-+++ b/crypto/err/openssl.txt
-@@ -1766,8 +1766,10 @@ X509_F_X509_STORE_NEW:158:X509_STORE_new
- X509_F_X509_TO_X509_REQ:126:X509_to_X509_REQ
- X509_F_X509_TRUST_ADD:133:X509_TRUST_add
- X509_F_X509_TRUST_SET:141:X509_TRUST_set
-+X509_F_X509_VERIFY:161:X509_verify
- X509_F_X509_VERIFY_CERT:127:X509_verify_cert
- X509_F_X509_VERIFY_PARAM_NEW:159:X509_VERIFY_PARAM_new
-+X509_F_X509_VERIFY_SM2:162:x509_verify_sm2
- 
- #Reason codes
- ASN1_R_ADDING_OBJECT:171:adding object
-diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
-index 24b49a2..eb4cce4 100644
---- a/crypto/objects/obj_dat.h
-+++ b/crypto/objects/obj_dat.h
-@@ -2,7 +2,7 @@
-  * WARNING: do not edit!
-  * Generated by crypto/objects/obj_dat.pl
-  *
-- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
-+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
-  * Licensed under the OpenSSL license (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
-@@ -10,7 +10,7 @@
-  */
- 
- /* Serialized OID's */
--static const unsigned char so7762 = {
-+static const unsigned char so7770 = {
-     0x2A,0x86,0x48,0x86,0xF7,0x0D,                 /*     0 OBJ_rsadsi */
-     0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,            /*     6 OBJ_pkcs */
-     0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02,       /*    13 OBJ_md2 */
-@@ -1076,9 +1076,10 @@ static const unsigned char so7762 = {
-     0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x04,  /*  7736 OBJ_id_tc26_gost_3410_2012_256_paramSetD */
-     0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0C,       /*  7745 OBJ_hmacWithSHA512_224 */
-     0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0D,       /*  7753 OBJ_hmacWithSHA512_256 */
-+    0x2A,0x81,0x1C,0xCF,0x55,0x01,0x83,0x75,       /*  7761 OBJ_SM2_with_SM3 */

_service:tar_scm:Backport-Support-parsing-of-SM2-ID-in-hexdecimal.patch Deleted

@@ -1,127 +0,0 @@
-From 1d9e832e41858b13a96899d842afd183f1c66c48 Mon Sep 17 00:00:00 2001
-From: Paul Yang <kaishen.yy@antfin.com>
-Date: Tue, 30 Jul 2019 23:05:44 +0800
-Subject: PATCH 11/15 Support parsing of SM2 ID in hexdecimal
-
-The current EVP_PEKY_ctrl for SM2 has no capability of parsing an ID
-input in hexdecimal.
-
-The newly added ctrl string is called: sm2_hex_id
-
-Test cases and documentation are updated.
-
-Reviewed-by: Tim Hudson <tjh@openssl.org>
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/9584)
----
- crypto/sm2/sm2_pmeth.c     | 19 +++++++++++++++++++
- doc/man1/pkeyutl.pod       |  7 +++++++
- include/openssl/ec.h       |  1 -
- test/recipes/25-test_req.t | 15 +++++++++++++--
- 4 files changed, 39 insertions(+), 3 deletions(-)
-
-diff --git a/crypto/sm2/sm2_pmeth.c b/crypto/sm2/sm2_pmeth.c
-index 837bdc1..9551d70 100644
---- a/crypto/sm2/sm2_pmeth.c
-+++ b/crypto/sm2/sm2_pmeth.c
-@@ -232,6 +232,10 @@ static int pkey_sm2_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
- static int pkey_sm2_ctrl_str(EVP_PKEY_CTX *ctx,
-                              const char *type, const char *value)
- {
-+    uint8_t *hex_id;
-+    long hex_len = 0;
-+    int ret = 0;
-+
-     if (strcmp(type, "ec_paramgen_curve") == 0) {
-         int nid = NID_undef;
- 
-@@ -255,6 +259,21 @@ static int pkey_sm2_ctrl_str(EVP_PKEY_CTX *ctx,
-     } else if (strcmp(type, "sm2_id") == 0) {
-         return pkey_sm2_ctrl(ctx, EVP_PKEY_CTRL_SET1_ID,
-                              (int)strlen(value), (void *)value);
-+    } else if (strcmp(type, "sm2_hex_id") == 0) {
-+        /*
-+         * TODO(3.0): reconsider the name "sm2_hex_id", OR change
-+         * OSSL_PARAM_construct_from_text() / OSSL_PARAM_allocate_from_text()
-+         * to handle infix "_hex_"
-+         */
-+        hex_id = OPENSSL_hexstr2buf((const char *)value, &hex_len);
-+        if (hex_id == NULL) {
-+            SM2err(SM2_F_PKEY_SM2_CTRL_STR, ERR_R_PASSED_INVALID_ARGUMENT);
-+            return 0;
-+        }
-+        ret = pkey_sm2_ctrl(ctx, EVP_PKEY_CTRL_SET1_ID, (int)hex_len,
-+                            (void *)hex_id);
-+        OPENSSL_free(hex_id);
-+        return ret;
-     }
- 
-     return -2;
-diff --git a/doc/man1/pkeyutl.pod b/doc/man1/pkeyutl.pod
-index f0f80af..1a742ab 100644
---- a/doc/man1/pkeyutl.pod
-+++ b/doc/man1/pkeyutl.pod
-@@ -329,6 +329,13 @@ This sets the ID string used in SM2 sign or verify operations. While verifying
- an SM2 signature, the ID string must be the same one used when signing the data.
- Otherwise the verification will fail.
- 
-+=item B<sm2_hex_id:hex_string>
-+
-+This sets the ID string used in SM2 sign or verify operations. While verifying
-+an SM2 signature, the ID string must be the same one used when signing the data.
-+Otherwise the verification will fail. The ID string provided with this option
-+should be a valid hexadecimal value.
-+
- =back
- 
- =head1 EXAMPLES
-diff --git a/include/openssl/ec.h b/include/openssl/ec.h
-index 24baf53..e8c8869 100644
---- a/include/openssl/ec.h
-+++ b/include/openssl/ec.h
-@@ -1444,7 +1444,6 @@ void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
- # define EVP_PKEY_CTX_set1_id(ctx, id, id_len) \
-         EVP_PKEY_CTX_ctrl(ctx, -1, -1, \
-                                 EVP_PKEY_CTRL_SET1_ID, (int)id_len, (void*)(id))
--
- # define EVP_PKEY_CTX_get1_id(ctx, id) \
-         EVP_PKEY_CTX_ctrl(ctx, -1, -1, \
-                                 EVP_PKEY_CTRL_GET1_ID, 0, (void*)(id))
-diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t
-index 8289959..d53e577 100644
---- a/test/recipes/25-test_req.t
-+++ b/test/recipes/25-test_req.t
-@@ -182,10 +182,10 @@ subtest "generating certificate requests" => sub {
- };
- 
- subtest "generating SM2 certificate requests" => sub {
--    plan tests => 2;
-+    plan tests => 4;
- 
-     SKIP: {
--        skip "SM2 is not supported by this OpenSSL build", 2
-+        skip "SM2 is not supported by this OpenSSL build", 4
-         if disabled("sm2");
-         ok(run(app("openssl", "req", "-config", srctop_file("test", "test.cnf"),
-                     "-new", "-key", srctop_file("test", "certs", "sm2.key"),
-@@ -197,6 +197,17 @@ subtest "generating SM2 certificate requests" => sub {
-                     "-verify", "-in", "testreq.pem", "-noout",
-                     "-sm2-id", "1234567812345678", "-sm3")),
-            "Verifying signature on SM2 certificate request");
-+
-+        ok(run(app("openssl", "req", "-config", srctop_file("test", "test.cnf"),
-+                    "-new", "-key", srctop_file("test", "certs", "sm2.key"),
-+                    "-sigopt", "sm2_hex_id:DEADBEEF",
-+                    "-out", "testreq.pem", "-sm3")),
-+           "Generating SM2 certificate request with hex id");
-+
-+        ok(run(app("openssl", "req", "-config", srctop_file("test", "test.cnf"),
-+                    "-verify", "-in", "testreq.pem", "-noout",
-+                    "-sm2-hex-id", "DEADBEEF", "-sm3")),
-+           "Verifying signature on SM2 certificate request");
-     }
- };
- 
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:Backport-Support-raw-input-data-in-apps-pkeyutl.patch Deleted

@@ -1,482 +0,0 @@
-From b14bf717ccb166cce13173a817106effb02f6c2e Mon Sep 17 00:00:00 2001
-From: Paul Yang <yang.yang@baishancloud.com>
-Date: Wed, 16 Jan 2019 16:16:28 +0800
-Subject: PATCH 01/15 Support raw input data in apps/pkeyutl
-
-Some signature algorithms require special treatment for digesting, such
-as SM2. This patch adds the ability of handling raw input data in
-apps/pkeyutl other than accepting only pre-hashed input data.
-
-Beside, SM2 requries an ID string when signing or verifying a piece of data,
-this patch also adds the ability for apps/pkeyutil to specify that ID
-string.
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/8186)
----
- apps/pkeyutl.c                 | 168 +++++++++++++++++++++++++++++----
- crypto/sm2/sm2_pmeth.c         |   3 +
- doc/man1/pkeyutl.pod           |  45 +++++++++
- test/certs/sm2.crt             |  13 +++
- test/certs/sm2.key             |   5 +
- test/recipes/20-test_pkeyutl.t |  43 +++++++++
- 6 files changed, 260 insertions(+), 17 deletions(-)
- create mode 100644 test/certs/sm2.crt
- create mode 100644 test/certs/sm2.key
- create mode 100644 test/recipes/20-test_pkeyutl.t
-
-diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
-index 831e14d..bca0464 100644
---- a/apps/pkeyutl.c
-+++ b/apps/pkeyutl.c
-@@ -22,7 +22,7 @@
- static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
-                               const char *keyfile, int keyform, int key_type,
-                               char *passinarg, int pkey_op, ENGINE *e,
--                              const int impl);
-+                              const int impl, EVP_PKEY **ppkey);
- 
- static int setup_peer(EVP_PKEY_CTX *ctx, int peerform, const char *file,
-                       ENGINE *e);
-@@ -31,6 +31,11 @@ static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
-                     unsigned char *out, size_t *poutlen,
-                     const unsigned char *in, size_t inlen);
- 
-+static int do_raw_keyop(int pkey_op, EVP_PKEY_CTX *ctx,
-+                        const EVP_MD *md, EVP_PKEY *pkey, BIO *in,
-+                        unsigned char *sig, int siglen,
-+                        unsigned char **out, size_t *poutlen);
-+
- typedef enum OPTION_choice {
-     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
-     OPT_ENGINE, OPT_ENGINE_IMPL, OPT_IN, OPT_OUT,
-@@ -38,12 +43,15 @@ typedef enum OPTION_choice {
-     OPT_VERIFY, OPT_VERIFYRECOVER, OPT_REV, OPT_ENCRYPT, OPT_DECRYPT,
-     OPT_DERIVE, OPT_SIGFILE, OPT_INKEY, OPT_PEERKEY, OPT_PASSIN,
-     OPT_PEERFORM, OPT_KEYFORM, OPT_PKEYOPT, OPT_KDF, OPT_KDFLEN,
--    OPT_R_ENUM
-+    OPT_R_ENUM, OPT_RAWIN, OPT_DIGEST
- } OPTION_CHOICE;
- 
- const OPTIONS pkeyutl_options = {
-     {"help", OPT_HELP, '-', "Display this summary"},
-     {"in", OPT_IN, '<', "Input file - default stdin"},
-+    {"rawin", OPT_RAWIN, '-', "Indicate the input data is in raw form"},
-+    {"digest", OPT_DIGEST, 's',
-+     "Specify the digest algorithm when signing the raw input data"},
-     {"out", OPT_OUT, '>', "Output file - default stdout"},
-     {"pubin", OPT_PUBIN, '-', "Input is a public key"},
-     {"certin", OPT_CERTIN, '-', "Input is a cert with a public key"},
-@@ -80,6 +88,7 @@ int pkeyutl_main(int argc, char **argv)
-     BIO *in = NULL, *out = NULL;
-     ENGINE *e = NULL;
-     EVP_PKEY_CTX *ctx = NULL;
-+    EVP_PKEY *pkey = NULL;
-     char *infile = NULL, *outfile = NULL, *sigfile = NULL, *passinarg = NULL;
-     char hexdump = 0, asn1parse = 0, rev = 0, *prog;
-     unsigned char *buf_in = NULL, *buf_out = NULL, *sig = NULL;
-@@ -94,6 +103,8 @@ int pkeyutl_main(int argc, char **argv)
-     const char *kdfalg = NULL;
-     int kdflen = 0;
-     STACK_OF(OPENSSL_STRING) *pkeyopts = NULL;
-+    int rawin = 0;
-+    const EVP_MD *md = NULL;
- 
-     prog = opt_init(argc, argv, pkeyutl_options);
-     while ((o = opt_next()) != OPT_EOF) {
-@@ -192,12 +203,39 @@ int pkeyutl_main(int argc, char **argv)
-                 goto end;
-             }
-             break;
-+        case OPT_RAWIN:
-+            rawin = 1;
-+            break;
-+        case OPT_DIGEST:
-+            if (!opt_md(opt_arg(), &md))
-+                goto end;
-+            break;
-         }
-     }
-     argc = opt_num_rest();
-     if (argc != 0)
-         goto opthelp;
- 
-+    if (rawin && pkey_op != EVP_PKEY_OP_SIGN && pkey_op != EVP_PKEY_OP_VERIFY) {
-+        BIO_printf(bio_err,
-+                   "%s: -rawin can only be used with -sign or -verify\n",
-+                   prog);
-+        goto opthelp;
-+    }
-+
-+    if (md != NULL && !rawin) {
-+        BIO_printf(bio_err,
-+                   "%s: -digest can only be used with -rawin\n",
-+                   prog);
-+        goto opthelp;
-+    }
-+
-+    if (rawin && rev) {
-+        BIO_printf(bio_err, "%s: -rev cannot be used with raw input\n",
-+                   prog);
-+        goto opthelp;
-+    }
-+
-     if (kdfalg != NULL) {
-         if (kdflen == 0) {
-             BIO_printf(bio_err,
-@@ -214,7 +252,7 @@ int pkeyutl_main(int argc, char **argv)
-         goto opthelp;
-     }
-     ctx = init_ctx(kdfalg, &keysize, inkey, keyform, key_type,
--                   passinarg, pkey_op, e, engine_impl);
-+                   passinarg, pkey_op, e, engine_impl, &pkey);
-     if (ctx == NULL) {
-         BIO_printf(bio_err, "%s: Error initializing context\n", prog);
-         ERR_print_errors(bio_err);
-@@ -277,7 +315,8 @@ int pkeyutl_main(int argc, char **argv)
-         }
-     }
- 
--    if (in != NULL) {
-+    /* Raw input data is handled elsewhere */
-+    if (in != NULL && !rawin) {
-         /* Read the input data */
-         buf_inlen = bio_to_mem(&buf_in, keysize * 10, in);
-         if (buf_inlen < 0) {
-@@ -296,8 +335,9 @@ int pkeyutl_main(int argc, char **argv)
-         }
-     }
- 
--    /* Sanity check the input */
--    if (buf_inlen > EVP_MAX_MD_SIZE
-+    /* Sanity check the input if the input is not raw */
-+    if (!rawin
-+            && buf_inlen > EVP_MAX_MD_SIZE
-             && (pkey_op == EVP_PKEY_OP_SIGN
-                 || pkey_op == EVP_PKEY_OP_VERIFY)) {
-         BIO_printf(bio_err,
-@@ -306,8 +346,13 @@ int pkeyutl_main(int argc, char **argv)
-     }
- 
-     if (pkey_op == EVP_PKEY_OP_VERIFY) {
--        rv = EVP_PKEY_verify(ctx, sig, (size_t)siglen,
--                             buf_in, (size_t)buf_inlen);
-+        if (rawin) {
-+            rv = do_raw_keyop(pkey_op, ctx, md, pkey, in, sig, siglen,
-+                              NULL, 0);
-+        } else {
-+            rv = EVP_PKEY_verify(ctx, sig, (size_t)siglen,
-+                                 buf_in, (size_t)buf_inlen);
-+        }
-         if (rv == 1) {
-             BIO_puts(out, "Signature Verified Successfully\n");
-             ret = 0;
-@@ -320,14 +365,20 @@ int pkeyutl_main(int argc, char **argv)
-         buf_outlen = kdflen;
-         rv = 1;
-     } else {
--        rv = do_keyop(ctx, pkey_op, NULL, (size_t *)&buf_outlen,
--                      buf_in, (size_t)buf_inlen);
--    }
--    if (rv > 0 && buf_outlen != 0) {
--        buf_out = app_malloc(buf_outlen, "buffer output");
--        rv = do_keyop(ctx, pkey_op,
--                      buf_out, (size_t *)&buf_outlen,
--                      buf_in, (size_t)buf_inlen);
-+        if (rawin) {
-+            /* rawin allocates the buffer in do_raw_keyop() */
-+            rv = do_raw_keyop(pkey_op, ctx, md, pkey, in, NULL, 0,
-+                              &buf_out, (size_t *)&buf_outlen);
-+        } else {
-+            rv = do_keyop(ctx, pkey_op, NULL, (size_t *)&buf_outlen,
-+                          buf_in, (size_t)buf_inlen);
-+            if (rv > 0 && buf_outlen != 0) {
-+                buf_out = app_malloc(buf_outlen, "buffer output");
-+                rv = do_keyop(ctx, pkey_op,
-+                              buf_out, (size_t *)&buf_outlen,
-+                              buf_in, (size_t)buf_inlen);
-+            }
-+        }

_service:tar_scm:Backport-Update-expired-SCT-certificates.patch Deleted

@@ -1,191 +0,0 @@
-From acb105a848fd0a282550f6132dc131575cc5a655 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tomas@openssl.org>
-Date: Wed, 1 Jun 2022 12:47:44 +0200
-Subject: PATCH 14/15 Update expired SCT certificates
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
-(Merged from https://github.com/openssl/openssl/pull/18446)
----
- test/certs/embeddedSCTs1-key.pem        | 38 ++++++++++++++++---------
- test/certs/embeddedSCTs1.pem            | 35 ++++++++++++-----------
- test/certs/embeddedSCTs1.sct            | 12 ++++----
- test/certs/embeddedSCTs1_issuer-key.pem | 15 ++++++++++
- test/certs/embeddedSCTs1_issuer.pem     | 30 +++++++++----------
- 5 files changed, 79 insertions(+), 51 deletions(-)
- create mode 100644 test/certs/embeddedSCTs1_issuer-key.pem
-
-diff --git a/test/certs/embeddedSCTs1-key.pem b/test/certs/embeddedSCTs1-key.pem
-index e3e66d5..28dd206 100644
---- a/test/certs/embeddedSCTs1-key.pem
-+++ b/test/certs/embeddedSCTs1-key.pem
-@@ -1,15 +1,27 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIICWwIBAAKBgQC+75jnwmh3rjhfdTJaDB0ym+3xj6r015a/BH634c4VyVui+A7k
--WL19uG+KSyUhkaeb1wDDjpwDibRc1NyaEgqyHgy0HNDnKAWkEM2cW9tdSSdyba8X
--EPYBhzd+olsaHjnu0LiBGdwVTcaPfajjDK8VijPmyVCfSgWwFAn/Xdh+tQIDAQAB
--AoGAK/daG0vt6Fkqy/hdrtSJSKUVRoGRmS2nnba4Qzlwzh1+x2kdbMFuaOu2a37g
--PvmeQclheKZ3EG1+Jb4yShwLcBCV6pkRJhOKuhvqGnjngr6uBH4gMCjpZVj7GDMf
--flYHhdJCs3Cz/TY0wKN3o1Fldil2DHR/AEOc1nImeSp5/EUCQQDjKS3W957kYtTU
--X5BeRjvg03Ug8tJq6IFuhTFvUJ+XQ5bAc0DmxAbQVKqRS7Wje59zTknVvS+MFdeQ
--pz4dGuV7AkEA1y0X2yarIls+0A/S1uwkvwRTIkfS+QwFJ1zVya8sApRdKAcidIzA
--b70hkKLilU9+LrXg5iZdFp8l752qJiw9jwJAXjItN/7mfH4fExGto+or2kbVQxxt
--9LcFNPc2UJp2ExuL37HrL8YJrUnukOF8KJaSwBWuuFsC5GwKP4maUCdfEQJAUwBR
--83c3DEmmMRvpeH4erpA8gTyzZN3+HvDwhpvLnjMcvBQEdnDUykVqbSBnxrCjO+Fs
--n1qtDczWFVf8Cj2GgQJAQ14Awx32Cn9sF+3M+sEVtlAf6CqiEbkYeYdSCbsplMmZ
--1UoaxiwXY3z+B7epsRnnPR3KaceAlAxw2/zQJMFNOQ==
-+MIIEpQIBAAKCAQEAuIjpA4/iCpDA2mjywI5zG6IBX6bNcRQYDsB7Cv0VonNXtJBw
-+XxMENP4jVpvEmWpJ5iMBknGHV+XWBkngYapczIsY4LGn6aMU6ySABBVQpNOQSRfT
-+48xGGPR9mzOBG/yplmpFOVq1j+b65lskvAXKYaLFpFn3oY/pBSdcCNBP8LypVXAJ
-+b3IqEXsBL/ErgHG9bgIRP8VxBAaryCz77kLzAXkfHL2LfSGIfNONyEKB3xI94S4L
-+eouOSoWL1VkEfJs87vG4G5xoXw3KOHyiueQUUlMnu8p+Bx0xPVKPEsLje3R9k0rG
-+a5ca7dXAn9UypKKp25x4NXpnjGX5txVEYfNvqQIDAQABAoIBAE0zqhh9Z5n3+Vbm
-+tTht4CZdXqm/xQ9b0rzJNjDgtN5j1vuJuhlsgUQSVoJzZIqydvw7BPtZV8AkPagf
-+3Cm/9lb0kpHegVsziRrfCFes+zIZ+LE7sMAKxADIuIvnvkoRKHnvN8rI8lCj16/r
-+zbCD06mJSZp6sSj8ZgZr8wsU63zRGt1TeGM67uVW4agphfzuKGlXstPLsSMwknpF
-+nxFS2TYbitxa9oH76oCpEk5fywYsYgUP4TdzOzfVAgMzNSu0FobvWl0CECB+G3RQ
-+XQ5VWbYkFoj5XbE5kYz6sYHMQWL1NQpglUp+tAQ1T8Nca0CvbSpD77doRGm7UqYw
-+ziVQKokCgYEA6BtHwzyD1PHdAYtOcy7djrpnIMaiisSxEtMhctoxg8Vr2ePEvMpZ
-+S1ka8A1Pa9GzjaUk+VWKWsTf+VkmMHGtpB1sv8S7HjujlEmeQe7p8EltjstvLDmi
-+BhAA7ixvZpXXjQV4GCVdUVu0na6gFGGueZb2FHEXB8j1amVwleJj2lcCgYEAy4f3
-+2wXqJfz15+YdJPpG9BbH9d/plKJm5ID3p2ojAGo5qvVuIJMNJA4elcfHDwzCWVmn
-+MtR/WwtxYVVmy1BAnmk6HPSYc3CStvv1800vqN3fyJWtZ1P+8WBVZWZzIQdjdiaU
-+JSRevPnjQGc+SAZQQIk1yVclbz5790yuXsdIxf8CgYEApqlABC5lsvfga4Vt1UMn
-+j57FAkHe4KmPRCcZ83A88ZNGd/QWhkD9kR7wOsIz7wVqWiDkxavoZnjLIi4jP9HA
-+jwEZ3zER8wl70bRy0IEOtZzj8A6fSzAu6Q+Au4RokU6yse3lZ+EcepjQvhBvnXLu
-+ZxxAojj6AnsHzVf9WYJvlI0CgYEAoATIw/TEgRV/KNHs/BOiEWqP0Co5dVix2Nnk
-+3EVAO6VIrbbE3OuAm2ZWeaBWSujXLHSmVfpoHubCP6prZVI1W9aTkAxmh+xsDV3P
-+o3h+DiBTP1seuGx7tr7spQqFXeR3OH9gXktYCO/W0d3aQ7pjAjpehWv0zJ+ty2MI
-+fQ/lkXUCgYEAgbP+P5UmY7Fqm/mi6TprEJ/eYktji4Ne11GDKGFQCfjF5RdKhdw1
-+5+elGhZes+cpzu5Ak6zBDu4bviT+tRTWJu5lVLEzlHHv4nAU7Ks5Aj67ApH21AnP
-+RtlATdhWOt5Dkdq1WSpDfz5bvWgvyBx9D66dSmQdbKKe2dH327eQll4=
- -----END RSA PRIVATE KEY-----
-diff --git a/test/certs/embeddedSCTs1.pem b/test/certs/embeddedSCTs1.pem
-index d1e8512..d2a111f 100644
---- a/test/certs/embeddedSCTs1.pem
-+++ b/test/certs/embeddedSCTs1.pem
-@@ -1,20 +1,21 @@
- -----BEGIN CERTIFICATE-----
--MIIDWTCCAsKgAwIBAgIBBzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJHQjEk
-+MIIDeDCCAuGgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJHQjEk
- MCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENBMQ4wDAYDVQQIEwVX
--YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAeFw0xMjA2MDEwMDAwMDBaFw0yMjA2MDEw
--MDAwMDBaMFIxCzAJBgNVBAYTAkdCMSEwHwYDVQQKExhDZXJ0aWZpY2F0ZSBUcmFu
--c3BhcmVuY3kxDjAMBgNVBAgTBVdhbGVzMRAwDgYDVQQHEwdFcncgV2VuMIGfMA0G
--CSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+75jnwmh3rjhfdTJaDB0ym+3xj6r015a/
--BH634c4VyVui+A7kWL19uG+KSyUhkaeb1wDDjpwDibRc1NyaEgqyHgy0HNDnKAWk
--EM2cW9tdSSdyba8XEPYBhzd+olsaHjnu0LiBGdwVTcaPfajjDK8VijPmyVCfSgWw
--FAn/Xdh+tQIDAQABo4IBOjCCATYwHQYDVR0OBBYEFCAxVBryXAX/2GWLaEN5T16Q
--Nve0MH0GA1UdIwR2MHSAFF+diA3Ic+ZU1PgN2OawwSS0R8NVoVmkVzBVMQswCQYD
--VQQGEwJHQjEkMCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENBMQ4w
--DAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHRXJ3IFdlboIBADAJBgNVHRMEAjAAMIGK
--BgorBgEEAdZ5AgQCBHwEegB4AHYA3xwuwRUAlFJHqWFoMl3cXHlZ6PfG04j8AC4L
--vT9012QAAAE92yffkwAABAMARzBFAiBIL2dRrzXbplQ2vh/WZA89v5pBQpSVkkUw
--KI+j5eI+BgIhAOTtwNs6xXKx4vXoq2poBlOYfc9BAn3+/6EFUZ2J7b8IMA0GCSqG
--SIb3DQEBBQUAA4GBAIoMS+8JnUeSea+goo5on5HhxEIb4tJpoupspOghXd7dyhUE
--oR58h8S3foDw6XkDUmjyfKIOFmgErlVvMWmB+Wo5Srer/T4lWsAERRP+dlcMZ5Wr
--5HAxM9MD+J86+mu8/FFzGd/ZW5NCQSEfY0A1w9B4MHpoxgdaLiDInza4kQyg
-+YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAgFw0yMDAxMjUxMTUwMTNaGA8yMTIwMDEy
-+NjExNTAxM1owGTEXMBUGA1UEAwwOc2VydmVyLmV4YW1wbGUwggEiMA0GCSqGSIb3
-+DQEBAQUAA4IBDwAwggEKAoIBAQC4iOkDj+IKkMDaaPLAjnMbogFfps1xFBgOwHsK
-+/RWic1e0kHBfEwQ0/iNWm8SZaknmIwGScYdX5dYGSeBhqlzMixjgsafpoxTrJIAE
-+FVCk05BJF9PjzEYY9H2bM4Eb/KmWakU5WrWP5vrmWyS8BcphosWkWfehj+kFJ1wI
-+0E/wvKlVcAlvcioRewEv8SuAcb1uAhE/xXEEBqvILPvuQvMBeR8cvYt9IYh8043I
-+QoHfEj3hLgt6i45KhYvVWQR8mzzu8bgbnGhfDco4fKK55BRSUye7yn4HHTE9Uo8S
-+wuN7dH2TSsZrlxrt1cCf1TKkoqnbnHg1emeMZfm3FURh82+pAgMBAAGjggEMMIIB
-+CDAdBgNVHQ4EFgQUtMa8XD5ylrF9AqCdnPEhXa63H2owHwYDVR0jBBgwFoAUX52I
-+Dchz5lTU+A3Y5rDBJLRHw1UwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
-+ATCBigYKKwYBBAHWeQIEAgR8BHoAeAB2AN8cLsEVAJRSR6lhaDJd3Fx5Wej3xtOI
-+/AAuC70/dNdkAAABb15m6AAAAAQDAEcwRQIgfDPo8RArm/vcSEZ608Q1u+XQ55QB
-+u67SZEuZxLpbUM0CIQDRsgcTud4PDy8Cgg+lHeAS7UxgSKBbWAznYOuorwNewzAZ
-+BgNVHREEEjAQgg5zZXJ2ZXIuZXhhbXBsZTANBgkqhkiG9w0BAQsFAAOBgQCWFKKR
-+RNkDRzB25NK07OLkbzebhnpKtbP4i3blRx1HAvTSamf/3uuHI7kfiPJorJymJpT1
-+IuJvSVKyMu1qONWBimiBfiyGL7+le1izHEJIP5lVTbddfzSIBIvrlHHcWIOL3H+W
-+YT6yTEIzJuO07Xp61qnB1CE2TrinUWlyC46Zkw==
- -----END CERTIFICATE-----
-diff --git a/test/certs/embeddedSCTs1.sct b/test/certs/embeddedSCTs1.sct
-index 59362dc..35c9eb9 100644
---- a/test/certs/embeddedSCTs1.sct
-+++ b/test/certs/embeddedSCTs1.sct
-@@ -2,11 +2,11 @@ Signed Certificate Timestamp:
-     Version   : v1 (0x0)
-     Log ID    : DF:1C:2E:C1:15:00:94:52:47:A9:61:68:32:5D:DC:5C:
-                 79:59:E8:F7:C6:D3:88:FC:00:2E:0B:BD:3F:74:D7:64
--    Timestamp : Apr  5 17:04:16.275 2013 GMT
-+    Timestamp : Jan  1 00:00:00.000 2020 GMT
-     Extensions: none
-     Signature : ecdsa-with-SHA256
--                30:45:02:20:48:2F:67:51:AF:35:DB:A6:54:36:BE:1F:
--                D6:64:0F:3D:BF:9A:41:42:94:95:92:45:30:28:8F:A3:
--                E5:E2:3E:06:02:21:00:E4:ED:C0:DB:3A:C5:72:B1:E2:
--                F5:E8:AB:6A:68:06:53:98:7D:CF:41:02:7D:FE:FF:A1:
--                05:51:9D:89:ED:BF:08
-\ No newline at end of file
-+                30:45:02:20:7C:33:E8:F1:10:2B:9B:FB:DC:48:46:7A:
-+                D3:C4:35:BB:E5:D0:E7:94:01:BB:AE:D2:64:4B:99:C4:
-+                BA:5B:50:CD:02:21:00:D1:B2:07:13:B9:DE:0F:0F:2F:
-+                02:82:0F:A5:1D:E0:12:ED:4C:60:48:A0:5B:58:0C:E7:
-+                60:EB:A8:AF:03:5E:C3
-\ No newline at end of file
-diff --git a/test/certs/embeddedSCTs1_issuer-key.pem b/test/certs/embeddedSCTs1_issuer-key.pem
-new file mode 100644
-index 0000000..9326e38
---- /dev/null
-+++ b/test/certs/embeddedSCTs1_issuer-key.pem
-@@ -0,0 +1,15 @@
-+-----BEGIN RSA PRIVATE KEY-----
-+MIICXAIBAAKBgQDVimhTYhCicRmTbneDIRgcKkATxtB7jHbrkVfT0PtLO1FuzsvR
-+yY2RxS90P6tjXVUJnNE6uvMa5UFEJFGnTHgW8iQ8+EjPKDHM5nugSlojgZ88ujfm
-+JNnDvbKZuDnd/iYx0ss6hPx7srXFL8/BT/9Ab1zURmnLsvfP34b7arnRsQIDAQAB
-+AoGAJLR6xEJp+5IXRFlLn7WTkFvO0ddtxJ7bXhiIkTctyruyfqp7LF9Jv1G2m3PK
-+QPUtBc73w/GYkfnwIwdfJbOmPHL7XyEGHZYmEXgIgEtw6LXvAv0G5JpUnNwsSBfL
-+GfSQqI5Z5ytyzlJXkMcTGA2kTgNAYc73h4EnU+pwUnDPdAECQQD2aj+4LtYk1XPq
-+r3gjgI6MoGvgYJfPmAtZhxxVbhXQKciFUCAcBiwlQdHIdLWE9j65ctmZRWidKifr
-+4O4nz+TBAkEA3djNW/rTQq5fKZy+mCF1WYnIU/3yhJaptzRqLm7AHqe7+hdrGXJw
-++mCtU8T3L/Ms8bH1yFBZhmkp1PbR8gl48QJAQo70YyWThiN5yfxXcQ96cZWrTdIJ
-+b3NcLXSHPLQdhDqlBQ1dfvRT3ERpC8IqfZ2d162kBPhwh3MpkVcSPQK0gQJAC/dY
-+xGBYKt2a9nSk9zG+0bCT5Kvq++ngh6hFHfINXNnxUsEWns3EeEzkrIMQTj7QqszN
-+lBt5aL2dawZRNrv6EQJBAOo4STF9KEwQG0HLC/ryh1FeB0OBA5yIepXze+eJVKei
-+T0cCECOQJKfWHEzYJYDJhyEFF/sYp9TXwKSDjOifrsU=
-+-----END RSA PRIVATE KEY-----
-diff --git a/test/certs/embeddedSCTs1_issuer.pem b/test/certs/embeddedSCTs1_issuer.pem
-index 1fa449d..6aa9455 100644
---- a/test/certs/embeddedSCTs1_issuer.pem
-+++ b/test/certs/embeddedSCTs1_issuer.pem
-@@ -1,18 +1,18 @@
- -----BEGIN CERTIFICATE-----
--MIIC0DCCAjmgAwIBAgIBADANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJHQjEk
-+MIIC0jCCAjugAwIBAgIBADANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJHQjEk
- MCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENBMQ4wDAYDVQQIEwVX
--YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAeFw0xMjA2MDEwMDAwMDBaFw0yMjA2MDEw
--MDAwMDBaMFUxCzAJBgNVBAYTAkdCMSQwIgYDVQQKExtDZXJ0aWZpY2F0ZSBUcmFu
--c3BhcmVuY3kgQ0ExDjAMBgNVBAgTBVdhbGVzMRAwDgYDVQQHEwdFcncgV2VuMIGf
--MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVimhTYhCicRmTbneDIRgcKkATxtB7
--jHbrkVfT0PtLO1FuzsvRyY2RxS90P6tjXVUJnNE6uvMa5UFEJFGnTHgW8iQ8+EjP
--KDHM5nugSlojgZ88ujfmJNnDvbKZuDnd/iYx0ss6hPx7srXFL8/BT/9Ab1zURmnL
--svfP34b7arnRsQIDAQABo4GvMIGsMB0GA1UdDgQWBBRfnYgNyHPmVNT4DdjmsMEk
--tEfDVTB9BgNVHSMEdjB0gBRfnYgNyHPmVNT4DdjmsMEktEfDVaFZpFcwVTELMAkG
--A1UEBhMCR0IxJDAiBgNVBAoTG0NlcnRpZmljYXRlIFRyYW5zcGFyZW5jeSBDQTEO
--MAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0VydyBXZW6CAQAwDAYDVR0TBAUwAwEB
--/zANBgkqhkiG9w0BAQUFAAOBgQAGCMxKbWTyIF4UbASydvkrDvqUpdryOvw4BmBt
--OZDQoeojPUApV2lGOwRmYef6HReZFSCa6i4Kd1F2QRIn18ADB8dHDmFYT9czQiRy
--f1HWkLxHqd81TbD26yWVXeGJPE3VICskovPkQNJ0tU4b03YmnKliibduyqQQkOFP
--OwqULg==
-+YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAgFw0yMjA2MDExMDM4MDJaGA8yMTIyMDUw
-+ODEwMzgwMlowVTELMAkGA1UEBhMCR0IxJDAiBgNVBAoTG0NlcnRpZmljYXRlIFRy
-+YW5zcGFyZW5jeSBDQTEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0VydyBXZW4w
-+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANWKaFNiEKJxGZNud4MhGBwqQBPG
-+0HuMduuRV9PQ+0s7UW7Oy9HJjZHFL3Q/q2NdVQmc0Tq68xrlQUQkUadMeBbyJDz4
-+SM8oMczme6BKWiOBnzy6N+Yk2cO9spm4Od3+JjHSyzqE/HuytcUvz8FP/0BvXNRG
-+acuy98/fhvtqudGxAgMBAAGjga8wgawwHQYDVR0OBBYEFF+diA3Ic+ZU1PgN2Oaw
-+wSS0R8NVMH0GA1UdIwR2MHSAFF+diA3Ic+ZU1PgN2OawwSS0R8NVoVmkVzBVMQsw
-+CQYDVQQGEwJHQjEkMCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENB
-+MQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHRXJ3IFdlboIBADAMBgNVHRMEBTAD
-+AQH/MA0GCSqGSIb3DQEBCwUAA4GBAD0aYh9OkFYfXV7kBfhrtD0PJG2U47OV/1qq
-++uFpqB0S1WO06eJT0pzYf1ebUcxjBkajbJZm/FHT85VthZ1lFHsky87aFD8XlJCo
-+2IOhKOkvvWKPUdFLoO/ZVXqEVKkcsS1eXK1glFvb07eJZya3JVG0KdMhV2YoDg6c
-+Doud4XrO
- -----END CERTIFICATE-----
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:Backport-aarch64-support-BTI-and-pointer-authentication-in-as.patch Added

@@ -0,0 +1,1521 @@
+From 44b6e3d07ae5b09255710986e61035c862ec68aa Mon Sep 17 00:00:00 2001
+From: Russ Butler <russ.butler@arm.com>
+Date: Sat, 28 Aug 2021 13:57:09 -0500
+Subject: PATCH 01/13 aarch64: support BTI and pointer authentication in
+ assembly
+
+This change adds optional support for
+- Armv8.3-A Pointer Authentication (PAuth) and
+- Armv8.5-A Branch Target Identification (BTI)
+features to the perl scripts.
+
+Both features can be enabled with additional compiler flags.
+Unless any of these are enabled explicitly there is no code change at
+all.
+
+The extensions are briefly described below. Please read the appropriate
+chapters of the Arm Architecture Reference Manual for the complete
+specification.
+
+Scope
+-----
+
+This change only affects generated assembly code.
+
+Armv8.3-A Pointer Authentication
+--------------------------------
+
+Pointer Authentication extension supports the authentication of the
+contents of registers before they are used for indirect branching
+or load.
+
+PAuth provides a probabilistic method to detect corruption of register
+values. PAuth signing instructions generate a Pointer Authentication
+Code (PAC) based on the value of a register, a seed and a key.
+The generated PAC is inserted into the original value in the register.
+A PAuth authentication instruction recomputes the PAC, and if it matches
+the PAC in the register, restores its original value. In case of a
+mismatch, an architecturally unmapped address is generated instead.
+
+With PAuth, mitigation against ROP (Return-oriented Programming) attacks
+can be implemented. This is achieved by signing the contents of the
+link-register (LR) before it is pushed to stack. Once LR is popped,
+it is authenticated. This way a stack corruption which overwrites the
+LR on the stack is detectable.
+
+The PAuth extension adds several new instructions, some of which are not
+recognized by older hardware. To support a single codebase for both pre
+Armv8.3-A targets and newer ones, only NOP-space instructions are added
+by this patch. These instructions are treated as NOPs on hardware
+which does not support Armv8.3-A. Furthermore, this patch only considers
+cases where LR is saved to the stack and then restored before branching
+to its content. There are cases in the code where LR is pushed to stack
+but it is not used later. We do not address these cases as they are not
+affected by PAuth.
+
+There are two keys available to sign an instruction address: A and B.
+PACIASP and PACIBSP only differ in the used keys: A and B, respectively.
+The keys are typically managed by the operating system.
+
+To enable generating code for PAuth compile with
+-mbranch-protection=<mode>:
+
+- standard or pac-ret: add PACIASP and AUTIASP, also enables BTI
+  (read below)
+- pac-ret+b-key: add PACIBSP and AUTIBSP
+
+Armv8.5-A Branch Target Identification
+--------------------------------------
+
+Branch Target Identification features some new instructions which
+protect the execution of instructions on guarded pages which are not
+intended branch targets.
+
+If Armv8.5-A is supported by the hardware, execution of an instruction
+changes the value of PSTATE.BTYPE field. If an indirect branch
+lands on a guarded page the target instruction must be one of the
+BTI <jc> flavors, or in case of a direct call or jump it can be any
+other instruction. If the target instruction is not compatible with the
+value of PSTATE.BTYPE a Branch Target Exception is generated.
+
+In short, indirect jumps are compatible with BTI <j> and <jc> while
+indirect calls are compatible with BTI <c> and <jc>. Please refer to the
+specification for the details.
+
+Armv8.3-A PACIASP and PACIBSP are implicit branch target
+identification instructions which are equivalent with BTI c or BTI jc
+depending on system register configuration.
+
+BTI is used to mitigate JOP (Jump-oriented Programming) attacks by
+limiting the set of instructions which can be jumped to.
+
+BTI requires active linker support to mark the pages with BTI-enabled
+code as guarded. For ELF64 files BTI compatibility is recorded in the
+.note.gnu.property section. For a shared object or static binary it is
+required that all linked units support BTI. This means that even a
+single assembly file without the required note section turns-off BTI
+for the whole binary or shared object.
+
+The new BTI instructions are treated as NOPs on hardware which does
+not support Armv8.5-A or on pages which are not guarded.
+
+To insert this new and optional instruction compile with
+-mbranch-protection=standard (also enables PAuth) or +bti.
+
+When targeting a guarded page from a non-guarded page, weaker
+compatibility restrictions apply to maintain compatibility between
+legacy and new code. For detailed rules please refer to the Arm ARM.
+
+Compiler support
+----------------
+
+Compiler support requires understanding '-mbranch-protection=<mode>'
+and emitting the appropriate feature macros (__ARM_FEATURE_BTI_DEFAULT
+and __ARM_FEATURE_PAC_DEFAULT). The current state is the following:
+
+-------------------------------------------------------
+| Compiler | -mbranch-protection | Feature macros     |
++----------+---------------------+--------------------+
+| clang    | 9.0.0               | 11.0.0             |
++----------+---------------------+--------------------+
+| gcc      | 9                   | expected in 10.1+  |
+-------------------------------------------------------
+
+Available Platforms
+------------------
+
+Arm Fast Model and QEMU support both extensions.
+
+https://developer.arm.com/tools-and-software/simulation-models/fast-models
+https://www.qemu.org/
+
+Implementation Notes
+--------------------
+
+This change adds BTI landing pads even to assembly functions which are
+likely to be directly called only. In these cases, landing pads might
+be superfluous depending on what code the linker generates.
+Code size and performance impact for these cases would be negligible.
+
+Interaction with C code
+-----------------------
+
+Pointer Authentication is a per-frame protection while Branch Target
+Identification can be turned on and off only for all code pages of a
+whole shared object or static binary. Because of these properties if
+C/C++ code is compiled without any of the above features but assembly
+files support any of them unconditionally there is no incompatibility
+between the two.
+
+Useful Links
+------------
+
+To fully understand the details of both PAuth and BTI it is advised to
+read the related chapters of the Arm Architecture Reference Manual
+(Arm ARM):
+https://developer.arm.com/documentation/ddi0487/latest/
+
+Additional materials:
+
+"Providing protection for complex software"
+https://developer.arm.com/architectures/learn-the-architecture/providing-protection-for-complex-software
+
+Arm Compiler Reference Guide Version 6.14: -mbranch-protection
+https://developer.arm.com/documentation/101754/0614/armclang-Reference/armclang-Command-line-Options/-mbranch-protection?lang=en
+
+Arm C Language Extensions (ACLE)
+https://developer.arm.com/docs/101028/latest
+
+Addional Notes
+--------------
+
+This patch is a copy of the work done by Tamas Petz in boringssl. It
+contains the changes from the following commits:
+
+aarch64: support BTI and pointer authentication in assembly
+    Change-Id: I4335f92e2ccc8e209c7d68a0a79f1acdf3aeb791
+    URL: https://boringssl-review.googlesource.com/c/boringssl/+/42084
+aarch64: Improve conditional compilation
+    Change-Id: I14902a64e5f403c2b6a117bc9f5fb1a4f4611ebf
+    URL: https://boringssl-review.googlesource.com/c/boringssl/+/43524
+aarch64: Fix name of gnu property note section
+    Change-Id: I6c432d1c852129e9c273f6469a8b60e3983671ec
+    URL: https://boringssl-review.googlesource.com/c/boringssl/+/44024
+
+Change-Id: I2d95ebc5e4aeb5610d3b226f9754ee80cf74a9af
+
+Reviewed-by: Paul Dale <pauli@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/16674)
+---
+ crypto/aes/asm/aesv8-armx.pl          | 18 +++++++-
+ crypto/aes/asm/vpaes-armv8.pl         | 39 ++++++++--------
+ crypto/aes/build.info                 |  1 +
+ crypto/arm64cpuid.pl                  | 10 +++++
+ crypto/arm_arch.h                     | 58 ++++++++++++++++++++++++
+ crypto/bn/asm/armv8-mont.pl           | 19 +++++---
+ crypto/chacha/asm/chacha-armv8.pl     | 18 ++++----
+ crypto/ec/asm/ecp_nistz256-armv8.pl   | 64 ++++++++++++++++-----------
+ crypto/modes/asm/aes-gcm-armv8_64.pl  |  6 +++

_service:tar_scm:Backport-ct_test.c-Update-the-epoch-time.patch Deleted

@@ -1,28 +0,0 @@
-From 7dbefac7fa259eee188017f6dbcfd11376fe6345 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tomas@openssl.org>
-Date: Wed, 1 Jun 2022 13:06:46 +0200
-Subject: PATCH 15/15 ct_test.c: Update the epoch time
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
-(Merged from https://github.com/openssl/openssl/pull/18446)
----
- test/ct_test.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/ct_test.c b/test/ct_test.c
-index 78d11ca..535897d 100644
---- a/test/ct_test.c
-+++ b/test/ct_test.c
-@@ -63,7 +63,7 @@ static CT_TEST_FIXTURE *set_up(const char *const test_case_name)
-     if (!TEST_ptr(fixture = OPENSSL_zalloc(sizeof(*fixture))))
-         goto end;
-     fixture->test_case_name = test_case_name;
--    fixture->epoch_time_in_ms = 1473269626000ULL; /* Sep 7 17:33:46 2016 GMT */
-+    fixture->epoch_time_in_ms = 1580335307000ULL; /* Wed 29 Jan 2020 10:01:47 PM UTC */
-     if (!TEST_ptr(fixture->ctlog_store = CTLOG_STORE_new())
-             || !TEST_int_eq(
-                     CTLOG_STORE_load_default_file(fixture->ctlog_store), 1))
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:Backport-providers-Add-SM4-GCM-implementation.patch Added

@@ -0,0 +1,360 @@
+From 2f1c0b5f1b585a307f21a70ef3ae652643c25f6d Mon Sep 17 00:00:00 2001
+From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
+Date: Wed, 1 Sep 2021 16:54:15 +0800
+Subject: PATCH 04/13 providers: Add SM4 GCM implementation
+
+The GCM mode of the SM4 algorithm is specifieded by RFC8998.
+
+Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
+
+Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
+Reviewed-by: Paul Dale <pauli@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/16491)
+---
+ providers/defltprov.c                         |  2 +
+ providers/implementations/ciphers/build.info  |  4 +-
+ .../implementations/ciphers/cipher_sm4_ccm.c  | 39 +++++++++++++++++
+ .../implementations/ciphers/cipher_sm4_ccm.h  | 22 ++++++++++
+ .../ciphers/cipher_sm4_ccm_hw.c               | 41 ++++++++++++++++++
+ .../implementations/ciphers/cipher_sm4_gcm.c  | 40 +++++++++++++++++
+ .../implementations/ciphers/cipher_sm4_gcm.h  | 22 ++++++++++
+ .../ciphers/cipher_sm4_gcm_hw.c               | 43 +++++++++++++++++++
+ .../include/prov/implementations.h            |  2 +
+ .../implementations/include/prov/names.h      |  2 +
+ test/recipes/30-test_evp_data/evpciph_sm4.txt | 20 +++++++++
+ 11 files changed, 236 insertions(+), 1 deletion(-)
+ create mode 100644 providers/implementations/ciphers/cipher_sm4_ccm.c
+ create mode 100644 providers/implementations/ciphers/cipher_sm4_ccm.h
+ create mode 100644 providers/implementations/ciphers/cipher_sm4_ccm_hw.c
+ create mode 100644 providers/implementations/ciphers/cipher_sm4_gcm.c
+ create mode 100644 providers/implementations/ciphers/cipher_sm4_gcm.h
+ create mode 100644 providers/implementations/ciphers/cipher_sm4_gcm_hw.c
+
+diff --git a/providers/defltprov.c b/providers/defltprov.c
+index ed3f4799e7..cc0b0c3b62 100644
+--- a/providers/defltprov.c
++++ b/providers/defltprov.c
+@@ -289,6 +289,8 @@ static const OSSL_ALGORITHM_CAPABLE deflt_ciphers = {
+     ALG(PROV_NAMES_DES_EDE_CFB, ossl_tdes_ede2_cfb_functions),
+ #endif /* OPENSSL_NO_DES */
+ #ifndef OPENSSL_NO_SM4
++    ALG(PROV_NAMES_SM4_GCM, ossl_sm4128gcm_functions),
++    ALG(PROV_NAMES_SM4_CCM, ossl_sm4128ccm_functions),
+     ALG(PROV_NAMES_SM4_ECB, ossl_sm4128ecb_functions),
+     ALG(PROV_NAMES_SM4_CBC, ossl_sm4128cbc_functions),
+     ALG(PROV_NAMES_SM4_CTR, ossl_sm4128ctr_functions),
+diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info
+index e4c5f4f051..b5d9d4f6c1 100644
+--- a/providers/implementations/ciphers/build.info
++++ b/providers/implementations/ciphers/build.info
+@@ -105,7 +105,9 @@ ENDIF
+ 
+ IF{- !$disabled{sm4} -}
+   SOURCE$SM4_GOAL=\
+-      cipher_sm4.c cipher_sm4_hw.c
++      cipher_sm4.c cipher_sm4_hw.c \
++      cipher_sm4_gcm.c cipher_sm4_gcm_hw.c \
++      cipher_sm4_ccm.c cipher_sm4_ccm_hw.c
+ ENDIF
+ 
+ IF{- !$disabled{ocb} -}
+diff --git a/providers/implementations/ciphers/cipher_sm4_ccm.c b/providers/implementations/ciphers/cipher_sm4_ccm.c
+new file mode 100644
+index 0000000000..f0295a5ca2
+--- /dev/null
++++ b/providers/implementations/ciphers/cipher_sm4_ccm.c
+@@ -0,0 +1,39 @@
++/*
++ * Copyright 2021 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
++ * https://www.openssl.org/source/license.html
++ */
++
++/* Dispatch functions for SM4 CCM mode */
++
++#include "cipher_sm4_ccm.h"
++#include "prov/implementations.h"
++#include "prov/providercommon.h"
++
++static OSSL_FUNC_cipher_freectx_fn sm4_ccm_freectx;
++
++static void *sm4_ccm_newctx(void *provctx, size_t keybits)
++{
++    PROV_SM4_CCM_CTX *ctx;
++
++    if (!ossl_prov_is_running())
++        return NULL;
++
++    ctx = OPENSSL_zalloc(sizeof(*ctx));
++    if (ctx != NULL)
++        ossl_ccm_initctx(&ctx->base, keybits, ossl_prov_sm4_hw_ccm(keybits));
++    return ctx;
++}
++
++static void sm4_ccm_freectx(void *vctx)
++{
++    PROV_SM4_CCM_CTX *ctx = (PROV_SM4_CCM_CTX *)vctx;
++
++    OPENSSL_clear_free(ctx,  sizeof(*ctx));
++}
++
++/* sm4128ccm functions */
++IMPLEMENT_aead_cipher(sm4, ccm, CCM, AEAD_FLAGS, 128, 8, 96);
+diff --git a/providers/implementations/ciphers/cipher_sm4_ccm.h b/providers/implementations/ciphers/cipher_sm4_ccm.h
+new file mode 100644
+index 0000000000..189e71e9e4
+--- /dev/null
++++ b/providers/implementations/ciphers/cipher_sm4_ccm.h
+@@ -0,0 +1,22 @@
++/*
++ * Copyright 2021 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
++ * https://www.openssl.org/source/license.html
++ */
++
++#include "crypto/sm4.h"
++#include "prov/ciphercommon.h"
++#include "prov/ciphercommon_ccm.h"
++
++typedef struct prov_sm4_ccm_ctx_st {
++    PROV_CCM_CTX base; /* Must be first */
++    union {
++        OSSL_UNION_ALIGN;
++        SM4_KEY ks;
++    } ks;                       /* SM4 key schedule to use */
++} PROV_SM4_CCM_CTX;
++
++const PROV_CCM_HW *ossl_prov_sm4_hw_ccm(size_t keylen);
+diff --git a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
+new file mode 100644
+index 0000000000..791daf3e46
+--- /dev/null
++++ b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
+@@ -0,0 +1,41 @@
++/*
++ * Copyright 2021 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
++ * https://www.openssl.org/source/license.html
++ */
++
++/*-
++ * Generic support for SM4 CCM.
++ */
++
++#include "cipher_sm4_ccm.h"
++
++static int ccm_sm4_initkey(PROV_CCM_CTX *ctx,
++                           const unsigned char *key, size_t keylen)
++{
++    PROV_SM4_CCM_CTX *actx = (PROV_SM4_CCM_CTX *)ctx;
++
++    ossl_sm4_set_key(key, &actx->ks.ks);
++    CRYPTO_ccm128_init(&ctx->ccm_ctx, ctx->m, ctx->l, &actx->ks.ks,
++                       (block128_f)ossl_sm4_encrypt);
++    ctx->str = NULL;
++    ctx->key_set = 1;
++    return 1;
++}
++
++static const PROV_CCM_HW ccm_sm4 = {
++    ccm_sm4_initkey,
++    ossl_ccm_generic_setiv,
++    ossl_ccm_generic_setaad,
++    ossl_ccm_generic_auth_encrypt,
++    ossl_ccm_generic_auth_decrypt,
++    ossl_ccm_generic_gettag
++};
++
++const PROV_CCM_HW *ossl_prov_sm4_hw_ccm(size_t keybits)
++{
++    return &ccm_sm4;
++}
+diff --git a/providers/implementations/ciphers/cipher_sm4_gcm.c b/providers/implementations/ciphers/cipher_sm4_gcm.c
+new file mode 100644
+index 0000000000..7a936f00ee
+--- /dev/null
++++ b/providers/implementations/ciphers/cipher_sm4_gcm.c
+@@ -0,0 +1,40 @@
++/*
++ * Copyright 2021 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
++ * https://www.openssl.org/source/license.html
++ */
++
++/* Dispatch functions for SM4 GCM mode */
++
++#include "cipher_sm4_gcm.h"
++#include "prov/implementations.h"

_service:tar_scm:Backport-providers-Add-SM4-XTS-implementation.patch Added

@@ -0,0 +1,763 @@
+From 57c854480481bd6b0900984d17db17426c44aa40 Mon Sep 17 00:00:00 2001
+From: Xu Yizhou <xuyizhou1@huawei.com>
+Date: Fri, 25 Nov 2022 13:52:49 +0800
+Subject: PATCH 08/13 providers: Add SM4 XTS implementation
+
+Signed-off-by: Xu Yizhou <xuyizhou1@huawei.com>
+
+Reviewed-by: Hugo Landau <hlandau@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/19619)
+---
+ crypto/modes/build.info                       |   2 +-
+ crypto/modes/xts128gb.c                       | 199 +++++++++++++
+ include/crypto/modes.h                        |   6 +
+ include/openssl/core_names.h                  |   1 +
+ providers/defltprov.c                         |   1 +
+ providers/implementations/ciphers/build.info  |   4 +-
+ .../implementations/ciphers/cipher_sm4_xts.c  | 281 ++++++++++++++++++
+ .../implementations/ciphers/cipher_sm4_xts.h  |  46 +++
+ .../ciphers/cipher_sm4_xts_hw.c               |  89 ++++++
+ .../include/prov/implementations.h            |   1 +
+ .../implementations/include/prov/names.h      |   1 +
+ 11 files changed, 629 insertions(+), 2 deletions(-)
+ create mode 100644 crypto/modes/xts128gb.c
+ create mode 100644 providers/implementations/ciphers/cipher_sm4_xts.c
+ create mode 100644 providers/implementations/ciphers/cipher_sm4_xts.h
+ create mode 100644 providers/implementations/ciphers/cipher_sm4_xts_hw.c
+
+diff --git a/crypto/modes/build.info b/crypto/modes/build.info
+index f3558fa1a4..0ee297ced8 100644
+--- a/crypto/modes/build.info
++++ b/crypto/modes/build.info
+@@ -49,7 +49,7 @@ IF{- !$disabled{asm} -}
+ ENDIF
+ 
+ $COMMON=cbc128.c ctr128.c cfb128.c ofb128.c gcm128.c ccm128.c xts128.c \
+-        wrap128.c $MODESASM
++        wrap128.c xts128gb.c $MODESASM
+ SOURCE../../libcrypto=$COMMON \
+         cts128.c ocb128.c siv128.c
+ SOURCE../../providers/libfips.a=$COMMON
+diff --git a/crypto/modes/xts128gb.c b/crypto/modes/xts128gb.c
+new file mode 100644
+index 0000000000..021c0597e4
+--- /dev/null
++++ b/crypto/modes/xts128gb.c
+@@ -0,0 +1,199 @@
++/*
++ * 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
++ * https://www.openssl.org/source/license.html
++ */
++
++#include <string.h>
++#include <openssl/crypto.h>
++#include "internal/endian.h"
++#include "crypto/modes.h"
++
++#ifndef STRICT_ALIGNMENT
++# ifdef __GNUC__
++typedef u64 u64_a1 __attribute((__aligned__(1)));
++# else
++typedef u64 u64_a1;
++# endif
++#endif
++
++int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
++                                 const unsigned char iv16,
++                                 const unsigned char *inp, unsigned char *out,
++                                 size_t len, int enc)
++{
++    DECLARE_IS_ENDIAN;
++    union {
++        u64 u2;
++        u32 d4;
++        u8 c16;
++    } tweak, scratch;
++    unsigned int i;
++
++    if (len < 16)
++        return -1;
++
++    memcpy(tweak.c, iv, 16);
++
++    (*ctx->block2) (tweak.c, tweak.c, ctx->key2);
++
++    if (!enc && (len % 16))
++        len -= 16;
++
++    while (len >= 16) {
++#if defined(STRICT_ALIGNMENT)
++        memcpy(scratch.c, inp, 16);
++        scratch.u0 ^= tweak.u0;
++        scratch.u1 ^= tweak.u1;
++#else
++        scratch.u0 = ((u64_a1 *)inp)0 ^ tweak.u0;
++        scratch.u1 = ((u64_a1 *)inp)1 ^ tweak.u1;
++#endif
++        (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
++#if defined(STRICT_ALIGNMENT)
++        scratch.u0 ^= tweak.u0;
++        scratch.u1 ^= tweak.u1;
++        memcpy(out, scratch.c, 16);
++#else
++        ((u64_a1 *)out)0 = scratch.u0 ^= tweak.u0;
++        ((u64_a1 *)out)1 = scratch.u1 ^= tweak.u1;
++#endif
++        inp += 16;
++        out += 16;
++        len -= 16;
++
++        if (len == 0)
++            return 0;
++
++        if (IS_LITTLE_ENDIAN) {
++            u8 res;
++            u64 hi, lo;
++#ifdef BSWAP8
++            hi = BSWAP8(tweak.u0);
++            lo = BSWAP8(tweak.u1);
++#else
++            u8 *p = tweak.c;
++
++            hi = (u64)GETU32(p) << 32 | GETU32(p + 4);
++            lo = (u64)GETU32(p + 8) << 32 | GETU32(p + 12);
++#endif
++            res = (u8)lo & 1;
++            tweak.u0 = (lo >> 1) | (hi << 63);
++            tweak.u1 = hi >> 1;
++            if (res)
++                tweak.c15 ^= 0xe1;
++#ifdef BSWAP8
++            hi = BSWAP8(tweak.u0);
++            lo = BSWAP8(tweak.u1);
++#else
++            p = tweak.c;
++
++            hi = (u64)GETU32(p) << 32 | GETU32(p + 4);
++            lo = (u64)GETU32(p + 8) << 32 | GETU32(p + 12);
++#endif
++            tweak.u0 = lo;
++            tweak.u1 = hi;
++        } else {
++            u8 carry, res;
++            carry = 0;
++            for (i = 0; i < 16; ++i) {
++                res = (tweak.ci << 7) & 0x80;
++                tweak.ci = ((tweak.ci >> 1) + carry) & 0xff;
++                carry = res;
++            }
++            if (res)
++                tweak.c0 ^= 0xe1;
++        }
++    }
++    if (enc) {
++        for (i = 0; i < len; ++i) {
++            u8 c = inpi;
++            outi = scratch.ci;
++            scratch.ci = c;
++        }
++        scratch.u0 ^= tweak.u0;
++        scratch.u1 ^= tweak.u1;
++        (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
++        scratch.u0 ^= tweak.u0;
++        scratch.u1 ^= tweak.u1;
++        memcpy(out - 16, scratch.c, 16);
++    } else {
++        union {
++            u64 u2;
++            u8 c16;
++        } tweak1;
++
++        if (IS_LITTLE_ENDIAN) {
++            u8 res;
++            u64 hi, lo;
++#ifdef BSWAP8
++            hi = BSWAP8(tweak.u0);
++            lo = BSWAP8(tweak.u1);
++#else
++            u8 *p = tweak.c;
++
++            hi = (u64)GETU32(p) << 32 | GETU32(p + 4);
++            lo = (u64)GETU32(p + 8) << 32 | GETU32(p + 12);
++#endif
++            res = (u8)lo & 1;
++            tweak1.u0 = (lo >> 1) | (hi << 63);
++            tweak1.u1 = hi >> 1;
++            if (res)
++                tweak1.c15 ^= 0xe1;
++#ifdef BSWAP8
++            hi = BSWAP8(tweak1.u0);
++            lo = BSWAP8(tweak1.u1);
++#else
++            p = tweak1.c;
++
++            hi = (u64)GETU32(p) << 32 | GETU32(p + 4);

_service:tar_scm:Backport-test-add-test-cases-for-the-policy-resource-overuse.patch Added

@@ -0,0 +1,626 @@
+From 2a35fdcd965d8afcf4c139447aef8d5985eb9048 Mon Sep 17 00:00:00 2001
+From: Pauli <pauli@openssl.org>
+Date: Wed, 8 Mar 2023 14:39:25 +1100
+Subject: PATCH test: add test cases for the policy resource overuse
+
+These trees have pathological properties with respect to building.  The small
+tree stays within the imposed limit, the large tree doesn't.
+
+The large tree would consume over 150Gb of RAM to process.
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/20568)
+---
+ test/recipes/80-test_policy_tree.t            |  41 ++
+ .../80-test_policy_tree_data/large_leaf.pem   |  11 +
+ .../large_policy_tree.pem                     | 434 ++++++++++++++++++
+ .../80-test_policy_tree_data/small_leaf.pem   |  11 +
+ .../small_policy_tree.pem                     |  70 +++
+ 5 files changed, 567 insertions(+)
+ create mode 100644 test/recipes/80-test_policy_tree.t
+ create mode 100644 test/recipes/80-test_policy_tree_data/large_leaf.pem
+ create mode 100644 test/recipes/80-test_policy_tree_data/large_policy_tree.pem
+ create mode 100644 test/recipes/80-test_policy_tree_data/small_leaf.pem
+ create mode 100644 test/recipes/80-test_policy_tree_data/small_policy_tree.pem
+
+diff --git a/test/recipes/80-test_policy_tree.t b/test/recipes/80-test_policy_tree.t
+new file mode 100644
+index 0000000000..606ad05e9c
+--- /dev/null
++++ b/test/recipes/80-test_policy_tree.t
+@@ -0,0 +1,41 @@
++#! /usr/bin/env perl
++# 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
++# https://www.openssl.org/source/license.html
++
++
++use strict;
++use warnings;
++
++use POSIX;
++use OpenSSL::Test qw/:DEFAULT srctop_file with data_file/;
++
++use OpenSSL::Test::Utils;
++use OpenSSL::Glob;
++
++setup("test_policy_tree");
++
++plan tests => 2;
++
++# The small pathological tree is expected to work
++my $small_chain = srctop_file("test", "recipes", "80-test_policy_tree_data",
++                              "small_policy_tree.pem");
++my $small_leaf = srctop_file("test", "recipes", "80-test_policy_tree_data",
++                             "small_leaf.pem");
++
++ok(run(app("openssl", "verify", "-CAfile", $small_chain,
++            "-policy_check", $small_leaf)),
++   "test small policy tree");
++
++# The large pathological tree is expected to fail
++my $large_chain = srctop_file("test", "recipes", "80-test_policy_tree_data",
++                              "large_policy_tree.pem");
++my $large_leaf = srctop_file("test", "recipes", "80-test_policy_tree_data",
++                             "large_leaf.pem");
++
++ok(!run(app("openssl", "verify", "-CAfile", $large_chain,
++             "-policy_check", $large_leaf)),
++   "test large policy tree");
+diff --git a/test/recipes/80-test_policy_tree_data/large_leaf.pem b/test/recipes/80-test_policy_tree_data/large_leaf.pem
+new file mode 100644
+index 0000000000..39ed6a7fa6
+--- /dev/null
++++ b/test/recipes/80-test_policy_tree_data/large_leaf.pem
+@@ -0,0 +1,11 @@
++-----BEGIN CERTIFICATE-----
++MIIBmTCCAT+gAwIBAgIBADAKBggqhkjOPQQDAjAWMRQwEgYDVQQDEwtQb2xpY3kg
++Q0EgMTAgFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowGjEYMBYGA1UE
++AxMPd3d3LmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEp6Qe
++jrN6A0ZjqaFbX/zO01aVYXH5kthBDTEO/fU4H0CdwqrfyMsFrObwssrTJcsmSFKP
++x1FYr8wT2wCACs19lqN4MHYwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsG
++AQUFBwMBMAwGA1UdEwEB/wQCMAAwGgYDVR0RBBMwEYIPd3d3LmV4YW1wbGUuY29t
++MCUGA1UdIAQeMBwwDAYKYIZIAWUDAgEwATAMBgpghkgBZQMCATACMAoGCCqGSM49
++BAMCA0gAMEUCIDGT8SVBkWJEZ2EzXm8M895NrNRmfc8uoheP0KKv+ndHAiEA2Onr
++20J+zTaR7vONY/1DleMm7fGY3UxTobSHSvOKbfY=
++-----END CERTIFICATE-----
+diff --git a/test/recipes/80-test_policy_tree_data/large_policy_tree.pem b/test/recipes/80-test_policy_tree_data/large_policy_tree.pem
+new file mode 100644
+index 0000000000..5cd31c355b
+--- /dev/null
++++ b/test/recipes/80-test_policy_tree_data/large_policy_tree.pem
+@@ -0,0 +1,434 @@
++-----BEGIN CERTIFICATE-----
++MIICEDCCAbagAwIBAgIBATAKBggqhkjOPQQDAjAWMRQwEgYDVQQDEwtQb2xpY3kg
++Q0EgMjAgFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowFjEUMBIGA1UE
++AxMLUG9saWN5IENBIDEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATgyLz1C0dD
++ib5J/QmoE4d+Nf5yvvlzjVZHWIu7iCMEqK67cnA1RtMp1d0xdiNQS6si3ExNPBF+
++ELdkP0E6x26Jo4HyMIHvMA4GA1UdDwEB/wQEAwICBDATBgNVHSUEDDAKBggrBgEF
++BQcDATAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSs+ml5upH1h25oUB0Ep4vd
++SUdZ/DAlBgNVHSAEHjAcMAwGCmCGSAFlAwIBMAEwDAYKYIZIAWUDAgEwAjBxBgNV
++HSEEajBoMBgGCmCGSAFlAwIBMAEGCmCGSAFlAwIBMAEwGAYKYIZIAWUDAgEwAQYK
++YIZIAWUDAgEwAjAYBgpghkgBZQMCATACBgpghkgBZQMCATABMBgGCmCGSAFlAwIB
++MAIGCmCGSAFlAwIBMAIwCgYIKoZIzj0EAwIDSAAwRQIhAOME8j1/cMogNnuNCb0O
++RIOE9pLP4je78KJiP8CZm0iOAiALr8NI67orD/VpfRptkjCmOd7rTWMVOOJfBr6N
++VJFLjw==
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++MIICDzCCAbagAwIBAgIBAjAKBggqhkjOPQQDAjAWMRQwEgYDVQQDEwtQb2xpY3kg
++Q0EgMzAgFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowFjEUMBIGA1UE
++AxMLUG9saWN5IENBIDIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASIdzU/FF3Y
++rTsTX04fRIN2yrZwxvOAfZ6DuEgKRxEimJx1nCyETuMmfDowm52mx/Cyk08xorp8
++PhGEbacMd9kio4HyMIHvMA4GA1UdDwEB/wQEAwICBDATBgNVHSUEDDAKBggrBgEF
++BQcDATAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSwok/8RfJbVGTzyF5jhWLc
++hO7pcDAlBgNVHSAEHjAcMAwGCmCGSAFlAwIBMAEwDAYKYIZIAWUDAgEwAjBxBgNV
++HSEEajBoMBgGCmCGSAFlAwIBMAEGCmCGSAFlAwIBMAEwGAYKYIZIAWUDAgEwAQYK
++YIZIAWUDAgEwAjAYBgpghkgBZQMCATACBgpghkgBZQMCATABMBgGCmCGSAFlAwIB
++MAIGCmCGSAFlAwIBMAIwCgYIKoZIzj0EAwIDRwAwRAIgYVF7bXxUuOzAZF6SmeIJ
++s+iL15bLSQ2rW7QDc6QYp9MCIAup6YokIcr8JaGttHmLaKbASQLxYDGHhfFIVZuI
++BDvT
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++MIICEDCCAbagAwIBAgIBAzAKBggqhkjOPQQDAjAWMRQwEgYDVQQDEwtQb2xpY3kg
++Q0EgNDAgFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowFjEUMBIGA1UE
++AxMLUG9saWN5IENBIDMwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ38Llxxj32
++H3NN4Z1V8IuRKXLNhdU4z+NbT1rahusEyAHF+z9VTjim+HHfqFKV1QyNOJZ4rMA9
++J/gODWsNCT4po4HyMIHvMA4GA1UdDwEB/wQEAwICBDATBgNVHSUEDDAKBggrBgEF
++BQcDATAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS11YgFNKTx3a6kssIijnA9
++DiOhoTAlBgNVHSAEHjAcMAwGCmCGSAFlAwIBMAEwDAYKYIZIAWUDAgEwAjBxBgNV
++HSEEajBoMBgGCmCGSAFlAwIBMAEGCmCGSAFlAwIBMAEwGAYKYIZIAWUDAgEwAQYK
++YIZIAWUDAgEwAjAYBgpghkgBZQMCATACBgpghkgBZQMCATABMBgGCmCGSAFlAwIB
++MAIGCmCGSAFlAwIBMAIwCgYIKoZIzj0EAwIDSAAwRQIhAJXNZHMpvlnMfxhcG6EF
++Vw1pEXJ+iZnWT+Yu02a2zhamAiAiOKNhALBw/iKhQrwLo0cdx6UEfUKbaqTSGiax
++tHUylA==
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++MIICEDCCAbagAwIBAgIBBDAKBggqhkjOPQQDAjAWMRQwEgYDVQQDEwtQb2xpY3kg
++Q0EgNTAgFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowFjEUMBIGA1UE
++AxMLUG9saWN5IENBIDQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATo81HWQ/we
++egmoO/LMntQK1VQ9YzU627nblv/XWoOjEd/tBeE8+Un4jUnhZqNrP2TAzy48jEaT
++1DShCQNQGek7o4HyMIHvMA4GA1UdDwEB/wQEAwICBDATBgNVHSUEDDAKBggrBgEF
++BQcDATAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS6/F38QgbZSHib0W1XtMfs
++4O5DTDAlBgNVHSAEHjAcMAwGCmCGSAFlAwIBMAEwDAYKYIZIAWUDAgEwAjBxBgNV
++HSEEajBoMBgGCmCGSAFlAwIBMAEGCmCGSAFlAwIBMAEwGAYKYIZIAWUDAgEwAQYK
++YIZIAWUDAgEwAjAYBgpghkgBZQMCATACBgpghkgBZQMCATABMBgGCmCGSAFlAwIB
++MAIGCmCGSAFlAwIBMAIwCgYIKoZIzj0EAwIDSAAwRQIgXMYCQWi5/6iQw+zqyEav
++CE7kOfTpm9GN4bZX5Eau5AACIQD0rDZwsjWf6hI2Hn8IlpwYVVC9bpxrAM/JmYuu
++79V/uw==
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++MIICEDCCAbagAwIBAgIBBTAKBggqhkjOPQQDAjAWMRQwEgYDVQQDEwtQb2xpY3kg
++Q0EgNjAgFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowFjEUMBIGA1UE
++AxMLUG9saWN5IENBIDUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARsPMjOkmzJ
++2jwT30mKUvAFYVgOlgcoXxYr61p54mbQMmmH49ABmJQMu5rjwjwYlYA3UzbEN9ki
++hMsJz/4JIrJGo4HyMIHvMA4GA1UdDwEB/wQEAwICBDATBgNVHSUEDDAKBggrBgEF
++BQcDATAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQeflZRWUze+7jne9MkYYy5
++iWFgJDAlBgNVHSAEHjAcMAwGCmCGSAFlAwIBMAEwDAYKYIZIAWUDAgEwAjBxBgNV
++HSEEajBoMBgGCmCGSAFlAwIBMAEGCmCGSAFlAwIBMAEwGAYKYIZIAWUDAgEwAQYK
++YIZIAWUDAgEwAjAYBgpghkgBZQMCATACBgpghkgBZQMCATABMBgGCmCGSAFlAwIB
++MAIGCmCGSAFlAwIBMAIwCgYIKoZIzj0EAwIDSAAwRQIhAIN6BjMnPlixl3i6Z1Xa
++pZQt52MOCHPm0XzXDn2XlC9+AiAn146u8rbppdEGMFr21vfFZaktwEb0cZkC9fBp
++S1uKwQ==
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++MIICEDCCAbagAwIBAgIBBjAKBggqhkjOPQQDAjAWMRQwEgYDVQQDEwtQb2xpY3kg
++Q0EgNzAgFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowFjEUMBIGA1UE
++AxMLUG9saWN5IENBIDYwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASVmpozZzxX
++f6rFinkqS0y8sfbOwcM0gNuR0x83mmZH5+a8W4ug5W80QiBaS3rHtwTsFHpCeQKq
++eJvfb/esgJu8o4HyMIHvMA4GA1UdDwEB/wQEAwICBDATBgNVHSUEDDAKBggrBgEF
++BQcDATAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQPuF2sXR0vOHJynh57qefK
+++h7RGDAlBgNVHSAEHjAcMAwGCmCGSAFlAwIBMAEwDAYKYIZIAWUDAgEwAjBxBgNV
++HSEEajBoMBgGCmCGSAFlAwIBMAEGCmCGSAFlAwIBMAEwGAYKYIZIAWUDAgEwAQYK
++YIZIAWUDAgEwAjAYBgpghkgBZQMCATACBgpghkgBZQMCATABMBgGCmCGSAFlAwIB
++MAIGCmCGSAFlAwIBMAIwCgYIKoZIzj0EAwIDSAAwRQIgDX0jHPq1alZoMbPDmbZp
++QYuM9UQagQ5KJgVU1B0Mh2ECIQCtdyfT2h5jZvz3lLKkQ9a6LddIuqsyNKDAxbpb
++PlBOOA==
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++MIICEDCCAbagAwIBAgIBBzAKBggqhkjOPQQDAjAWMRQwEgYDVQQDEwtQb2xpY3kg
++Q0EgODAgFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowFjEUMBIGA1UE
++AxMLUG9saWN5IENBIDcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASb+9fN9RLe
++SHGynsKXhLWGhIS/kZ6Yl97+h23xpjLaZUOzhn5VafXdmLrQ4BmqSMHqIKzcc8IB
++STV3NwO4NxPBo4HyMIHvMA4GA1UdDwEB/wQEAwICBDATBgNVHSUEDDAKBggrBgEF
++BQcDATAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTBF9x+MrsyqoCaTQ2kB7Bn
++tpK2qDAlBgNVHSAEHjAcMAwGCmCGSAFlAwIBMAEwDAYKYIZIAWUDAgEwAjBxBgNV
++HSEEajBoMBgGCmCGSAFlAwIBMAEGCmCGSAFlAwIBMAEwGAYKYIZIAWUDAgEwAQYK
++YIZIAWUDAgEwAjAYBgpghkgBZQMCATACBgpghkgBZQMCATABMBgGCmCGSAFlAwIB
++MAIGCmCGSAFlAwIBMAIwCgYIKoZIzj0EAwIDSAAwRQIhAI37Di/5MrSj2clr+2pX
++iXzeDIvlaxzVetyH3ibUZZBSAiA41aPIssHi9evv2mZonEvXY8g+DKbh/3L2mSub
++/AyLoA==
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++MIICETCCAbagAwIBAgIBCDAKBggqhkjOPQQDAjAWMRQwEgYDVQQDEwtQb2xpY3kg
++Q0EgOTAgFw0wMDAxMDEwMDAwMDBaGA8yMTAwMDEwMTAwMDAwMFowFjEUMBIGA1UE
++AxMLUG9saWN5IENBIDgwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASrRS12/zEP
++RUNye9SLadN4xK+xfTwyXfxeC+jam+J98lOMcHz6abnLpk5tJ7wab4Pkygsbj1V2

_service:tar_scm:CVE-2022-0778-Add-a-negative-testcase-for-BN_mod_sqrt.patch Deleted

@@ -1,58 +0,0 @@
-From 3ef5c3034e5c545f34d6929568f3f2b10ac4bdf0 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tomas@openssl.org>
-Date: Mon, 28 Feb 2022 18:26:35 +0100
-Subject: PATCH Add a negative testcase for BN_mod_sqrt
-
-Reviewed-by: Paul Dale <pauli@openssl.org>
-Reviewed-by: Matt Caswell <matt@openssl.org>
----
- test/bntest.c                          | 11 ++++++++++-
- test/recipes/10-test_bn_data/bnmod.txt | 12 ++++++++++++
- 2 files changed, 22 insertions(+), 1 deletion(-)
-
-diff --git a/test/bntest.c b/test/bntest.c
-index 390dd80073..1cab660bca 100644
---- a/test/bntest.c
-+++ b/test/bntest.c
-@@ -1729,8 +1729,17 @@ static int file_modsqrt(STANZA *s)
-             || !TEST_ptr(ret2 = BN_new()))
-         goto err;
- 
-+    if (BN_is_negative(mod_sqrt)) {
-+        /* A negative testcase */
-+        if (!TEST_ptr_null(BN_mod_sqrt(ret, a, p, ctx)))
-+            goto err;
-+
-+        st = 1;
-+        goto err;
-+    }
-+
-     /* There are two possible answers. */
--    if (!TEST_true(BN_mod_sqrt(ret, a, p, ctx))
-+    if (!TEST_ptr(BN_mod_sqrt(ret, a, p, ctx))
-             || !TEST_true(BN_sub(ret2, p, ret)))
-         goto err;
- 
-diff --git a/test/recipes/10-test_bn_data/bnmod.txt b/test/recipes/10-test_bn_data/bnmod.txt
-index 5ea4d031f2..e28cc6bfb0 100644
---- a/test/recipes/10-test_bn_data/bnmod.txt
-+++ b/test/recipes/10-test_bn_data/bnmod.txt
-@@ -2799,3 +2799,15 @@ P = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f
- ModSqrt = a1d52989f12f204d3d2167d9b1e6c8a6174c0c786a979a5952383b7b8bd186
- A = 2eee37cf06228a387788188e650bc6d8a2ff402931443f69156a29155eca07dcb45f3aac238d92943c0c25c896098716baa433f25bd696a142f5a69d5d937e81
- P = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f
-+
-+# Negative testcases for BN_mod_sqrt()
-+
-+# This one triggers an infinite loop with unfixed implementation
-+# It should just fail.
-+ModSqrt = -1
-+A = 20a7ee
-+P = 460201
-+
-+ModSqrt = -1
-+A = 65bebdb00a96fc814ec44b81f98b59fba3c30203928fa5214c51e0a97091645280c947b005847f239758482b9bfc45b066fde340d1fe32fc9c1bf02e1b2d0ed
-+P = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f
--- 
-2.27.0
-

_service:tar_scm:CVE-2022-0778-Fix-possible-infinite-loop-in-BN_mod_sqrt.patch Deleted

@@ -1,69 +0,0 @@
-From 3118eb64934499d93db3230748a452351d1d9a65 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tomas@openssl.org>
-Date: Mon, 28 Feb 2022 18:26:21 +0100
-Subject: PATCH Fix possible infinite loop in BN_mod_sqrt()
-
-The calculation in some cases does not finish for non-prime p.
-
-This fixes CVE-2022-0778.
-
-Based on patch by David Benjamin <davidben@google.com>.
-
-Reviewed-by: Paul Dale <pauli@openssl.org>
-Reviewed-by: Matt Caswell <matt@openssl.org>
----
- crypto/bn/bn_sqrt.c | 30 ++++++++++++++++++------------
- 1 file changed, 18 insertions(+), 12 deletions(-)
-
-diff --git a/crypto/bn/bn_sqrt.c b/crypto/bn/bn_sqrt.c
-index 1723d5ded5..53b0f55985 100644
---- a/crypto/bn/bn_sqrt.c
-+++ b/crypto/bn/bn_sqrt.c
-@@ -14,7 +14,8 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
- /*
-  * Returns 'ret' such that ret^2 == a (mod p), using the Tonelli/Shanks
-  * algorithm (cf. Henri Cohen, "A Course in Algebraic Computational Number
-- * Theory", algorithm 1.5.1). 'p' must be prime!
-+ * Theory", algorithm 1.5.1). 'p' must be prime, otherwise an error or
-+ * an incorrect "result" will be returned.
-  */
- {
-     BIGNUM *ret = in;
-@@ -301,18 +302,23 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
-             goto vrfy;
-         }
- 
--        /* find smallest  i  such that  b^(2^i) = 1 */
--        i = 1;
--        if (!BN_mod_sqr(t, b, p, ctx))
--            goto end;
--        while (!BN_is_one(t)) {
--            i++;
--            if (i == e) {
--                BNerr(BN_F_BN_MOD_SQRT, BN_R_NOT_A_SQUARE);
--                goto end;
-+        /* Find the smallest i, 0 < i < e, such that b^(2^i) = 1. */
-+        for (i = 1; i < e; i++) {
-+            if (i == 1) {
-+                if (!BN_mod_sqr(t, b, p, ctx))
-+                    goto end;
-+
-+            } else {
-+                if (!BN_mod_mul(t, t, t, p, ctx))
-+                    goto end;
-             }
--            if (!BN_mod_mul(t, t, t, p, ctx))
--                goto end;
-+            if (BN_is_one(t))
-+                break;
-+        }
-+        /* If not found, a is not a square or p is not prime. */
-+        if (i >= e) {
-+            BNerr(BN_F_BN_MOD_SQRT, BN_R_NOT_A_SQUARE);
-+            goto end;
-         }
- 
-         /* t := y^2^(e - i - 1) */
--- 
-2.27.0
-

_service:tar_scm:CVE-2022-1292.patch Deleted

@@ -1,76 +0,0 @@
-From e5fd1728ef4c7a5bf7c7a7163ca60370460a6e23 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tomas@openssl.org>
-Date: Tue, 26 Apr 2022 12:40:24 +0200
-Subject: PATCH c_rehash: Do not use shell to invoke openssl
-
-Except on VMS where it is safe.
-
-This fixes CVE-2022-1292.
-
-Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
-Reviewed-by: Matt Caswell <matt@openssl.org>
----
- tools/c_rehash.in | 29 +++++++++++++++++++++++++----
- 1 file changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index fa7c6c9..83c1cc8 100644
---- a/tools/c_rehash.in
-+++ b/tools/c_rehash.in
-@@ -152,6 +152,23 @@ sub check_file {
- 	return ($is_cert, $is_crl);
- }
- 
-+sub compute_hash {
-+    my $fh;
-+    if ( $^O eq "VMS" ) {
-+        # VMS uses the open through shell
-+        # The file names are safe there and list form is unsupported
-+        if (!open($fh, "-|", join(' ', @_))) {
-+            print STDERR "Cannot compute hash on '$fname'\n";
-+            return;
-+        }
-+    } else {
-+        if (!open($fh, "-|", @_)) {
-+            print STDERR "Cannot compute hash on '$fname'\n";
-+            return;
-+        }
-+    }
-+    return (<$fh>, <$fh>);
-+}
- 
- # Link a certificate to its subject name hash value, each hash is of
- # the form <hash>.<n> where n is an integer. If the hash value already exists
-@@ -161,10 +178,12 @@ sub check_file {
- 
- sub link_hash_cert {
- 		my $fname = $_0;
--		$fname =~ s/\"/\\\"/g;
--		my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
-+		my ($hash, $fprint) = compute_hash($openssl, "x509", $x509hash,
-+						   "-fingerprint", "-noout",
-+						   "-in", $fname);
- 		chomp $hash;
- 		chomp $fprint;
-+		return if !$hash;
- 		$fprint =~ s/^.*=//;
- 		$fprint =~ tr/://d;
- 		my $suffix = 0;
-@@ -202,10 +221,12 @@ sub link_hash_cert {
- 
- sub link_hash_crl {
- 		my $fname = $_0;
--		$fname =~ s/'/'\\''/g;
--		my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
-+		my ($hash, $fprint) = compute_hash($openssl, "crl", $crlhash,
-+						   "-fingerprint", "-noout",
-+						   "-in", $fname);
- 		chomp $hash;
- 		chomp $fprint;
-+		return if !$hash;
- 		$fprint =~ s/^.*=//;
- 		$fprint =~ tr/://d;
- 		my $suffix = 0;
--- 
-1.8.3.1
-

_service:tar_scm:CVE-2022-2068-Fix-file-operations-in-c_rehash.patch Deleted

@@ -1,257 +0,0 @@
-From 9639817dac8bbbaa64d09efad7464ccc405527c7 Mon Sep 17 00:00:00 2001
-From: Daniel Fiala <daniel@openssl.org>
-Date: Sun, 29 May 2022 20:11:24 +0200
-Subject: PATCH Fix file operations in c_rehash.
-
-CVE-2022-2068
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-Reviewed-by: Richard Levitte <levitte@openssl.org>
----
- tools/c_rehash.in | 216 +++++++++++++++++++++++++++---------------------------
- 1 file changed, 107 insertions(+), 109 deletions(-)
-
-diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index cfd18f5..9d2a6f6 100644
---- a/tools/c_rehash.in
-+++ b/tools/c_rehash.in
-@@ -104,52 +104,78 @@ foreach (@dirlist) {
- }
- exit($errorcount);
- 
-+sub copy_file {
-+    my ($src_fname, $dst_fname) = @_;
-+
-+    if (open(my $in, "<", $src_fname)) {
-+        if (open(my $out, ">", $dst_fname)) {
-+            print $out $_ while (<$in>);
-+            close $out;
-+        } else {
-+            warn "Cannot open $dst_fname for write, $!";
-+        }
-+        close $in;
-+    } else {
-+        warn "Cannot open $src_fname for read, $!";
-+    }
-+}
-+
- sub hash_dir {
--	my %hashlist;
--	print "Doing $_0\n";
--	chdir $_0;
--	opendir(DIR, ".");
--	my @flist = sort readdir(DIR);
--	closedir DIR;
--	if ( $removelinks ) {
--		# Delete any existing symbolic links
--		foreach (grep {/^\da-f+\.r{0,1}\d+$/} @flist) {
--			if (-l $_) {
--				print "unlink $_" if $verbose;
--				unlink $_ || warn "Can't unlink $_, $!\n";
--			}
--		}
--	}
--	FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
--		# Check to see if certificates and/or CRLs present.
--		my ($cert, $crl) = check_file($fname);
--		if (!$cert && !$crl) {
--			print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
--			next;
--		}
--		link_hash_cert($fname) if ($cert);
--		link_hash_crl($fname) if ($crl);
--	}
-+    my $dir = shift;
-+    my %hashlist;
-+
-+    print "Doing $dir\n";
-+
-+    if (!chdir $dir) {
-+        print STDERR "WARNING: Cannot chdir to '$dir', $!\n";
-+        return;
-+    }
-+
-+    opendir(DIR, ".") || print STDERR "WARNING: Cannot opendir '.', $!\n";
-+    my @flist = sort readdir(DIR);
-+    closedir DIR;
-+    if ( $removelinks ) {
-+        # Delete any existing symbolic links
-+        foreach (grep {/^\da-f+\.r{0,1}\d+$/} @flist) {
-+            if (-l $_) {
-+                print "unlink $_\n" if $verbose;
-+                unlink $_ || warn "Can't unlink $_, $!\n";
-+            }
-+        }
-+    }
-+    FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
-+        # Check to see if certificates and/or CRLs present.
-+        my ($cert, $crl) = check_file($fname);
-+        if (!$cert && !$crl) {
-+            print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
-+            next;
-+        }
-+        link_hash_cert($fname) if ($cert);
-+        link_hash_crl($fname) if ($crl);
-+    }
-+
-+    chdir $pwd;
- }
- 
- sub check_file {
--	my ($is_cert, $is_crl) = (0,0);
--	my $fname = $_0;
--	open IN, $fname;
--	while(<IN>) {
--		if (/^-----BEGIN (.*)-----/) {
--			my $hdr = $1;
--			if ($hdr =~ /^(X509 |TRUSTED |)CERTIFICATE$/) {
--				$is_cert = 1;
--				last if ($is_crl);
--			} elsif ($hdr eq "X509 CRL") {
--				$is_crl = 1;
--				last if ($is_cert);
--			}
--		}
--	}
--	close IN;
--	return ($is_cert, $is_crl);
-+    my ($is_cert, $is_crl) = (0,0);
-+    my $fname = $_0;
-+
-+    open(my $in, "<", $fname);
-+    while(<$in>) {
-+        if (/^-----BEGIN (.*)-----/) {
-+            my $hdr = $1;
-+            if ($hdr =~ /^(X509 |TRUSTED |)CERTIFICATE$/) {
-+                $is_cert = 1;
-+                last if ($is_crl);
-+            } elsif ($hdr eq "X509 CRL") {
-+                $is_crl = 1;
-+                last if ($is_cert);
-+            }
-+        }
-+    }
-+    close $in;
-+    return ($is_cert, $is_crl);
- }
- 
- sub compute_hash {
-@@ -177,76 +203,48 @@ sub compute_hash {
- # certificate fingerprints
- 
- sub link_hash_cert {
--		my $fname = $_0;
--		my ($hash, $fprint) = compute_hash($openssl, "x509", $x509hash,
--						   "-fingerprint", "-noout",
--						   "-in", $fname);
--		chomp $hash;
--		chomp $fprint;
--		return if !$hash;
--		$fprint =~ s/^.*=//;
--		$fprint =~ tr/://d;
--		my $suffix = 0;
--		# Search for an unused hash filename
--		while(exists $hashlist{"$hash.$suffix"}) {
--			# Hash matches: if fingerprint matches its a duplicate cert
--			if ($hashlist{"$hash.$suffix"} eq $fprint) {
--				print STDERR "WARNING: Skipping duplicate certificate $fname\n";
--				return;
--			}
--			$suffix++;
--		}
--		$hash .= ".$suffix";
--		if ($symlink_exists) {
--			print "link $fname -> $hash\n" if $verbose;
--			symlink $fname, $hash || warn "Can't symlink, $!";
--		} else {
--			print "copy $fname -> $hash\n" if $verbose;
--                        if (open($in, "<", $fname)) {
--                            if (open($out,">", $hash)) {
--                                print $out $_ while (<$in>);
--                                close $out;
--                            } else {
--                                warn "can't open $hash for write, $!";
--                            }
--                            close $in;
--                        } else {
--                            warn "can't open $fname for read, $!";
--                        }
--		}
--		$hashlist{$hash} = $fprint;
-+    link_hash($_0, 'cert');
- }
- 
- # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
- 
- sub link_hash_crl {
--		my $fname = $_0;
--		my ($hash, $fprint) = compute_hash($openssl, "crl", $crlhash,
--						   "-fingerprint", "-noout",
--						   "-in", $fname);
--		chomp $hash;
--		chomp $fprint;
--		return if !$hash;
--		$fprint =~ s/^.*=//;
--		$fprint =~ tr/://d;
--		my $suffix = 0;
--		# Search for an unused hash filename
--		while(exists $hashlist{"$hash.r$suffix"}) {
--			# Hash matches: if fingerprint matches its a duplicate cert

_service:tar_scm:CVE-2022-2097-Fix-AES-OCB-encrypt-decrypt-for-x86-AES-NI.patch Deleted

@@ -1,73 +0,0 @@
-From 919925673d6c9cfed3c1085497f5dfbbed5fc431 Mon Sep 17 00:00:00 2001
-From: Alex Chernyakhovsky <achernya@google.com>
-Date: Thu, 16 Jun 2022 12:00:22 +1000
-Subject: PATCH Fix AES OCB encrypt/decrypt for x86 AES-NI
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-aesni_ocb_encrypt and aesni_ocb_decrypt operate by having a fast-path
-that performs operations on 6 16-byte blocks concurrently (the
-"grandloop") and then proceeds to handle the "short" tail (which can
-be anywhere from 0 to 5 blocks) that remain.
-
-As part of initialization, the assembly initializes $len to the true
-length, less 96 bytes and converts it to a pointer so that the $inp
-can be compared to it. Each iteration of "grandloop" checks to see if
-there's a full 96-byte chunk to process, and if so, continues. Once
-this has been exhausted, it falls through to "short", which handles
-the remaining zero to five blocks.
-
-Unfortunately, the jump at the end of "grandloop" had a fencepost
-error, doing a `jb` ("jump below") rather than `jbe` (jump below or
-equal). This should be `jbe`, as $inp is pointing to the *end* of the
-chunk currently being handled. If $inp == $len, that means that
-there's a whole 96-byte chunk waiting to be handled. If $inp > $len,
-then there's 5 or fewer 16-byte blocks left to be handled, and the
-fall-through is intended.
-
-The net effect of `jb` instead of `jbe` is that the last 16-byte block
-of the last 96-byte chunk was completely omitted. The contents of
-`out` in this position were never written to. Additionally, since
-those bytes were never processed, the authentication tag generated is
-also incorrect.
-
-The same fencepost error, and identical logic, exists in both
-aesni_ocb_encrypt and aesni_ocb_decrypt.
-
-This addresses CVE-2022-2097.
-
-Co-authored-by: Alejandro Sedeño <asedeno@google.com>
-Co-authored-by: David Benjamin <davidben@google.com>
-
-Reviewed-by: Paul Dale <pauli@openssl.org>
-Reviewed-by: Tomas Mraz <tomas@openssl.org>
----
- crypto/aes/asm/aesni-x86.pl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/crypto/aes/asm/aesni-x86.pl b/crypto/aes/asm/aesni-x86.pl
-index fe2b265..812758e 100644
---- a/crypto/aes/asm/aesni-x86.pl
-+++ b/crypto/aes/asm/aesni-x86.pl
-@@ -2027,7 +2027,7 @@ my ($l_,$block,$i1,$i3,$i5) = ($rounds_,$key_,$rounds,$len,$out);
- 	&movdqu		(&QWP(-16*2,$out,$inp),$inout4);
- 	&movdqu		(&QWP(-16*1,$out,$inp),$inout5);
- 	&cmp		($inp,$len);			# done yet?
--	&jb		(&label("grandloop"));
-+	&jbe		(&label("grandloop"));
- 
- &set_label("short");
- 	&add		($len,16*6);
-@@ -2453,7 +2453,7 @@ my ($l_,$block,$i1,$i3,$i5) = ($rounds_,$key_,$rounds,$len,$out);
- 	&pxor		($rndkey1,$inout5);
- 	&movdqu		(&QWP(-16*1,$out,$inp),$inout5);
- 	&cmp		($inp,$len);			# done yet?
--	&jb		(&label("grandloop"));
-+	&jbe		(&label("grandloop"));
- 
- &set_label("short");
- 	&add		($len,16*6);
--- 
-1.8.3.1
-

_service:tar_scm:Feature-Support-TLCP-protocol.patch Deleted

@@ -1,6353 +0,0 @@
-From 897ef4d611facba29cde86fac6d161984d524da4 Mon Sep 17 00:00:00 2001
-From: s_c_c <shichuchao@huawei.com>
-Date: Mon, 27 Jun 2022 10:28:38 +0800
-Subject: PATCH Support TLCP protocol
-
-TLCP_method(), TLCP_server_method(), TLCP_client_method() are the GM version-specific methods for TLCP protocol.
-Valid TLCP ciphersuite names are ECDHE-SM4-CBC-SM3 and ECC-SM4-CBC-SM3. Additionally enable-tlcp(argument to Configure) was required.
----
- Configure                                     |   7 +-
- apps/s_client.c                               |  60 +-
- crypto/dh/dh_err.c                            |   8 +-
- crypto/dsa/dsa_err.c                          |   8 +-
- crypto/err/openssl.txt                        |  34 +-
- crypto/evp/evp_err.c                          |   6 +-
- crypto/evp/p_lib.c                            |  18 +
- crypto/rsa/rsa_err.c                          |  23 +-
- crypto/sm2/build.info                         |   2 +-
- crypto/sm2/sm2_err.c                          |   4 +-
- crypto/sm2/sm2_kep.c                          | 254 ++++++
- crypto/sm2/sm2_pmeth.c                        |   4 +
- doc/man1/s_client.pod                         |   9 +
- doc/man3/EVP_PKEY_set1_RSA.pod                |   9 +-
- doc/man3/SSL_CTX_new.pod                      |  19 +-
- doc/man3/SSL_CTX_set_options.pod              |   4 +-
- doc/man3/SSL_CTX_use_certificate.pod          |  56 +-
- doc/man7/ssl.pod                              |  40 +
- include/crypto/sm2.h                          |   1 +
- include/crypto/sm2err.h                       |  12 +-
- include/openssl/dherr.h                       |  15 +-
- include/openssl/dsaerr.h                      |  18 +-
- include/openssl/evp.h                         |   4 +
- include/openssl/evperr.h                      |  17 +-
- include/openssl/rsaerr.h                      |  32 +-
- include/openssl/sm2.h                         |  20 +
- include/openssl/ssl.h                         |  71 ++
- include/openssl/sslerr.h                      |  33 +-
- include/openssl/tls1.h                        |  20 +
- include/openssl/x509.h                        |   4 +
- include/openssl/x509err.h                     |   4 +-
- ssl/methods.c                                 |  36 +
- ssl/record/ssl3_record.c                      |   4 +
- ssl/s3_lib.c                                  | 126 +++
- ssl/ssl_asn1.c                                |   3 +-
- ssl/ssl_cert.c                                |  18 +
- ssl/ssl_cert_table.h                          |   6 +-
- ssl/ssl_ciph.c                                |  46 +-
- ssl/ssl_err.c                                 |  54 +-
- ssl/ssl_lib.c                                 |  81 +-
- ssl/ssl_local.h                               |  69 +-
- ssl/ssl_rsa.c                                 | 541 +++++++++++++
- ssl/ssl_sess.c                                |   3 +
- ssl/ssl_stat.c                                |  28 +
- ssl/statem/extensions.c                       |   6 +-
- ssl/statem/extensions_clnt.c                  |   3 +
- ssl/statem/extensions_srvr.c                  |   6 +-
- ssl/statem/statem.c                           |   4 +
- ssl/statem/statem_clnt.c                      | 434 ++++++++++
- ssl/statem/statem_lib.c                       | 182 ++++-
- ssl/statem/statem_srvr.c                      | 445 ++++++++++-
- ssl/t1_enc.c                                  |  84 ++
- ssl/t1_lib.c                                  | 130 ++-
- test/build.info                               |   6 +-
- test/ciphername_test.c                        |   3 +
- test/recipes/85-test_tlcp.t                   |  34 +
- .../85-test_tlcp_data/ecdsa-client-cert.pem   |  12 +
- .../85-test_tlcp_data/ecdsa-client-key.pem    |   5 +
- .../85-test_tlcp_data/ecdsa-root-cert.pem     |  14 +
- .../85-test_tlcp_data/ecdsa-server-cert.pem   |  12 +
- .../85-test_tlcp_data/ecdsa-server-key.pem    |   5 +
- .../85-test_tlcp_data/sm2-client-enc-cert.pem |  12 +
- .../85-test_tlcp_data/sm2-client-enc-key.pem  |   5 +
- .../85-test_tlcp_data/sm2-client-sig-cert.pem |  12 +
- .../85-test_tlcp_data/sm2-client-sig-key.pem  |   5 +
- .../85-test_tlcp_data/sm2-root-cert.pem       |  14 +
- .../85-test_tlcp_data/sm2-server-enc-cert.pem |  12 +
- .../85-test_tlcp_data/sm2-server-enc-key.pem  |   5 +
- .../85-test_tlcp_data/sm2-server-sig-cert.pem |  12 +
- .../85-test_tlcp_data/sm2-server-sig-key.pem  |   5 +
- test/sm2_internal_test.c                      | 111 +++
- test/tlcptest.c                               | 746 ++++++++++++++++++
- util/libcrypto.num                            |   2 +
- util/libssl.num                               |  17 +
- 74 files changed, 4065 insertions(+), 109 deletions(-)
- create mode 100644 crypto/sm2/sm2_kep.c
- create mode 100644 include/openssl/sm2.h
- create mode 100644 test/recipes/85-test_tlcp.t
- create mode 100644 test/recipes/85-test_tlcp_data/ecdsa-client-cert.pem
- create mode 100644 test/recipes/85-test_tlcp_data/ecdsa-client-key.pem
- create mode 100644 test/recipes/85-test_tlcp_data/ecdsa-root-cert.pem
- create mode 100644 test/recipes/85-test_tlcp_data/ecdsa-server-cert.pem
- create mode 100644 test/recipes/85-test_tlcp_data/ecdsa-server-key.pem
- create mode 100644 test/recipes/85-test_tlcp_data/sm2-client-enc-cert.pem
- create mode 100644 test/recipes/85-test_tlcp_data/sm2-client-enc-key.pem
- create mode 100644 test/recipes/85-test_tlcp_data/sm2-client-sig-cert.pem
- create mode 100644 test/recipes/85-test_tlcp_data/sm2-client-sig-key.pem
- create mode 100644 test/recipes/85-test_tlcp_data/sm2-root-cert.pem
- create mode 100644 test/recipes/85-test_tlcp_data/sm2-server-enc-cert.pem
- create mode 100644 test/recipes/85-test_tlcp_data/sm2-server-enc-key.pem
- create mode 100644 test/recipes/85-test_tlcp_data/sm2-server-sig-cert.pem
- create mode 100644 test/recipes/85-test_tlcp_data/sm2-server-sig-key.pem
- create mode 100644 test/tlcptest.c
-
-diff --git a/Configure b/Configure
-index 4236e6c..a41c897 100755
---- a/Configure
-+++ b/Configure
-@@ -425,6 +425,7 @@ my @disablables = (
-     "stdio",
-     "tests",
-     "threads",
-+    "tlcp",
-     "tls",
-     "ts",
-     "ubsan",
-@@ -469,6 +470,7 @@ our %disabled = ( # "what"         => "comment"
-                   "ssl-trace"           => "default",
-                   "ssl3"                => "default",
-                   "ssl3-method"         => "default",
-+                  "tlcp"                => "default",
-                   "ubsan"               => "default",
-                   "unit-test"           => "default",
-                   "weak-ssl-ciphers"    => "default",
-@@ -512,8 +514,9 @@ my @disable_cascades = (
-     "apps"              =>  "tests" ,
-     "tests"             =>  "external-tests" ,
-     "comp"              =>  "zlib" ,
--    "ec"                =>  "tls1_3", "sm2" ,
--    "sm3"               =>  "sm2" ,
-+    "ec"                =>  "tls1_3", "sm2", "tlcp" ,
-+    "sm3"               =>  "sm2", "tlcp" ,
-+    "sm2"               =>  "tlcp" ,
-     sub { !$disabled{"unit-test"} } =>  "heartbeats" ,
- 
-     sub { !$disabled{"msan"} } =>  "asm" ,
-diff --git a/apps/s_client.c b/apps/s_client.c
-index 121cd14..a41f98a 100644
---- a/apps/s_client.c
-+++ b/apps/s_client.c
-@@ -578,6 +578,7 @@ typedef enum OPTION_choice {
-     OPT_SRPUSER, OPT_SRPPASS, OPT_SRP_STRENGTH, OPT_SRP_LATEUSER,
-     OPT_SRP_MOREGROUPS,
- #endif
-+    OPT_TLCP, OPT_DCERT, OPT_DKEY, OPT_DPASS,
-     OPT_SSL3, OPT_SSL_CONFIG,
-     OPT_TLS1_3, OPT_TLS1_2, OPT_TLS1_1, OPT_TLS1, OPT_DTLS, OPT_DTLS1,
-     OPT_DTLS1_2, OPT_SCTP, OPT_TIMEOUT, OPT_MTU, OPT_KEYFORM, OPT_PASS,
-@@ -738,6 +739,12 @@ const OPTIONS s_client_options = {
- #ifndef OPENSSL_NO_TLS1_3
-     {"tls1_3", OPT_TLS1_3, '-', "Just use TLSv1.3"},
- #endif
-+#ifndef OPENSSL_NO_TCLP
-+    {"tlcp", OPT_TLCP, '-', "Just use TLCP"},
-+    {"dcert", OPT_DCERT, '<', "Encryption certificate file to use (usually for TLCP)"},
-+    {"dkey", OPT_DKEY, '<', "Encryption private key file to use (usually for TLCP)"},
-+    {"dpass", OPT_DPASS, 's', "Encryption private key file pass phrase source"},
-+#endif
- #ifndef OPENSSL_NO_DTLS
-     {"dtls", OPT_DTLS, '-', "Use any version of DTLS"},
-     {"timeout", OPT_TIMEOUT, '-',
-@@ -836,7 +843,7 @@ static const OPT_PAIR services = {
- 
- #define IS_PROT_FLAG(o) \
-  (o == OPT_SSL3 || o == OPT_TLS1 || o == OPT_TLS1_1 || o == OPT_TLS1_2 \
--  || o == OPT_TLS1_3 || o == OPT_DTLS || o == OPT_DTLS1 || o == OPT_DTLS1_2)
-+  || o == OPT_TLS1_3 || o == OPT_DTLS || o == OPT_DTLS1 || o == OPT_DTLS1_2 || o == OPT_TLCP)
- 
- /* Free |*dest| and optionally set it to a copy of |source|. */
- static void freeandcopy(char **dest, const char *source)
-@@ -982,6 +989,10 @@ int s_client_main(int argc, char **argv)
- #ifndef OPENSSL_NO_SCTP
-     int sctp_label_bug = 0;
- #endif
-+    char *s_dcert_file = NULL, *s_dkey_file = NULL;
-+    char *dpassarg = NULL, *dpass = NULL;
-+    X509 *s_dcert = NULL;
-+    EVP_PKEY *s_dkey = NULL;
- 
-     FD_ZERO(&readfds);
-     FD_ZERO(&writefds);
-@@ -1318,6 +1329,14 @@ int s_client_main(int argc, char **argv)
-             socket_type = SOCK_STREAM;
- #ifndef OPENSSL_NO_DTLS
-             isdtls = 0;
-+#endif
-+            break;
-+        case OPT_TLCP:
-+            min_version = TLCP_VERSION;
-+            max_version = TLCP_VERSION;
-+            socket_type = SOCK_STREAM;
-+#ifndef OPENSSL_NO_DTLS
-+            isdtls = 0;
- #endif
-             break;
-         case OPT_DTLS:
-@@ -1381,6 +1400,15 @@ int s_client_main(int argc, char **argv)
-         case OPT_KEY:
-             key_file = opt_arg();
-             break;
-+        case OPT_DCERT:

_service:tar_scm:Feature-X509-command-supports-SM2-certificate-signing-with-default-sm2id.patch Deleted

@@ -1,87 +0,0 @@
-From d3e1106ea296a2ec94d27dd34692c34ad543ad04 Mon Sep 17 00:00:00 2001
-From: s_c_c <shichuchao@huawei.com>
-Date: Wed, 29 Jun 2022 17:54:50 +0800
-Subject: PATCH X509 command supports SM2 certificate signing with default
- sm2id
-
----
- apps/x509.c                |  4 ++++
- include/openssl/sm2.h      |  9 +++++++++
- test/recipes/25-test_req.t | 13 ++++++++++---
- 3 files changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/apps/x509.c b/apps/x509.c
-index 1043eba..2669894 100644
---- a/apps/x509.c
-+++ b/apps/x509.c
-@@ -1078,6 +1078,10 @@ static int sign(X509 *x, EVP_PKEY *pkey, int days, int clrext,
-         if (!X509V3_EXT_add_nconf(conf, &ctx, section, x))
-             goto err;
-     }
-+#ifndef OPENSSL_NO_SM2
-+    if (EVP_PKEY_is_sm2(pkey) && !EVP_PKEY_set_alias_type(pkey, EVP_PKEY_SM2))
-+        goto err;
-+#endif
-     if (!X509_sign(x, pkey, digest))
-         goto err;
-     return 1;
-diff --git a/include/openssl/sm2.h b/include/openssl/sm2.h
-index 505ebfc..cc517bc 100644
---- a/include/openssl/sm2.h
-+++ b/include/openssl/sm2.h
-@@ -1,3 +1,12 @@
-+/*
-+ * Copyright 2022 Huawei Technologies Co., Ltd. All Rights Reserved.
-+ *
-+ * Licensed under the OpenSSL license (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
-+ * https://www.openssl.org/source/license.html
-+ */
-+
- #ifndef HEADER_SM2_H
- # define HEADER_SM2_H
- 
-diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t
-index d53e577..2b0c08c 100644
---- a/test/recipes/25-test_req.t
-+++ b/test/recipes/25-test_req.t
-@@ -182,10 +182,10 @@ subtest "generating certificate requests" => sub {
- };
- 
- subtest "generating SM2 certificate requests" => sub {
--    plan tests => 4;
-+    plan tests => 5;
- 
-     SKIP: {
--        skip "SM2 is not supported by this OpenSSL build", 4
-+        skip "SM2 is not supported by this OpenSSL build", 5
-         if disabled("sm2");
-         ok(run(app("openssl", "req", "-config", srctop_file("test", "test.cnf"),
-                     "-new", "-key", srctop_file("test", "certs", "sm2.key"),
-@@ -198,6 +198,13 @@ subtest "generating SM2 certificate requests" => sub {
-                     "-sm2-id", "1234567812345678", "-sm3")),
-            "Verifying signature on SM2 certificate request");
- 
-+        # Use default sm2 id
-+        ok(run(app("openssl", "x509", "-req", "-extfile", srctop_file("test", "CAss.cnf"),
-+                    "-extensions", "v3_ca", "-sm3", "-days", "365",
-+                    "-in", "testreq.pem", "-signkey", srctop_file("test", "certs", "sm2.key"),
-+                    "-out", "testsign.pem")),
-+           "Signing SM2 certificate request");
-+
-         ok(run(app("openssl", "req", "-config", srctop_file("test", "test.cnf"),
-                     "-new", "-key", srctop_file("test", "certs", "sm2.key"),
-                     "-sigopt", "sm2_hex_id:DEADBEEF",
-@@ -218,7 +225,7 @@ run_conversion('req conversions',
- run_conversion('req conversions -- testreq2',
-                srctop_file("test", "testreq2.pem"));
- 
--unlink "testkey.pem", "testreq.pem", "testreq_withattrs_pem.pem", "testreq_withattrs_der.pem";
-+unlink "testkey.pem", "testreq.pem", "testreq_withattrs_pem.pem", "testreq_withattrs_der.pem", "testsign.pem";
- 
- sub run_conversion {
-     my $title = shift;
--- 
-2.20.1 (Apple Git-117)
-

_service:tar_scm:backport-Add-a-Certificate-Policies-Test.patch Added

@@ -0,0 +1,49 @@
+From dda529ecc2d085488eef60235ef553dc5fd6e6dc Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Tue, 7 Mar 2023 17:07:57 +0000
+Subject: PATCH Add a Certificate Policies Test
+
+Test that a valid certificate policy is accepted and that an invalid
+certificate policy is rejected. Specifically we are checking that a
+leaf certificate with an invalid policy is detected.
+
+Related-to: CVE-2023-0465
+
+Reviewed-by: Hugo Landau <hlandau@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/20587)
+---
+ test/recipes/25-test_verify.t | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t
+index 2a4c36e86d..818c9ac50d 100644
+--- a/test/recipes/25-test_verify.t
++++ b/test/recipes/25-test_verify.t
+@@ -29,7 +29,7 @@ sub verify {
+     run(app(@args));
+ }
+ 
+-plan tests => 164;
++plan tests => 166;
+ 
+ # Canonical success
+ ok(verify("ee-cert", "sslserver", "root-cert", "ca-cert"),
+@@ -516,3 +516,14 @@ SKIP: {
+     ok(run(app( qw(openssl verify -trusted), $rsapluscert_file, $cert_file )),
+        'Mixed key + cert file test');
+ }
++
++# Certificate Policies
++ok(verify("ee-cert-policies", "", "root-cert", "ca-pol-cert",
++          "-policy_check", "-policy", "1.3.6.1.4.1.16604.998855.1",
++          "-explicit_policy"),
++   "Certificate policy");
++
++ok(!verify("ee-cert-policies-bad", "", "root-cert", "ca-pol-cert",
++           "-policy_check", "-policy", "1.3.6.1.4.1.16604.998855.1",
++           "-explicit_policy"),
++   "Bad certificate policy");
+-- 
+2.36.1
+

_service:tar_scm:backport-CVE-2023-1255.patch Added

@@ -0,0 +1,89 @@
+From e1e1125b5ce110ef53770b4e6e18a34f772ab6eb Mon Sep 17 00:00:00 2001
+From: wzc <u201911736@hust.edu.cn>
+Date: Wed, 26 Apr 2023 17:08:15 +0800
+Subject: PATCH 60/60 backport-CVE-2023-1255,The buffer overread happens on decrypts of 4 mod 5 sizes.Unless the memory just after the buffer is unmapped this is harmless.
+
+Reviewed-by: Paul Dale <pauli@openssl.org>
+Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
+(Merged from https://github.com/openssl/openssl/pull/20759)
+
+(cherry picked from commit 72dfe46550ee1f1bbfacd49f071419365bc23304)
+---
+ CHANGES.md                 | 10 ++++++++++
+ NEWS.md                    |  2 ++
+ ...//crypto/aes/asm/aesv8-armx.pl         |  4 +++-
+ 3 files changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGES.md b/CHANGES.md
+index 7cdd9d9..6c33bf9 100644
+--- a/CHANGES.md
++++ b/CHANGES.md
+@@ -30,6 +30,15 @@ breaking changes, and mappings for the large list of deprecated functions.
+ 
+ ### Changes between 3.0.7 and 3.0.8 7 Feb 2023
+ 
++ * Fixed buffer overread in AES-XTS decryption on ARM 64 bit platforms which
++   happens if the buffer size is 4 mod 5. This can trigger a crash of an
++   application using AES-XTS decryption if the memory just after the buffer
++   being decrypted is not mapped.
++   Thanks to Anton Romanov (Amazon) for discovering the issue.
++   (CVE-2023-1255)
++
++   *Nevine Ebeid*
++
+  * Fixed NULL dereference during PKCS7 data verification.
+ 
+    A NULL pointer can be dereferenced when signatures are being
+@@ -19578,6 +19587,7 @@ ndif
+ 
+ 
+ 
++CVE-2023-1255: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-1255
+ CVE-2023-0401: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0401
+ CVE-2023-0286: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0286
+ CVE-2023-0217: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0217
+diff --git a/NEWS.md b/NEWS.md
+index 36dbfa7..86b1410 100644
+--- a/NEWS.md
++++ b/NEWS.md
+@@ -20,6 +20,7 @@ OpenSSL 3.0
+ 
+ ### Major changes between OpenSSL 3.0.7 and OpenSSL 3.0.8 7 Feb 2023
+ 
++  * Fixed buffer overread in AES-XTS decryption on ARM 64 bit platforms (CVE-2023-1255)
+   * Fixed NULL dereference during PKCS7 data verification (CVE-2023-0401)
+   * Fixed X.400 address type confusion in X.509 GeneralName (CVE-2023-0286)
+   * Fixed NULL dereference validating DSA public key (CVE-2023-0217)
+@@ -1430,6 +1431,7 @@ OpenSSL 0.9.x
+   * Support for various new platforms
+ 
+ 
++CVE-2023-1255: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-1255
+ CVE-2023-0401: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0401
+ CVE-2023-0286: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0286
+ CVE-2023-0217: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-0217
+diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl
+index 6a7bf05..5701373 100644
+--- a/crypto/aes/asm/aesv8-armx.pl
++++ b/crypto/aes/asm/aesv8-armx.pl
+@@ -3353,7 +3353,7 @@ $code.=<<___	if ($flavour =~ /64/);
+ .align	4
+ .Lxts_dec_tail4x:
+ 	add	$inp,$inp,#16
+-	vld1.32	{$dat0},$inp,#16
++	tst     $tailcnt,#0xf
+ 	veor	$tmp1,$dat1,$tmp0
+ 	vst1.8	{$tmp1},$out,#16
+ 	veor	$tmp2,$dat2,$tmp2
+@@ -3362,6 +3362,8 @@ $code.=<<___	if ($flavour =~ /64/);
+ 	veor	$tmp4,$dat4,$tmp4
+ 	vst1.8	{$tmp3-$tmp4},$out,#32
+ 
++    b.eq    .Lxts_dec_abort
++    vld1.32 {$dat0},$inp,#16
+ 	b	.Lxts_done
+ .align	4
+ .Lxts_outer_dec_tail:
+-- 
+2.37.0.windows.1
+

_service:tar_scm:backport-Ensure-that-EXFLAG_INVALID_POLICY-is-checked-even-in.patch Added

@@ -0,0 +1,52 @@
+From 1dd43e0709fece299b15208f36cc7c76209ba0bb Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Tue, 7 Mar 2023 16:52:55 +0000
+Subject: PATCH Ensure that EXFLAG_INVALID_POLICY is checked even in leaf
+ certs
+
+Even though we check the leaf cert to confirm it is valid, we
+later ignored the invalid flag and did not notice that the leaf
+cert was bad.
+
+Fixes: CVE-2023-0465
+
+Reviewed-by: Hugo Landau <hlandau@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/20587)
+---
+ crypto/x509/x509_vfy.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
+index 9384f1da9b..a0282c3ef1 100644
+--- a/crypto/x509/x509_vfy.c
++++ b/crypto/x509/x509_vfy.c
+@@ -1654,15 +1654,23 @@ static int check_policy(X509_STORE_CTX *ctx)
+         goto memerr;
+     /* Invalid or inconsistent extensions */
+     if (ret == X509_PCY_TREE_INVALID) {
+-        int i;
++        int i, cbcalled = 0;
+ 
+         /* Locate certificates with bad extensions and notify callback. */
+-        for (i = 1; i < sk_X509_num(ctx->chain); i++) {
++        for (i = 0; i < sk_X509_num(ctx->chain); i++) {
+             X509 *x = sk_X509_value(ctx->chain, i);
+ 
++            if ((x->ex_flags & EXFLAG_INVALID_POLICY) != 0)
++                cbcalled = 1;
+             CB_FAIL_IF((x->ex_flags & EXFLAG_INVALID_POLICY) != 0,
+                        ctx, x, i, X509_V_ERR_INVALID_POLICY_EXTENSION);
+         }
++        if (!cbcalled) {
++            /* Should not be able to get here */
++            ERR_raise(ERR_LIB_X509, ERR_R_INTERNAL_ERROR);
++            return 0;
++        }
++        /* The callback ignored the error so we return success */
+         return 1;
+     }
+     if (ret == X509_PCY_TREE_FAILURE) {
+-- 
+2.36.1
+

_service:tar_scm:backport-Fix-documentation-of-X509_VERIFY_PARAM_add0_policy.patch Added

@@ -0,0 +1,46 @@
+From 51e8a84ce742db0f6c70510d0159dad8f7825908 Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tomas@openssl.org>
+Date: Tue, 21 Mar 2023 16:15:47 +0100
+Subject: PATCH Fix documentation of X509_VERIFY_PARAM_add0_policy()
+
+The function was incorrectly documented as enabling policy checking.
+
+Fixes: CVE-2023-0466
+
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Reviewed-by: Paul Dale <pauli@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/20563)
+---
+ doc/man3/X509_VERIFY_PARAM_set_flags.pod | 9 +++++++--
+ 3 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/doc/man3/X509_VERIFY_PARAM_set_flags.pod b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+index 75a1677022..43c1900bca 100644
+--- a/doc/man3/X509_VERIFY_PARAM_set_flags.pod
++++ b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+@@ -98,8 +98,9 @@ B<trust>.
+ X509_VERIFY_PARAM_set_time() sets the verification time in B<param> to
+ B<t>. Normally the current time is used.
+ 
+-X509_VERIFY_PARAM_add0_policy() enables policy checking (it is disabled
+-by default) and adds B<policy> to the acceptable policy set.
++X509_VERIFY_PARAM_add0_policy() adds B<policy> to the acceptable policy set.
++Contrary to preexisting documentation of this function it does not enable
++policy checking.
+ 
+ X509_VERIFY_PARAM_set1_policies() enables policy checking (it is disabled
+ by default) and sets the acceptable policy set to B<policies>. Any existing
+@@ -400,6 +401,10 @@ The X509_VERIFY_PARAM_get_hostflags() function was added in OpenSSL 1.1.0i.
+ The X509_VERIFY_PARAM_get0_host(), X509_VERIFY_PARAM_get0_email(),
+ and X509_VERIFY_PARAM_get1_ip_asc() functions were added in OpenSSL 3.0.
+ 
++The function X509_VERIFY_PARAM_add0_policy() was historically documented as
++enabling policy checking however the implementation has never done this.
++The documentation was changed to align with the implementation.
++
+ =head1 COPYRIGHT
+ 
+ Copyright 2009-2023 The OpenSSL Project Authors. All Rights Reserved.
+-- 
+2.36.1
+

_service:tar_scm:backport-Generate-some-certificates-with-the-certificatePolic.patch Added

@@ -0,0 +1,146 @@
+From a4e726428608e352283d745cb0716248d29ecf26 Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Tue, 7 Mar 2023 15:22:40 +0000
+Subject: PATCH Generate some certificates with the certificatePolicies
+ extension
+
+Related-to: CVE-2023-0465
+
+Reviewed-by: Hugo Landau <hlandau@openssl.org>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/20585)
+---
+ test/certs/ca-pol-cert.pem          | 19 +++++++++++++++++++
+ test/certs/ee-cert-policies-bad.pem | 20 ++++++++++++++++++++
+ test/certs/ee-cert-policies.pem     | 20 ++++++++++++++++++++
+ test/certs/mkcert.sh                |  9 +++++++--
+ test/certs/setup.sh                 |  6 ++++++
+ 5 files changed, 72 insertions(+), 2 deletions(-)
+ create mode 100644 test/certs/ca-pol-cert.pem
+ create mode 100644 test/certs/ee-cert-policies-bad.pem
+ create mode 100644 test/certs/ee-cert-policies.pem
+
+diff --git a/test/certs/ca-pol-cert.pem b/test/certs/ca-pol-cert.pem
+new file mode 100644
+index 0000000000..244af3292b
+--- /dev/null
++++ b/test/certs/ca-pol-cert.pem
+@@ -0,0 +1,19 @@
++-----BEGIN CERTIFICATE-----
++MIIDFzCCAf+gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290
++IENBMCAXDTIzMDMwODEyMjMxNloYDzIxMjMwMzA5MTIyMzE2WjANMQswCQYDVQQD
++DAJDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJadpD0ASxxfxsvd
++j9IxsogVzMSGLFziaYuE9KejU9+R479RifvwfBANO62sNWJ19X//9G5UjwWmkiOz
++n1k50DkYsBBA3mJzik6wjt/c58lBIlSEgAgpvDU8ht8w3t20JP9+YqXAeugqFj/W
++l9rFQtsvaWSRywjXVlp5fxuEQelNnXcJEKhsKTNExsBUZebo4/J1BWpklWzA9P0l
++YW5INvDAAwcF1nzlEf0Y6Eot03IMNyg2MTE4hehxjdgCSci8GYnFirE/ojXqqpAc
++ZGh7r2dqWgZUD1Dh+bT2vjrUzj8eTH3GdzI+oljt29102JIUaqj3yzRYkah8FLF9
++CLNNsUcCAwEAAaN7MHkwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYD
++VR0OBBYEFLQRM/HX4l73U54gIhBPhga/H8leMB8GA1UdIwQYMBaAFI71Ja8em2uE
++PXyAmslTnE1y96NSMBkGA1UdIAQSMBAwDgYMKwYBBAGBgVy8+0cBMA0GCSqGSIb3
++DQEBCwUAA4IBAQBbE+MO9mewWIUY2kt85yhl0oZtvVxbn9K2Hty59ItwJGRNfzx7
++Ge7KgawkvNzMOXmj6qf8TpbJnf41ZLWdRyVZBVyIwrAKIVw1VxfGh8aEifHKN97H
++unZkBPcUkAhUJSiC1BOD/euaMYqOi8QwiI702Q6q1NBY1/UKnV/ZIBLecnqfj9vZ
++7T0wKxrwGYBztP4pNcxCmBoD9Dg+Dx3ZElo0WXyO4SOh/BgrsKJHKyhbuTpjrI/g
++DhcINRp6+lIzuFBtJ67+YXnAEspb3lKMk0YL/LXrCNF2scdmNfOPwHi+OKBqt69C
++9FJyWFEMxx2qm/ENE9sbOswgJRnKkaAqHBHx
++-----END CERTIFICATE-----
+diff --git a/test/certs/ee-cert-policies-bad.pem b/test/certs/ee-cert-policies-bad.pem
+new file mode 100644
+index 0000000000..0fcd6372b3
+--- /dev/null
++++ b/test/certs/ee-cert-policies-bad.pem
+@@ -0,0 +1,20 @@
++-----BEGIN CERTIFICATE-----
++MIIDTTCCAjWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDDAJDQTAg
++Fw0yMzAzMDgxMjIzMzJaGA8yMTIzMDMwOTEyMjMzMlowGTEXMBUGA1UEAwwOc2Vy
++dmVyLmV4YW1wbGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo/4lY
++YYWu3tssD9Vz++K3qBt6dWAr1H08c3a1rt6TL38kkG3JHPSKOM2fooAWVsu0LLuT
++5Rcf/w3GQ/4xNPgo2HXpo7uIgu+jcuJTYgVFTeAxl++qnRDSWA2eBp4yuxsIVl1l
++Dz9mjsI2oBH/wFk1/Ukc3RxCMwZ4rgQ4I+XndWfTlK1aqUAfrFkQ9QzBZK1KxMY1
++U7OWaoIbFYvRmavknm+UqtKW5Vf7jJFkijwkFsbSGb6CYBM7YrDtPh2zyvlr3zG5
++ep5LR2inKcc/SuIiJ7TvkGPX79ByST5brbkb1Ctvhmjd1XMSuEPJ3EEPoqNGT4tn
++iIQPYf55NB9KiR+3AgMBAAGjgakwgaYwHQYDVR0OBBYEFOeb4iqtimw6y3ZR5Y4H
++mCKX4XOiMB8GA1UdIwQYMBaAFLQRM/HX4l73U54gIhBPhga/H8leMAkGA1UdEwQC
++MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwGQYDVR0RBBIwEIIOc2VydmVyLmV4YW1w
++bGUwKQYDVR0gBCIwIDAOBgwrBgEEAYGBXLz7RwEwDgYMKwYBBAGBgVy8+0cBMA0G
++CSqGSIb3DQEBCwUAA4IBAQArwtwNO++7kStcJeMg3ekz2D/m/8UEjTA1rknBjQiQ
++P0FK7tNeRqus9i8PxthNWk+biRayvDzaGIBV7igpDBPfXemDgmW9Adc4MKyiQDfs
++YfkHi3xJKvsK2fQmyCs2InVDaKpVAkNFcgAW8nSOhGliqIxLb0EOLoLNwaktou0N
++XQHmRzY8S7aIr8K9Qo9y/+MLar+PS4h8l6FkLLkTICiFzE4/wje5S3NckAnadRJa
++QpjwM2S6NuA+tYWuOcN//r7BSpW/AZKanYWPzHMrKlqCh+9o7sthPd72+hObG9kx
++wSGdzfStNK1I1zM5LiI08WtXCvR6AfLANTo2x1AYhSxF
++-----END CERTIFICATE-----
+diff --git a/test/certs/ee-cert-policies.pem b/test/certs/ee-cert-policies.pem
+new file mode 100644
+index 0000000000..2f06d7433f
+--- /dev/null
++++ b/test/certs/ee-cert-policies.pem
+@@ -0,0 +1,20 @@
++-----BEGIN CERTIFICATE-----
++MIIDPTCCAiWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDDAJDQTAg
++Fw0yMzAzMDgxMjIzMjNaGA8yMTIzMDMwOTEyMjMyM1owGTEXMBUGA1UEAwwOc2Vy
++dmVyLmV4YW1wbGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo/4lY
++YYWu3tssD9Vz++K3qBt6dWAr1H08c3a1rt6TL38kkG3JHPSKOM2fooAWVsu0LLuT
++5Rcf/w3GQ/4xNPgo2HXpo7uIgu+jcuJTYgVFTeAxl++qnRDSWA2eBp4yuxsIVl1l
++Dz9mjsI2oBH/wFk1/Ukc3RxCMwZ4rgQ4I+XndWfTlK1aqUAfrFkQ9QzBZK1KxMY1
++U7OWaoIbFYvRmavknm+UqtKW5Vf7jJFkijwkFsbSGb6CYBM7YrDtPh2zyvlr3zG5
++ep5LR2inKcc/SuIiJ7TvkGPX79ByST5brbkb1Ctvhmjd1XMSuEPJ3EEPoqNGT4tn
++iIQPYf55NB9KiR+3AgMBAAGjgZkwgZYwHQYDVR0OBBYEFOeb4iqtimw6y3ZR5Y4H
++mCKX4XOiMB8GA1UdIwQYMBaAFLQRM/HX4l73U54gIhBPhga/H8leMAkGA1UdEwQC
++MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwGQYDVR0RBBIwEIIOc2VydmVyLmV4YW1w
++bGUwGQYDVR0gBBIwEDAOBgwrBgEEAYGBXLz7RwEwDQYJKoZIhvcNAQELBQADggEB
++AGbWslmAAdMX3+5ChcnFrX+NqDGoyhb3PTgWdtlQB5qtWdIt4rSxN50OcQxFTX0D
++QOBabSzR0DDKrgfBe4waL19WsdEvR9GyO4M7ASze/A3IEZue9C9k0n7Vq8zDaAZl
++CiR/Zqo9nAOuhKHMgmC/NjUlX7STv5pJVgc4SH8VEKmSRZDmNihaOalUtK5X8/Oa
++dawKxsZcaP5IKnOEPPKjtVNJxBu5CXywJHsO0GcoDEnEx1/NLdFoJ6WFw8NuTyDK
++NGLq2MHEdyKaigHQlptEs9bXyu9McJjzbx0uXj3BenRULASreccFej0L1RU6jDlk
++D3brBn24UISaFRZoB7jsjok=
++-----END CERTIFICATE-----
+diff --git a/test/certs/mkcert.sh b/test/certs/mkcert.sh
+index 88e8740037..5bba589358 100755
+--- a/test/certs/mkcert.sh
++++ b/test/certs/mkcert.sh
+@@ -119,11 +119,12 @@ genca() {
+     local OPTIND=1
+     local purpose=
+ 
+-    while getopts p: o
++    while getopts p:c: o
+     do
+         case $o in
+         p) purpose="$OPTARG";;
+-        *) echo "Usage: $0 genca -p EKU cn keyname certname cakeyname cacertname" >&2
++        c) certpol="$OPTARG";;
++        *) echo "Usage: $0 genca -p EKU-c policyoid cn keyname certname cakeyname cacertname" >&2
+            return 1;;
+         esac
+     done
+@@ -146,6 +147,10 @@ genca() {
+     if  -n "$NC" ; then
+         exts=$(printf "%s\nnameConstraints = %s\n" "$exts" "$NC")
+     fi
++    if  -n "$certpol" ; then
++        exts=$(printf "%s\ncertificatePolicies = %s\n" "$exts" "$certpol")
++    fi
++
+     csr=$(req "$key" "CN = $cn") || return 1
+     echo "$csr" |
+         cert "$cert" "$exts" -CA "${cacert}.pem" -CAkey "${cakey}.pem" \
+diff --git a/test/certs/setup.sh b/test/certs/setup.sh
+index 7cd7e78b5e..bd8d49337d 100755
+--- a/test/certs/setup.sh
++++ b/test/certs/setup.sh
+@@ -465,3 +465,9 @@ OPENSSL_SIGALG=ED448 OPENSSL_KEYALG=ed448 ./mkcert.sh genee ed448 \
+ 
+ # critical id-pkix-ocsp-no-check extension
+ ./mkcert.sh geneeextra server.example ee-key ee-cert-ocsp-nocheck ca-key ca-cert "1.3.6.1.5.5.7.48.1.5=critical,DER:05:00"
++
++# certificatePolicies extension
++./mkcert.sh genca -c "1.3.6.1.4.1.16604.998855.1" "CA" ca-key ca-pol-cert root-key root-cert
++./mkcert.sh geneeextra server.example ee-key ee-cert-policies ca-key ca-cert "certificatePolicies=1.3.6.1.4.1.16604.998855.1"
++# We can create a cert with a duplicate policy oid - but its actually invalid!
++./mkcert.sh geneeextra server.example ee-key ee-cert-policies-bad ca-key ca-cert "certificatePolicies=1.3.6.1.4.1.16604.998855.1,1.3.6.1.4.1.16604.998855.1"
+-- 
+2.36.1
+

_service:tar_scm:openssl-1.1.1-build.patch Deleted

@@ -1,40 +0,0 @@
-diff -up openssl-1.1.1f/Configurations/10-main.conf.build openssl-1.1.1f/Configurations/10-main.conf
---- openssl-1.1.1f/Configurations/10-main.conf.build	2020-03-31 14:17:45.000000000 +0200
-+++ openssl-1.1.1f/Configurations/10-main.conf	2020-04-07 16:42:10.920546387 +0200
-@@ -678,6 +678,7 @@ my %targets = (
-         cxxflags         => add("-m64"),
-         lib_cppflags     => add("-DL_ENDIAN"),
-         perlasm_scheme   => "linux64le",
-+        multilib         => "64",
-     },
- 
-     "linux-armv4" => {
-@@ -718,6 +719,7 @@ my %targets = (
-     "linux-aarch64" => {
-         inherit_from     =>  "linux-generic64", asm("aarch64_asm") ,
-         perlasm_scheme   => "linux64",
-+        multilib         => "64",
-     },
-     "linux-arm64ilp32" => {  # https://wiki.linaro.org/Platform/arm64-ilp32
-         inherit_from     =>  "linux-generic32", asm("aarch64_asm") ,
-diff -up openssl-1.1.1f/Configurations/unix-Makefile.tmpl.build openssl-1.1.1f/Configurations/unix-Makefile.tmpl
---- openssl-1.1.1f/Configurations/unix-Makefile.tmpl.build	2020-04-07 16:42:10.920546387 +0200
-+++ openssl-1.1.1f/Configurations/unix-Makefile.tmpl	2020-04-07 16:44:23.539142108 +0200
-@@ -823,7 +823,7 @@ uninstall_runtime_libs:
- install_man_docs:
- 	@ -n "$(INSTALLTOP)"  || (echo INSTALLTOP should not be empty; exit 1)
- 	@$(ECHO) "*** Installing manpages"
--	$(PERL) $(SRCDIR)/util/process_docs.pl \
-+	TZ=UTC $(PERL) $(SRCDIR)/util/process_docs.pl \
- 		"--destdir=$(DESTDIR)$(MANDIR)" --type=man --suffix=$(MANSUFFIX)
- 
- uninstall_man_docs:
-@@ -835,7 +835,7 @@ uninstall_man_docs:
- install_html_docs:
- 	@ -n "$(INSTALLTOP)"  || (echo INSTALLTOP should not be empty; exit 1)
- 	@$(ECHO) "*** Installing HTML manpages"
--	$(PERL) $(SRCDIR)/util/process_docs.pl \
-+	TZ=UTC $(PERL) $(SRCDIR)/util/process_docs.pl \
- 		"--destdir=$(DESTDIR)$(HTMLDIR)" --type=html
- 
- uninstall_html_docs:

_service:tar_scm:openssl-1.1.1-fips.patch Deleted

@@ -1,11635 +0,0 @@
-diff -up openssl-1.1.1j/apps/pkcs12.c.fips openssl-1.1.1j/apps/pkcs12.c
---- openssl-1.1.1j/apps/pkcs12.c.fips	2021-02-16 16:24:01.000000000 +0100
-+++ openssl-1.1.1j/apps/pkcs12.c	2021-03-03 12:57:42.194734484 +0100
-@@ -123,7 +123,7 @@ int pkcs12_main(int argc, char **argv)
-     int export_cert = 0, options = 0, chain = 0, twopass = 0, keytype = 0;
-     int iter = PKCS12_DEFAULT_ITER, maciter = PKCS12_DEFAULT_ITER;
- #ifndef OPENSSL_NO_RC2
--    int cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
-+    int cert_pbe = FIPS_mode() ? NID_pbe_WithSHA1And3_Key_TripleDES_CBC : NID_pbe_WithSHA1And40BitRC2_CBC;
- #else
-     int cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
- #endif
-diff -up openssl-1.1.1j/apps/speed.c.fips openssl-1.1.1j/apps/speed.c
---- openssl-1.1.1j/apps/speed.c.fips	2021-03-03 12:57:42.185734409 +0100
-+++ openssl-1.1.1j/apps/speed.c	2021-03-03 12:57:42.195734492 +0100
-@@ -1593,7 +1593,8 @@ int speed_main(int argc, char **argv)
-             continue;
-         if (strcmp(*argv, "rsa") == 0) {
-             for (loop = 0; loop < OSSL_NELEM(rsa_doit); loop++)
--                rsa_doitloop = 1;
-+		if (!FIPS_mode() || loop != R_RSA_512)
-+                    rsa_doitloop = 1;
-             continue;
-         }
-         if (found(*argv, rsa_choices, &i)) {
-@@ -1603,7 +1604,9 @@ int speed_main(int argc, char **argv)
- #endif
- #ifndef OPENSSL_NO_DSA
-         if (strcmp(*argv, "dsa") == 0) {
--            dsa_doitR_DSA_512 = dsa_doitR_DSA_1024 =
-+            if (!FIPS_mode())
-+                dsa_doitR_DSA_512 = 1;
-+            dsa_doitR_DSA_1024 =
-                 dsa_doitR_DSA_2048 = 1;
-             continue;
-         }
-@@ -1634,19 +1637,21 @@ int speed_main(int argc, char **argv)
-         }
-         if (strcmp(*argv, "ecdh") == 0) {
-             for (loop = 0; loop < OSSL_NELEM(ecdh_doit); loop++)
--                ecdh_doitloop = 1;
-+                if(!FIPS_mode() || (loop != R_EC_X25519 && loop != R_EC_X448))
-+                    ecdh_doitloop = 1;
-             continue;
-         }
-         if (found(*argv, ecdh_choices, &i)) {
--            ecdh_doiti = 2;
-+            if(!FIPS_mode() || (i != R_EC_X25519 && i != R_EC_X448))
-+                ecdh_doiti = 2;
-             continue;
-         }
--        if (strcmp(*argv, "eddsa") == 0) {
-+        if (!FIPS_mode() && strcmp(*argv, "eddsa") == 0) {
-             for (loop = 0; loop < OSSL_NELEM(eddsa_doit); loop++)
-                 eddsa_doitloop = 1;
-             continue;
-         }
--        if (found(*argv, eddsa_choices, &i)) {
-+        if (!FIPS_mode() && found(*argv, eddsa_choices, &i)) {
-             eddsa_doiti = 2;
-             continue;
-         }
-@@ -1735,23 +1740,31 @@ int speed_main(int argc, char **argv)
-     /* No parameters; turn on everything. */
-     if ((argc == 0) && !doitD_EVP) {
-         for (i = 0; i < ALGOR_NUM; i++)
--            if (i != D_EVP)
-+            if (i != D_EVP &&
-+                (!FIPS_mode() || (i != D_WHIRLPOOL &&
-+                                  i != D_MD2 && i != D_MD4 &&
-+                                  i != D_MD5 && i != D_MDC2 &&
-+                                  i != D_RMD160)))
-                 doiti = 1;
- #ifndef OPENSSL_NO_RSA
-         for (i = 0; i < RSA_NUM; i++)
--            rsa_doiti = 1;
-+            if (!FIPS_mode() || i != R_RSA_512)
-+                rsa_doiti = 1;
- #endif
- #ifndef OPENSSL_NO_DSA
-         for (i = 0; i < DSA_NUM; i++)
--            dsa_doiti = 1;
-+            if (!FIPS_mode() || i != R_DSA_512)
-+                dsa_doiti = 1;
- #endif
- #ifndef OPENSSL_NO_EC
-         for (loop = 0; loop < OSSL_NELEM(ecdsa_doit); loop++)
-             ecdsa_doitloop = 1;
-         for (loop = 0; loop < OSSL_NELEM(ecdh_doit); loop++)
--            ecdh_doitloop = 1;
--        for (loop = 0; loop < OSSL_NELEM(eddsa_doit); loop++)
--            eddsa_doitloop = 1;
-+            if(!FIPS_mode() || (loop != R_EC_X25519 && loop != R_EC_X448))
-+                ecdh_doitloop = 1;
-+        if (!FIPS_mode())
-+            for (loop = 0; loop < OSSL_NELEM(eddsa_doit); loop++)
-+                eddsa_doitloop = 1;
- #endif
-     }
-     for (i = 0; i < ALGOR_NUM; i++)
-@@ -1799,30 +1812,46 @@ int speed_main(int argc, char **argv)
-     AES_set_encrypt_key(key24, 192, &aes_ks2);
-     AES_set_encrypt_key(key32, 256, &aes_ks3);
- #ifndef OPENSSL_NO_CAMELLIA
--    Camellia_set_key(key16, 128, &camellia_ks1);
--    Camellia_set_key(ckey24, 192, &camellia_ks2);
--    Camellia_set_key(ckey32, 256, &camellia_ks3);
-+    if (doitD_CBC_128_CML || doitD_CBC_192_CML || doitD_CBC_256_CML) {
-+        Camellia_set_key(key16, 128, &camellia_ks1);
-+        Camellia_set_key(ckey24, 192, &camellia_ks2);
-+        Camellia_set_key(ckey32, 256, &camellia_ks3);
-+    }
- #endif
- #ifndef OPENSSL_NO_IDEA
--    IDEA_set_encrypt_key(key16, &idea_ks);
-+    if (doitD_CBC_IDEA) {
-+        IDEA_set_encrypt_key(key16, &idea_ks);
-+    }
- #endif
- #ifndef OPENSSL_NO_SEED
--    SEED_set_key(key16, &seed_ks);
-+    if (doitD_CBC_SEED) {
-+        SEED_set_key(key16, &seed_ks);
-+    }
- #endif
- #ifndef OPENSSL_NO_RC4
--    RC4_set_key(&rc4_ks, 16, key16);
-+   if (doitD_RC4) {
-+        RC4_set_key(&rc4_ks, 16, key16);
-+    }
- #endif
- #ifndef OPENSSL_NO_RC2
--    RC2_set_key(&rc2_ks, 16, key16, 128);
-+    if (doitD_CBC_RC2) {
-+        RC2_set_key(&rc2_ks, 16, key16, 128);
-+    }
- #endif
- #ifndef OPENSSL_NO_RC5
--    RC5_32_set_key(&rc5_ks, 16, key16, 12);
-+    if (doitD_CBC_RC5) {
-+        RC5_32_set_key(&rc5_ks, 16, key16, 12);
-+    }
- #endif
- #ifndef OPENSSL_NO_BF
--    BF_set_key(&bf_ks, 16, key16);
-+    if (doitD_CBC_BF) {
-+        BF_set_key(&bf_ks, 16, key16);
-+    }
- #endif
- #ifndef OPENSSL_NO_CAST
--    CAST_set_key(&cast_ks, 16, key16);
-+    if (doitD_CBC_CAST) {
-+        CAST_set_key(&cast_ks, 16, key16);
-+    }
- #endif
- #ifndef SIGALRM
- # ifndef OPENSSL_NO_DES
-@@ -2120,6 +2149,7 @@ int speed_main(int argc, char **argv)
- 
-         for (i = 0; i < loopargs_len; i++) {
-             loopargsi.hctx = HMAC_CTX_new();
-+            HMAC_CTX_set_flags(loopargsi.hctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
-             if (loopargsi.hctx == NULL) {
-                 BIO_printf(bio_err, "HMAC malloc failure, exiting...");
-                 exit(1);
-diff -up openssl-1.1.1j/Configure.fips openssl-1.1.1j/Configure
---- openssl-1.1.1j/Configure.fips	2021-03-03 12:57:42.192734467 +0100
-+++ openssl-1.1.1j/Configure	2021-03-03 12:57:42.195734492 +0100
-@@ -329,7 +329,7 @@ $config{sdirs} = 
-     "md2", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305", "blake2", "siphash", "sm3",
-     "des", "aes", "rc2", "rc4", "rc5", "idea", "aria", "bf", "cast", "camellia", "seed", "sm4", "chacha", "modes",
-     "bn", "ec", "rsa", "dsa", "dh", "sm2", "dso", "engine",
--    "buffer", "bio", "stack", "lhash", "rand", "err",
-+    "buffer", "bio", "stack", "lhash", "rand", "err", "fips",
-     "evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui",
-     "cms", "ts", "srp", "cmac", "ct", "async", "kdf", "store"
-     ;
-diff -up openssl-1.1.1j/crypto/cmac/cm_pmeth.c.fips openssl-1.1.1j/crypto/cmac/cm_pmeth.c
---- openssl-1.1.1j/crypto/cmac/cm_pmeth.c.fips	2021-02-16 16:24:01.000000000 +0100
-+++ openssl-1.1.1j/crypto/cmac/cm_pmeth.c	2021-03-03 12:57:42.195734492 +0100
-@@ -129,7 +129,7 @@ static int pkey_cmac_ctrl_str(EVP_PKEY_C
- 
- const EVP_PKEY_METHOD cmac_pkey_meth = {
-     EVP_PKEY_CMAC,
--    EVP_PKEY_FLAG_SIGCTX_CUSTOM,
-+    EVP_PKEY_FLAG_SIGCTX_CUSTOM | EVP_PKEY_FLAG_FIPS,
-     pkey_cmac_init,
-     pkey_cmac_copy,
-     pkey_cmac_cleanup,
-diff -up openssl-1.1.1j/crypto/dh/dh_err.c.fips openssl-1.1.1j/crypto/dh/dh_err.c
---- openssl-1.1.1j/crypto/dh/dh_err.c.fips	2021-02-16 16:24:01.000000000 +0100
-+++ openssl-1.1.1j/crypto/dh/dh_err.c	2021-03-03 12:57:42.195734492 +0100
-@@ -25,6 +25,9 @@ static const ERR_STRING_DATA DH_str_func
-     {ERR_PACK(ERR_LIB_DH, DH_F_DH_CMS_SET_PEERKEY, 0), "dh_cms_set_peerkey"},
-     {ERR_PACK(ERR_LIB_DH, DH_F_DH_CMS_SET_SHARED_INFO, 0),
-      "dh_cms_set_shared_info"},
-+    {ERR_PACK(ERR_LIB_DH, DH_F_DH_COMPUTE_KEY, 0), "DH_compute_key"},
-+    {ERR_PACK(ERR_LIB_DH, DH_F_DH_GENERATE_KEY, 0), "DH_generate_key"},
-+    {ERR_PACK(ERR_LIB_DH, DH_F_DH_GENERATE_PARAMETERS_EX, 0), "DH_generate_parameters_ex"},

_service:tar_scm:openssl-3.0-build.patch Added

@@ -0,0 +1,38 @@
+From 262bff1615d4461120327c5a9fe904ad1c6ce813 Mon Sep 17 00:00:00 2001
+From: hzero1996 <wangcheng156@huawei.com>
+Date: Sun, 29 Jan 2023 14:53:03 +0800
+Subject: PATCH openssl-3.0-build
+
+---
+ Configurations/10-main.conf       | 1 +
+ Configurations/unix-Makefile.tmpl | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
+index b578a3c..1ad81c3 100644
+--- a/Configurations/10-main.conf
++++ b/Configurations/10-main.conf
+@@ -772,6 +772,7 @@ my %targets = (
+         inherit_from     =>  "linux-generic64" ,
+         asm_arch         => 'aarch64',
+         perlasm_scheme   => "linux64",
++        multilib         => "64",
+     },
+     "linux-arm64ilp32" => {  # https://wiki.linaro.org/Platform/arm64-ilp32
+         inherit_from     =>  "linux-generic32" ,
+diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
+index 110ba06..712a779 100644
+--- a/Configurations/unix-Makefile.tmpl
++++ b/Configurations/unix-Makefile.tmpl
+@@ -611,7 +611,7 @@ install_sw: install_dev install_engines install_modules install_runtime
+ 
+ uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev
+ 
+-install_docs: install_man_docs install_html_docs
++install_docs: install_man_docs
+ 
+ uninstall_docs: uninstall_man_docs uninstall_html_docs
+ 	$(RM) -r $(DESTDIR)$(DOCDIR)
+-- 
+2.27.0
+

_service Changed

_service:tar_scm:openssl-1.1.1m.tar.gz -> _service:tar_scm:openssl-3.0.8.tar.gz Changed

_service:tar_scm:openssl.yaml Changed