Commit 700e962aa0 for openssl.org

commit 700e962aa0aee70ff01d26fcfbaefc6439ac82cd
Author: Eugene Syromiatnikov <esyr@openssl.org>
Date:   Tue May 19 09:18:23 2026 +0200

    crypto/cmp/cmp_genm.c: avoid strcat() in get_genm_itav()

    There is no need to use strcat() there, as it concatenates into a string
    that is used in a format string anyway.  Put the literal prefix
    into the format string and avoid literal string copying.

    Fixes: d477484d33b7 "CMP: add support for genm/genp messages with id-it-caCerts"
    Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>

    Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
    Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
    Reviewed-by: Bob Beck <beck@openssl.org>
    Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
    MergeDate: Tue May 26 14:54:19 2026
    (Merged from https://github.com/openssl/openssl/pull/31230)

diff --git a/crypto/cmp/cmp_genm.c b/crypto/cmp/cmp_genm.c
index 86bad3a744..905927554f 100644
--- a/crypto/cmp/cmp_genm.c
+++ b/crypto/cmp/cmp_genm.c
@@ -133,8 +133,7 @@ static OSSL_CMP_ITAV *get_genm_itav(OSSL_CMP_CTX *ctx,
     for (i = 0; i < n; i++) {
         OSSL_CMP_ITAV *itav = sk_OSSL_CMP_ITAV_shift(itavs);
         ASN1_OBJECT *obj = OSSL_CMP_ITAV_get0_type(itav);
-        char name[128] = "genp contains InfoType '";
-        size_t offset = strlen(name);
+        char name[128];

         if (OBJ_obj2nid(obj) == expected) {
             for (i++; i < n; i++)
@@ -143,9 +142,11 @@ static OSSL_CMP_ITAV *get_genm_itav(OSSL_CMP_CTX *ctx,
             return itav;
         }

-        if (OBJ_obj2txt(name + offset, (int)(sizeof(name) - offset), obj, 0) < 0)
-            strcat(name, "<unknown>");
-        ossl_cmp_log2(WARN, ctx, "%s' while expecting 'id-it-%s'", name, desc);
+        if (OBJ_obj2txt(name, sizeof(name), obj, 0) < 0)
+            name[0] = '\0';
+        ossl_cmp_log2(WARN, ctx,
+            "genp contains InfoType '%s' while expecting 'id-it-%s'",
+            name[0] == '\0' ? "<unknown>" : name, desc);
         OSSL_CMP_ITAV_free(itav);
     }
     ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_GENP,