From nobody Mon Feb 9 18:00:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1615814324; cv=none; d=zohomail.com; s=zohoarc; b=ITXLApsxLW9T2cMVpD3eYJ/UaS3IXKTGQMn8ybAHJSnIT5m+sCqeys8cKbXv2rCa/BGTwemXJwOrGLI9f2AwHKVaiEuBQOmCXMjgaK0I7YrlHTWla13PhibTaKP7xn/NClZQz7XpXpvyvW+5dpB31x7aU3NLtOmpzvPPKuMvPws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615814324; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DQXr06VxoTQQYj6wq0TLCxepMA5ApWREJU8bWz//woc=; b=SbU2niweuOMhPhzrW5wzO0vWdA+h4o7amim5i2F+E5GpqDua3rMbJhamRIWLa3ozeQ96Zq+Psq+jWhGqtIrvYHafQ8Hh56bD6jRrkqxTvMmHwlShmY/NUFOVfq9cZY46W70UEohwTK0+973XTt88JShttwvoqjq67SyhWXHXZm0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615814324876405.3690803389827; Mon, 15 Mar 2021 06:18:44 -0700 (PDT) Received: from localhost ([::1]:49276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLn7L-0000ie-IU for importer@patchew.org; Mon, 15 Mar 2021 09:18:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLn5Z-0007p9-3p for qemu-devel@nongnu.org; Mon, 15 Mar 2021 09:16:53 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:4097) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLn5V-0006Ph-D3 for qemu-devel@nongnu.org; Mon, 15 Mar 2021 09:16:52 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4DzcMt6TjBz8y8N; Mon, 15 Mar 2021 21:14:50 +0800 (CST) Received: from DESKTOP-F1615D3.china.huawei.com (10.174.186.85) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.498.0; Mon, 15 Mar 2021 21:16:32 +0800 From: Zihao Chang To: Subject: [PATCH v7 1/3] crypto: add reload for QCryptoTLSCredsClass Date: Mon, 15 Mar 2021 21:16:07 +0800 Message-ID: <20210315131609.2208-2-changzihao1@huawei.com> X-Mailer: git-send-email 2.22.0.windows.1 In-Reply-To: <20210315131609.2208-1-changzihao1@huawei.com> References: <20210315131609.2208-1-changzihao1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.186.85] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.35; envelope-from=changzihao1@huawei.com; helo=szxga07-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: berrange@redhat.com, oscar.zhangbo@huawei.com, changzihao1@huawei.com, armbru@redhat.com, xiexiangyou@huawei.com, yebiaoxiang@huawei.com, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch adds reload interface for QCryptoTLSCredsClass and implements the interface for QCryptoTLSCredsX509. Signed-off-by: Zihao Chang Acked-by: Daniel P. Berrang=C3=A9 --- crypto/tlscredsx509.c | 48 +++++++++++++++++++++++++++++++++++++++ include/crypto/tlscreds.h | 8 ++++--- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index dbadad4df28e..bc503bab5585 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -770,6 +770,51 @@ qcrypto_tls_creds_x509_prop_get_sanity(Object *obj, } =20 =20 +#ifdef CONFIG_GNUTLS + + +static bool +qcrypto_tls_creds_x509_reload(QCryptoTLSCreds *creds, Error **errp) +{ + QCryptoTLSCredsX509 *x509_creds =3D QCRYPTO_TLS_CREDS_X509(creds); + Error *local_err =3D NULL; + gnutls_certificate_credentials_t creds_data =3D x509_creds->data; + gnutls_dh_params_t creds_dh_params =3D x509_creds->parent_obj.dh_param= s; + + x509_creds->data =3D NULL; + x509_creds->parent_obj.dh_params =3D NULL; + qcrypto_tls_creds_x509_load(x509_creds, &local_err); + if (local_err) { + qcrypto_tls_creds_x509_unload(x509_creds); + x509_creds->data =3D creds_data; + x509_creds->parent_obj.dh_params =3D creds_dh_params; + error_propagate(errp, local_err); + return false; + } + + if (creds_data) { + gnutls_certificate_free_credentials(creds_data); + } + if (creds_dh_params) { + gnutls_dh_params_deinit(creds_dh_params); + } + return true; +} + + +#else /* ! CONFIG_GNUTLS */ + + +static bool +qcrypto_tls_creds_x509_reload(QCryptoTLSCreds *creds, Error **errp) +{ + return false; +} + + +#endif /* ! CONFIG_GNUTLS */ + + static void qcrypto_tls_creds_x509_complete(UserCreatable *uc, Error **errp) { @@ -800,6 +845,9 @@ static void qcrypto_tls_creds_x509_class_init(ObjectClass *oc, void *data) { UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); + QCryptoTLSCredsClass *ctcc =3D QCRYPTO_TLS_CREDS_CLASS(oc); + + ctcc->reload =3D qcrypto_tls_creds_x509_reload; =20 ucc->complete =3D qcrypto_tls_creds_x509_complete; =20 diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index 079e37604784..d0808e391e91 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -30,14 +30,15 @@ =20 #define TYPE_QCRYPTO_TLS_CREDS "tls-creds" typedef struct QCryptoTLSCreds QCryptoTLSCreds; -DECLARE_INSTANCE_CHECKER(QCryptoTLSCreds, QCRYPTO_TLS_CREDS, - TYPE_QCRYPTO_TLS_CREDS) - typedef struct QCryptoTLSCredsClass QCryptoTLSCredsClass; +DECLARE_OBJ_CHECKERS(QCryptoTLSCreds, QCryptoTLSCredsClass, QCRYPTO_TLS_CR= EDS, + TYPE_QCRYPTO_TLS_CREDS) + =20 #define QCRYPTO_TLS_CREDS_DH_PARAMS "dh-params.pem" =20 =20 +typedef bool (*CryptoTLSCredsReload)(QCryptoTLSCreds *, Error **); /** * QCryptoTLSCreds: * @@ -61,6 +62,7 @@ struct QCryptoTLSCreds { =20 struct QCryptoTLSCredsClass { ObjectClass parent_class; + CryptoTLSCredsReload reload; }; =20 =20 --=20 2.28.0