From nobody Tue Sep 9 19:11:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1752766211; cv=none; d=zohomail.com; s=zohoarc; b=ckmgr9MjLjc6LKmE+GBXhjLWO/tiR0MSHeTfXekQ+2C3QXlsJPiMNK+2foQr6L+BEGreJpn9qUJEXN/y1u5SEJf0P/xe/XPKrEvfBZeaBGT9FcFfeOVAYP1ZjFoIZeKH+Gy0OC9xbh7v+4ic9Gg3hmOsUk6hQR6xSgMnM63qWDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752766211; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=4R46TSbVlp3YvdnWP471pFMXsqyv6bMB5lH61E7W4xk=; b=KvBmWHZjZkMcrM7nZ2yFHzsmWRm0pJyqiukT+avaaMailZG8N+BTzv+UMMDJSNuaR0X8xNzWO1KCHR76tnc1SMEvD/bqxe/kmyYjgK38HNs/00s3gfyqcSBj6CsdT0vF2hgQb8yilbA6fWBdWFOUP3q14VXlOdeA8L5q+CXNp8A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1752766211047313.29901090534815; Thu, 17 Jul 2025 08:30:11 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1D0A91587; Thu, 17 Jul 2025 11:30:09 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B62031585; Thu, 17 Jul 2025 11:28:38 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6AE751380; Thu, 17 Jul 2025 11:28:33 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 90020135B for ; Thu, 17 Jul 2025 11:28:22 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-474-WA50_p_9PQ6Bdn_0BHWB6w-1; Thu, 17 Jul 2025 11:28:21 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0499E18009E7 for ; Thu, 17 Jul 2025 15:28:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.5]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3F83A1800287 for ; Thu, 17 Jul 2025 15:28:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752766102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lg6rgwj9rWNAYqZ0ShRRXrcV2lFwHiOyx2+OILYIVY4=; b=D9rW3g9yIsiG/3B6WmQ0REQEDL8l9WVxDk5BR9Lv4GT39IuPe54XBVimrFnEOZrVfW+4VR 74941KdAXzUmF+M9WOzj96hfttl4lE9edZZwWH2XWxRk34uVU6DJVzM52aLiNEWLE/DQsX RiO6Ls0HdpWnXGNdSeBjcUja6wDAoBk= X-MC-Unique: WA50_p_9PQ6Bdn_0BHWB6w-1 X-Mimecast-MFC-AGG-ID: WA50_p_9PQ6Bdn_0BHWB6w_1752766100 To: devel@lists.libvirt.org Subject: [PATCH 4/7] rpc: virnettlscert: Rename virNetTLSCertLoadCAListFromFile to virNetTLSCertLoadListFromFile Date: Thu, 17 Jul 2025 17:28:07 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JbpgRNTfcCW2BpMfRnIiDBYFrziNwmIC23amj4U_lP0_1752766100 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6Y4FM5OV2B25HTSX4M6ARD3QN27VAEDN X-Message-ID-Hash: 6Y4FM5OV2B25HTSX4M6ARD3QN27VAEDN X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1752766212419116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The function can load a generic list of certs, it doesn't necessarily have to be the list of CAs. Rename the function, and change error to be generic. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 --- src/rpc/virnettlscert.c | 14 +++++++------- src/rpc/virnettlscert.h | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/rpc/virnettlscert.c b/src/rpc/virnettlscert.c index 774dd5989a..3efc4f0716 100644 --- a/src/rpc/virnettlscert.c +++ b/src/rpc/virnettlscert.c @@ -408,10 +408,10 @@ gnutls_x509_crt_t virNetTLSCertLoadFromFile(const cha= r *certFile, } -static int virNetTLSCertLoadCAListFromFile(const char *certFile, - gnutls_x509_crt_t *certs, - unsigned int certMax, - size_t *ncerts) +int virNetTLSCertLoadListFromFile(const char *certFile, + gnutls_x509_crt_t *certs, + unsigned int certMax, + size_t *ncerts) { gnutls_datum_t data; g_autofree char *buf =3D NULL; @@ -427,7 +427,7 @@ static int virNetTLSCertLoadCAListFromFile(const char *= certFile, if (gnutls_x509_crt_list_import(certs, &certMax, &data, GNUTLS_X509_FM= T_PEM, 0) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to import CA certificate list %1$s"), + _("Unable to import certificate list %1$s"), certFile); return -1; } @@ -452,8 +452,8 @@ int virNetTLSCertSanityCheck(bool isServer, !(cert =3D virNetTLSCertLoadFromFile(certFile, isServer))) goto cleanup; if ((access(cacertFile, R_OK) =3D=3D 0) && - virNetTLSCertLoadCAListFromFile(cacertFile, cacerts, - MAX_CERTS, &ncacerts) < 0) + virNetTLSCertLoadListFromFile(cacertFile, cacerts, + MAX_CERTS, &ncacerts) < 0) goto cleanup; if (cert && diff --git a/src/rpc/virnettlscert.h b/src/rpc/virnettlscert.h index 0ac511a141..a2f591d172 100644 --- a/src/rpc/virnettlscert.h +++ b/src/rpc/virnettlscert.h @@ -40,3 +40,8 @@ char *virNetTLSCertValidate(gnutls_x509_crt_t cert, gnutls_x509_crt_t virNetTLSCertLoadFromFile(const char *certFile, bool isServer); + +int virNetTLSCertLoadListFromFile(const char *certFile, + gnutls_x509_crt_t *certs, + unsigned int certMax, + size_t *ncerts); --=20 2.50.0