Accepting request 1328479 from security

- add gcc16-compat.patch (bsc#1256989): gcc16 complains about an unused
  variable in strpbrk_s. It seems the `slen` parameter is not enforced at all.
  The patch changes that, hopefully without causing regressions.

OBS-URL: https://build.opensuse.org/request/show/1328479
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tboot?expand=0&rev=53

gcc16-compat.patch

@@ -0,0 +1,35 @@
+Index: tboot-1.11.10/safestringlib/safeclib/strpbrk_s.c
+===================================================================
+--- tboot-1.11.10.orig/safestringlib/safeclib/strpbrk_s.c
++++ tboot-1.11.10/safestringlib/safeclib/strpbrk_s.c
+@@ -92,7 +92,6 @@ strpbrk_s (char *dest, rsize_t dmax,
+            char *src,  rsize_t slen, char **first)
+ {
+     char *ps;
+-    rsize_t len;
+ 
+     if (first == NULL) {
+         invoke_safe_str_constraint_handler("strpbrk_s: count is null",
+@@ -140,11 +139,10 @@ strpbrk_s (char *dest, rsize_t dmax,
+     /*
+      * look for a matching char in the substring src
+      */
+-    while (*dest && dmax) {
++    while (*dest && dmax && slen) {
+ 
+         ps = src;
+-        len = slen;
+-        while (*ps) {
++        while (*ps && slen) {
+ 
+             /* check for a match with the substring */
+             if (*dest == *ps) {
+@@ -152,7 +150,7 @@ strpbrk_s (char *dest, rsize_t dmax,
+                 return RCNEGATE(EOK);
+             }
+             ps++;
+-            len--;
++	    slen--;
+         }
+         dest++;
+         dmax--;

tboot.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 21 11:21:41 UTC 2026 - Matthias Gerstner <matthias.gerstner@suse.com>
+
+- add gcc16-compat.patch (bsc#1256989): gcc16 complains about an unused
+  variable in strpbrk_s. It seems the `slen` parameter is not enforced at all.
+  The patch changes that, hopefully without causing regressions.
+
 -------------------------------------------------------------------
 Wed Jul 16 09:04:58 UTC 2025 - Marcus Meissner <meissner@suse.com>
 

tboot.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package tboot
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2026 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@ Patch4:         tboot-grub2-refuse-secure-boot.patch
 Patch5:         tboot-bsc#1207833-copy-mbi.patch
 Patch6:         tboot-fix-alloc-size-warning.patch
 Patch7:         tboot-cet.patch
+Patch8:         gcc16-compat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64
 BuildRequires:  openssl-devel