From nobody Tue Nov 18 21:14:51 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1612684273; cv=none; d=zohomail.com; s=zohoarc; b=Ecgyf6iynm/LC+ZRjRHuG3Mhb8YxfibHG/YhzIqL4HfJ6WG6pYC1ysbqhzMyp/ti2D345crEGlqIjvFM0Cezt1f1u4WLIttI2ilHsIf1dR2wjEUsi3nZRQm91BsUt/cnEGWIjwYWh20Dl/2jyaFFpwItipSS1JTLMLMGY7/dK44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612684273; 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=/F9GKhIrKcMfFUiaQB+01/MSn1QEH1puwI2LOas3I+0=; b=USRJKChHVHXVJIh/t3MIHIvhPk374TQidWEmuhezVd1MnLAMcF/j+36AJpEgwFhvCNn/ysyMKxmq3sCFZs3QIdkHIXi2C1qhngAG3jARNjuD3iU0l1Hxt7bc6diWRfwCXufztorXZl4YuR3KFthg05Yo4OyklT2iLCFtvFUCdf4= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161268427304129.85851259725439; Sat, 6 Feb 2021 23:51:13 -0800 (PST) Received: from localhost ([::1]:45544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l8eqe-0004vc-2v for importer@patchew.org; Sun, 07 Feb 2021 02:51:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l8enL-0003Pb-WE for qemu-devel@nongnu.org; Sun, 07 Feb 2021 02:47:48 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:3309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l8enJ-0006rN-Gp for qemu-devel@nongnu.org; Sun, 07 Feb 2021 02:47:47 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4DYLmn2wyGzlH8G; Sun, 7 Feb 2021 15:45:45 +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; Sun, 7 Feb 2021 15:47:18 +0800 From: Zihao Chang To: Subject: [PATCH v3 1/3] crypto: add reload for QCryptoTLSCredsClass Date: Sun, 7 Feb 2021 15:47:08 +0800 Message-ID: <20210207074710.1029-2-changzihao1@huawei.com> X-Mailer: git-send-email 2.22.0.windows.1 In-Reply-To: <20210207074710.1029-1-changzihao1@huawei.com> References: <20210207074710.1029-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.190; envelope-from=changzihao1@huawei.com; helo=szxga04-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, 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 --- crypto/tlscredsx509.c | 112 ++++++++++++++++++++++++++++++++++++++ include/crypto/tlscreds.h | 8 ++- 2 files changed, 117 insertions(+), 3 deletions(-) diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index dbadad4df28e..257106a33853 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -23,8 +23,10 @@ #include "tlscredspriv.h" #include "crypto/secret.h" #include "qapi/error.h" +#include "qapi/qmp/qstring.h" #include "qemu/module.h" #include "qom/object_interfaces.h" +#include "qom/qom-qobject.h" #include "trace.h" =20 =20 @@ -770,6 +772,113 @@ qcrypto_tls_creds_x509_prop_get_sanity(Object *obj, } =20 =20 +#ifdef CONFIG_GNUTLS + + +/* + * object_property_get_qobject() return "" for NULL QString, + * set NULL QString prop as "" is unsafe. + */ +static bool +qcrypto_tls_creds_x509_need_set_prop(QObject *qobj) +{ + QString *qstring =3D qobject_to(QString, qobj); + /* prop type is not QString. */ + if (!qstring) { + return true; + } + + return strlen(qstring_get_str(qstring)) > 0; +} + + +static bool +qcrypto_tls_creds_x509_copy_propertites(Object *new, + Object *old, + Error **errp) +{ + ObjectProperty *prop =3D NULL; + ObjectPropertyIterator iter; + Error *local_err =3D NULL; + + object_property_iter_init(&iter, old); + while ((prop =3D object_property_iter_next(&iter)) && prop->set) { + QObject *value =3D NULL; + /* "loaded" depends on other props, copy it finally. */ + if (g_strcmp0(prop->name, "loaded") =3D=3D 0) { + continue; + } + + value =3D object_property_get_qobject(old, prop->name, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return false; + } + + if (qcrypto_tls_creds_x509_need_set_prop(value)) { + object_property_set_qobject(new, prop->name, value, &local_err= ); + if (local_err) { + error_propagate(errp, local_err); + qobject_unref(value); + return false; + } + } + qobject_unref(value); + } + + return true; +} + + +static bool +qcrypto_tls_creds_x509_reload(QCryptoTLSCreds *creds, Error **errp) +{ + Object *old =3D OBJECT(creds); + QCryptoTLSCredsX509 *old_x509 =3D QCRYPTO_TLS_CREDS_X509(creds); + Object *new =3D object_new(TYPE_QCRYPTO_TLS_CREDS_X509); + QCryptoTLSCredsX509 *new_x509 =3D QCRYPTO_TLS_CREDS_X509(new); + Error *local_err =3D NULL; + bool ret =3D false; + + if (!qcrypto_tls_creds_x509_copy_propertites(new, old, &local_err)) { + error_propagate(errp, local_err); + goto out; + } + + qcrypto_tls_creds_x509_load(new_x509, &local_err); + if (local_err) { + error_propagate(errp, local_err); + goto out; + } + + /* load new cert successfully, release old data and update */ + qcrypto_tls_creds_x509_unload(old_x509); + old_x509->data =3D new_x509->data; + old_x509->parent_obj.dh_params =3D new_x509->parent_obj.dh_params; + new_x509->data =3D NULL; + new_x509->parent_obj.dh_params =3D NULL; + + ret =3D true; + + out: + object_unref(new); + return ret; +} + + +#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 +909,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