From: Xiaofei Bai <xiaofei.bai@arm.com>
Date: Tue, 15 Sep 2020 01:59:02 +0000 (+0000)
Subject: FIX strncpy warning in apps/cmp.c.
X-Git-Tag: openssl-3.0.0-alpha7~219
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebcae87f6b62ed9b79a1255dbb3c69c635cea4d8;p=thirdparty%2Fopenssl.git

FIX strncpy warning in apps/cmp.c.

bugfix: #12872

strncpy here has compiling warning of -Wstringop-truncation, change
into BIO_snprintf as before.

Change-Id: I362872c4ad328cadd4c7a5a5da3165655fa26c0d

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/12889)
---

diff --git a/apps/cmp.c b/apps/cmp.c
index 083425c08f4..1137ed0a845 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -1839,7 +1839,7 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         CMP_err("missing -tls_used option since -server URL indicates https");
         goto err;
     }
-    strncpy(server_port, port, sizeof(server_port));
+    BIO_snprintf(server_port, sizeof(server_port), "%s", port);
     used_path = opt_path != NULL ? opt_path : path;
     if (!OSSL_CMP_CTX_set1_server(ctx, server)
             || !OSSL_CMP_CTX_set_serverPort(ctx, portnum)