From nobody Mon Feb 9 13:39:10 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598384648; cv=none; d=zohomail.com; s=zohoarc; b=Z9LxAhcOZ55udkjYcajEIEzUQa5ZZ2L7TZ4RHecR70O+U+w5gbR90ZlSVb84qDDjJe3CLxohSGiwaoezHWxsXhxdteOejeAKB0we4M/cmonR23ZSBzIyunV5cwy6w62lRcjsTZ/IMF90fNgBtQuCXk2wQDBLTl6PeaAeb9yelys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598384648; 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=6XeewxHu3ltq2GDWr8JyYMpBgqadneC2GPeJqjWP9BI=; b=JDb2OP/n0wSXnxhOcB+cvkv3xYoBcc+rrQuGgGW3iJ1hgOTVcAHqK06Ihat9iZVwk90vZyPNMV/r/NuqudhGF3+hD89ls3fQW7FaB5yL63h+rQVKVSd2d1JvYmdTtrm7NYri7R8vT8VerhkpdPCEcHJrf1bNtO6DryjxhF8D42k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1598384648134568.9014458488549; Tue, 25 Aug 2020 12:44:08 -0700 (PDT) Received: from localhost ([::1]:59438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAerW-0003Zd-Ma for importer@patchew.org; Tue, 25 Aug 2020 15:44:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAeZj-0007EZ-4V for qemu-devel@nongnu.org; Tue, 25 Aug 2020 15:25:43 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35992 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAeZg-0006iw-D2 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 15:25:42 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-eiTiK1YrPb6dEmRgM-MKGA-1; Tue, 25 Aug 2020 15:25:37 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 13C041007467 for ; Tue, 25 Aug 2020 19:25:37 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D39660E1C; Tue, 25 Aug 2020 19:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598383539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6XeewxHu3ltq2GDWr8JyYMpBgqadneC2GPeJqjWP9BI=; b=KSyXZcV8scsC38zcJizxKYOWsFjDIQJ0xoOFryX6Im7eXnGOSSI2NsNJcHHkOE/61IpPMw rxI4ybLLvMnutLsVG3YoKAXp7CuBPIZwPTXWr/CJ2FCtgJr63wC1Jl75/ktTs1mI0koipk Bih0wTJWTZo2PeW5YmN757vCtrA0koY= X-MC-Unique: eiTiK1YrPb6dEmRgM-MKGA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v3 74/74] crypto: use QOM macros for declaration/definition of TLS creds types Date: Tue, 25 Aug 2020 15:21:10 -0400 Message-Id: <20200825192110.3528606-75-ehabkost@redhat.com> In-Reply-To: <20200825192110.3528606-1-ehabkost@redhat.com> References: <20200825192110.3528606-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:37:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.958, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: Paolo Bonzini , "Daniel P. Berrange" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Daniel P. Berrang=C3=A9 This introduces the use of the OBJECT_DEFINE and OBJECT_DECLARE macro families in the TLS creds types, in order to eliminate boilerplate code. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20200723181410.3145233-5-berrange@redhat.com> [ehabkost: rebase, update to pass additional arguments to macro] Signed-off-by: Eduardo Habkost --- Changes v2 -> v3: * Fixed bug I had introduced on usage of OBJECT_DECLARE_SIMPLE_TYPE (bug reported by Roman Bolshakov ) Changes v1 -> v2: none --- include/crypto/tlscreds.h | 13 ++----------- include/crypto/tlscredsanon.h | 14 ++------------ include/crypto/tlscredspsk.h | 13 ++----------- include/crypto/tlscredsx509.h | 13 ++----------- crypto/tlscreds.c | 20 +++----------------- crypto/tlscredsanon.c | 24 +++++++----------------- crypto/tlscredspsk.c | 26 ++++++++------------------ crypto/tlscredsx509.c | 24 ++++-------------------- 8 files changed, 30 insertions(+), 117 deletions(-) diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h index 079e376047..4b0afe96a6 100644 --- a/include/crypto/tlscreds.h +++ b/include/crypto/tlscreds.h @@ -29,11 +29,8 @@ #endif =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; +OBJECT_DECLARE_SIMPLE_TYPE(QCryptoTLSCreds, qcrypto_tls_creds, + QCRYPTO_TLS_CREDS, ObjectClass) =20 #define QCRYPTO_TLS_CREDS_DH_PARAMS "dh-params.pem" =20 @@ -58,10 +55,4 @@ struct QCryptoTLSCreds { char *priority; }; =20 - -struct QCryptoTLSCredsClass { - ObjectClass parent_class; -}; - - #endif /* QCRYPTO_TLSCREDS_H */ diff --git a/include/crypto/tlscredsanon.h b/include/crypto/tlscredsanon.h index 3f464a3809..4e240b7134 100644 --- a/include/crypto/tlscredsanon.h +++ b/include/crypto/tlscredsanon.h @@ -25,12 +25,8 @@ #include "qom/object.h" =20 #define TYPE_QCRYPTO_TLS_CREDS_ANON "tls-creds-anon" -typedef struct QCryptoTLSCredsAnon QCryptoTLSCredsAnon; -DECLARE_INSTANCE_CHECKER(QCryptoTLSCredsAnon, QCRYPTO_TLS_CREDS_ANON, - TYPE_QCRYPTO_TLS_CREDS_ANON) - - -typedef struct QCryptoTLSCredsAnonClass QCryptoTLSCredsAnonClass; +OBJECT_DECLARE_SIMPLE_TYPE(QCryptoTLSCredsAnon, qcrypto_tls_creds_anon, + QCRYPTO_TLS_CREDS_ANON, QCryptoTLSCredsClass) =20 /** * QCryptoTLSCredsAnon: @@ -103,10 +99,4 @@ struct QCryptoTLSCredsAnon { #endif }; =20 - -struct QCryptoTLSCredsAnonClass { - QCryptoTLSCredsClass parent_class; -}; - - #endif /* QCRYPTO_TLSCREDSANON_H */ diff --git a/include/crypto/tlscredspsk.h b/include/crypto/tlscredspsk.h index d7e6bdb5ed..e216d5afe3 100644 --- a/include/crypto/tlscredspsk.h +++ b/include/crypto/tlscredspsk.h @@ -25,11 +25,8 @@ #include "qom/object.h" =20 #define TYPE_QCRYPTO_TLS_CREDS_PSK "tls-creds-psk" -typedef struct QCryptoTLSCredsPSK QCryptoTLSCredsPSK; -DECLARE_INSTANCE_CHECKER(QCryptoTLSCredsPSK, QCRYPTO_TLS_CREDS_PSK, - TYPE_QCRYPTO_TLS_CREDS_PSK) - -typedef struct QCryptoTLSCredsPSKClass QCryptoTLSCredsPSKClass; +OBJECT_DECLARE_SIMPLE_TYPE(QCryptoTLSCredsPSK, qcrypto_tls_creds_psk, + QCRYPTO_TLS_CREDS_PSK, QCryptoTLSCredsClass) =20 #define QCRYPTO_TLS_CREDS_PSKFILE "keys.psk" =20 @@ -98,10 +95,4 @@ struct QCryptoTLSCredsPSK { #endif }; =20 - -struct QCryptoTLSCredsPSKClass { - QCryptoTLSCredsClass parent_class; -}; - - #endif /* QCRYPTO_TLSCREDSPSK_H */ diff --git a/include/crypto/tlscredsx509.h b/include/crypto/tlscredsx509.h index c6d89b7881..6feb84d00d 100644 --- a/include/crypto/tlscredsx509.h +++ b/include/crypto/tlscredsx509.h @@ -25,11 +25,8 @@ #include "qom/object.h" =20 #define TYPE_QCRYPTO_TLS_CREDS_X509 "tls-creds-x509" -typedef struct QCryptoTLSCredsX509 QCryptoTLSCredsX509; -DECLARE_INSTANCE_CHECKER(QCryptoTLSCredsX509, QCRYPTO_TLS_CREDS_X509, - TYPE_QCRYPTO_TLS_CREDS_X509) - -typedef struct QCryptoTLSCredsX509Class QCryptoTLSCredsX509Class; +OBJECT_DECLARE_SIMPLE_TYPE(QCryptoTLSCredsX509, qcrypto_tls_creds_x509, + QCRYPTO_TLS_CREDS_X509, QCryptoTLSCredsClass) =20 #define QCRYPTO_TLS_CREDS_X509_CA_CERT "ca-cert.pem" #define QCRYPTO_TLS_CREDS_X509_CA_CRL "ca-crl.pem" @@ -105,10 +102,4 @@ struct QCryptoTLSCredsX509 { char *passwordid; }; =20 - -struct QCryptoTLSCredsX509Class { - QCryptoTLSCredsClass parent_class; -}; - - #endif /* QCRYPTO_TLSCREDSX509_H */ diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c index bb3e6667b9..c238ff7d4b 100644 --- a/crypto/tlscreds.c +++ b/crypto/tlscreds.c @@ -24,6 +24,9 @@ #include "tlscredspriv.h" #include "trace.h" =20 +OBJECT_DEFINE_ABSTRACT_TYPE(QCryptoTLSCreds, qcrypto_tls_creds, + QCRYPTO_TLS_CREDS, OBJECT) + #define DH_BITS 2048 =20 #ifdef CONFIG_GNUTLS @@ -258,20 +261,3 @@ qcrypto_tls_creds_finalize(Object *obj) g_free(creds->dir); g_free(creds->priority); } - - -static const TypeInfo qcrypto_tls_creds_info =3D { - .parent =3D TYPE_OBJECT, - .name =3D TYPE_QCRYPTO_TLS_CREDS, - .instance_size =3D sizeof(QCryptoTLSCreds), - .instance_init =3D qcrypto_tls_creds_init, - .instance_finalize =3D qcrypto_tls_creds_finalize, - .class_init =3D qcrypto_tls_creds_class_init, - .class_size =3D sizeof(QCryptoTLSCredsClass), - .abstract =3D true, -}; -TYPE_INFO(qcrypto_tls_creds_info) - - - - diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c index 16162e60b6..dc1b77e37c 100644 --- a/crypto/tlscredsanon.c +++ b/crypto/tlscredsanon.c @@ -26,6 +26,9 @@ #include "qom/object_interfaces.h" #include "trace.h" =20 +OBJECT_DEFINE_TYPE_WITH_INTERFACES(QCryptoTLSCredsAnon, qcrypto_tls_creds_= anon, + QCRYPTO_TLS_CREDS_ANON, QCRYPTO_TLS_CRE= DS, + { TYPE_USER_CREATABLE }, { NULL }) =20 #ifdef CONFIG_GNUTLS =20 @@ -191,20 +194,7 @@ qcrypto_tls_creds_anon_class_init(ObjectClass *oc, voi= d *data) } =20 =20 -static const TypeInfo qcrypto_tls_creds_anon_info =3D { - .parent =3D TYPE_QCRYPTO_TLS_CREDS, - .name =3D TYPE_QCRYPTO_TLS_CREDS_ANON, - .instance_size =3D sizeof(QCryptoTLSCredsAnon), - .instance_finalize =3D qcrypto_tls_creds_anon_finalize, - .class_size =3D sizeof(QCryptoTLSCredsAnonClass), - .class_init =3D qcrypto_tls_creds_anon_class_init, - .interfaces =3D (InterfaceInfo[]) { - { TYPE_USER_CREATABLE }, - { } - } -}; -TYPE_INFO(qcrypto_tls_creds_anon_info) - - - - +static void +qcrypto_tls_creds_anon_init(Object *obj) +{ +} diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c index ea890f5837..0c66be3647 100644 --- a/crypto/tlscredspsk.c +++ b/crypto/tlscredspsk.c @@ -27,6 +27,10 @@ #include "trace.h" =20 =20 +OBJECT_DEFINE_TYPE_WITH_INTERFACES(QCryptoTLSCredsPSK, qcrypto_tls_creds_p= sk, + QCRYPTO_TLS_CREDS_PSK, QCRYPTO_TLS_CRED= S, + { TYPE_USER_CREATABLE }, { NULL }) + #ifdef CONFIG_GNUTLS =20 static int @@ -281,21 +285,7 @@ qcrypto_tls_creds_psk_class_init(ObjectClass *oc, void= *data) qcrypto_tls_creds_psk_prop_set_username); } =20 - -static const TypeInfo qcrypto_tls_creds_psk_info =3D { - .parent =3D TYPE_QCRYPTO_TLS_CREDS, - .name =3D TYPE_QCRYPTO_TLS_CREDS_PSK, - .instance_size =3D sizeof(QCryptoTLSCredsPSK), - .instance_finalize =3D qcrypto_tls_creds_psk_finalize, - .class_size =3D sizeof(QCryptoTLSCredsPSKClass), - .class_init =3D qcrypto_tls_creds_psk_class_init, - .interfaces =3D (InterfaceInfo[]) { - { TYPE_USER_CREATABLE }, - { } - } -}; -TYPE_INFO(qcrypto_tls_creds_psk_info) - - - - +static void +qcrypto_tls_creds_psk_init(Object *obj) +{ +} diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index 77f1beaf8b..a39555e5e6 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -28,6 +28,10 @@ #include "trace.h" =20 =20 +OBJECT_DEFINE_TYPE_WITH_INTERFACES(QCryptoTLSCredsX509, qcrypto_tls_creds_= x509, + QCRYPTO_TLS_CREDS_X509, QCRYPTO_TLS_CRE= DS, + { TYPE_USER_CREATABLE }, { NULL }) + #ifdef CONFIG_GNUTLS =20 #include @@ -814,23 +818,3 @@ qcrypto_tls_creds_x509_class_init(ObjectClass *oc, voi= d *data) qcrypto_tls_creds_x509_prop_get_password= id, qcrypto_tls_creds_x509_prop_set_password= id); } - - -static const TypeInfo qcrypto_tls_creds_x509_info =3D { - .parent =3D TYPE_QCRYPTO_TLS_CREDS, - .name =3D TYPE_QCRYPTO_TLS_CREDS_X509, - .instance_size =3D sizeof(QCryptoTLSCredsX509), - .instance_init =3D qcrypto_tls_creds_x509_init, - .instance_finalize =3D qcrypto_tls_creds_x509_finalize, - .class_size =3D sizeof(QCryptoTLSCredsX509Class), - .class_init =3D qcrypto_tls_creds_x509_class_init, - .interfaces =3D (InterfaceInfo[]) { - { TYPE_USER_CREATABLE }, - { } - } -}; -TYPE_INFO(qcrypto_tls_creds_x509_info) - - - - --=20 2.26.2