Merge branch '3.0-dev' into 3.0

SPECS/SymCrypt-OpenSSL/SymCrypt-OpenSSL.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "SymCrypt-OpenSSL-1.5.1.tar.gz": "946ac1bdd4d3e0d0381bca0df1b7281f9f7735430dfb6fce56344c7f2f3a7ecb"
+  "SymCrypt-OpenSSL-1.6.0.tar.gz": "7265ddd737b582418a7f0c29144ab11af1bdfd8ea65fbb1a92711068fa606f61"
  }
 }

SPECS/SymCrypt-OpenSSL/SymCrypt-OpenSSL.spec

@@ -1,20 +1,20 @@
 Summary:        The SymCrypt engine for OpenSSL (SCOSSL) allows the use of OpenSSL with SymCrypt as the provider for core cryptographic operations
 Name:           SymCrypt-OpenSSL
-Version:        1.5.1
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Group:          System/Libraries
 URL:            https://github.com/microsoft/SymCrypt-OpenSSL
 Source0:        https://github.com/microsoft/SymCrypt-OpenSSL/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildRequires:  openssl-devel
-BuildRequires:  SymCrypt
+BuildRequires:  SymCrypt >= 103.6.0
 BuildRequires:  cmake
 BuildRequires:  gcc
 BuildRequires:  make
 
-Requires:       SymCrypt
+Requires:       SymCrypt >= 103.6.0
 Requires:       openssl
 
 %description
@@ -67,6 +67,9 @@ install SymCryptProvider/symcrypt_prov.cnf %{buildroot}%{_sysconfdir}/pki/tls/sy
 %{_sysconfdir}/pki/tls/symcrypt_prov.cnf
 
 %changelog
+* Mon Nov 25 2024 Tobias Brick <[email protected]> - 1.6.0-1
+- Upgrade to SymCrypt-OpenSSL 1.6.0
+
 * Wed Oct 02 2024 Tobias Brick <[email protected]> - 1.5.1-2
 - Add sources to debuginfo package
 

SPECS/SymCrypt/SymCrypt.signatures.json

@@ -1,8 +1,8 @@
 {
  "Signatures": {
-  "SymCrypt-103.5.1.tar.gz": "1c4d41972f7683cb2c053ddc58452d6f4b56c1b556b7499f9fedbd7706ccd0fe",
+  "SymCrypt-103.6.0.tar.gz": "ce03f03cfea76c38336c67f175ca316f0377b98e2617a3561e0a2dc91114e9ee",
   "find-debuginfo": "356800f19b755879993103c121c83fb4cc97d0e8656ea34d051daa310f54cedf",
   "jitterentropy-library-3.3.1.tar.gz": "4a50cb02b4836cd5550016e2fc2263e6982abaa11467a9e1cea260c1c2f7d487",
-  "symcrypt-build-environment-variables-v103.5.1.sh": "6f6e162011e8203de66be6af59c0b4511992b731370a152044b028e8075578a7"
+  "symcrypt-build-environment-variables-v103.6.0.sh": "860e849274bd742c752df74baa3fe9502101f53d43b3a72463a2ffb122221296"
  }
 }

SPECS/SymCrypt/SymCrypt.spec

@@ -1,6 +1,6 @@
 Summary:        A core cryptographic library written by Microsoft
 Name:           SymCrypt
-Version:        103.5.1
+Version:        103.6.0
 Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
@@ -13,8 +13,6 @@ Source2:        find-debuginfo
 # Use ./generate-env-file.sh --release-tag <git-version-tag> to generate this. For example:
 #   ./generate-env-file.sh --release-tag v103.5.1
 Source3:        symcrypt-build-environment-variables-v%{version}.sh
-Patch1:         0001-add-build-flags-to-prevent-stripping-and-post-proces.patch
-Patch2:         0001-add-parameter-to-process_fips_module-to-specify-the-.patch
 BuildRequires:  cmake
 %ifarch aarch64
 BuildRequires:  clang >= 12.0.1-4
@@ -105,6 +103,9 @@ chmod 755 %{buildroot}%{_libdir}/libsymcrypt.so.%{version}
 %{_includedir}/*
 
 %changelog
+* Mon Nov 25 2024 Tobias Brick <[email protected]> - 103.6.0-1
+- Upgrde to 103.6.0
+
 * Mon Oct 21 2024 Tobias Brick <[email protected]> - 103.5.1-1
 - Update 103.5.1
 

SPECS/SymCrypt/generate-env-file.sh

@@ -73,9 +73,6 @@ fi
 echo "Tag commit is '${TAG_COMMIT}'"
 git reset --hard "${TAG_COMMIT}"
 
-# Patching the version script; will be unneeded as of v103.5.2
-git apply "${CURRENT_DIR}/add-parameter-to-version-script-to-print-the-commit-info.patch"
-
 # Call the version script to get the properly formmatted git info
 ENV_SCRIPT_FILE_NAME="symcrypt-build-environment-variables-${RELEASE_TAG}.sh"
 echo "#!/bin/bash" > "${CURRENT_DIR}/${ENV_SCRIPT_FILE_NAME}"

SPECS/SymCrypt/symcrypt-build-environment-variables-v103.6.0.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# Generated by 'generate-env-file.sh'
+export SYMCRYPT_BRANCH=main
+export SYMCRYPT_COMMIT_HASH=1d7e34b
+export SYMCRYPT_COMMIT_TIMESTAMP=2024-11-23T02:26:24+00:00

SPECS/busybox/CVE-2023-42366.patch

@@ -0,0 +1,32 @@
+From 5cf8b332429a1dd9afef3337bae92aeddaeff993 Mon Sep 17 00:00:00 2001
+From: Valery Ushakov <[email protected]>
+Date: Wed, 24 Jan 2024 22:24:41 +0300
+Subject: [PATCH] awk.c: fix CVE-2023-42366 (bug #15874)
+
+Make sure we don't read past the end of the string in next_token()
+when backslash is the last character in an (invalid) regexp.
+---
+ editors/awk.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/editors/awk.c b/editors/awk.c
+index 728ee8685..be48df7c7 100644
+--- a/editors/awk.c
++++ b/editors/awk.c
+@@ -1165,9 +1165,11 @@ static uint32_t next_token(uint32_t expected)
+ 					s[-1] = bb_process_escape_sequence((const char **)&pp);
+ 					if (*p == '\\')
+ 						*s++ = '\\';
+-					if (pp == p)
++					if (pp == p) {
++						if (*p == '\0')
++							syntax_error(EMSG_UNEXP_EOS);
+ 						*s++ = *p++;
+-					else
++					} else
+ 						p = pp;
+ 				}
+ 			}
+-- 
+2.34.1
+