Commit 9884abee authored by Daniel P. Berrangé's avatar Daniel P. Berrangé
Browse files

crypto: register properties against the class instead of object 



This converts the tlscredsx509, tlscredsanon and secret objects
to register their properties against the class rather than object.

Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent 07982d2e

crypto/secret.c

+27 −33
Original line number Diff line number Diff line
@@ -353,58 +353,53 @@ qcrypto_secret_complete(UserCreatable *uc, Error **errp) 




static void

qcrypto_secret_init(Object *obj)

qcrypto_secret_finalize(Object *obj)

{

    object_property_add_bool(obj, "loaded",

    QCryptoSecret *secret = QCRYPTO_SECRET(obj);



    g_free(secret->iv);

    g_free(secret->file);

    g_free(secret->keyid);

    g_free(secret->rawdata);

    g_free(secret->data);

}



static void

qcrypto_secret_class_init(ObjectClass *oc, void *data)

{

    UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);



    ucc->complete = qcrypto_secret_complete;



    object_class_property_add_bool(oc, "loaded",

                                   qcrypto_secret_prop_get_loaded,

                                   qcrypto_secret_prop_set_loaded,

                                   NULL);

    object_property_add_enum(obj, "format",

    object_class_property_add_enum(oc, "format",

                                   "QCryptoSecretFormat",

                                   QCryptoSecretFormat_lookup,

                                   qcrypto_secret_prop_get_format,

                                   qcrypto_secret_prop_set_format,

                                   NULL);

    object_property_add_str(obj, "data",

    object_class_property_add_str(oc, "data",

                                  qcrypto_secret_prop_get_data,

                                  qcrypto_secret_prop_set_data,

                                  NULL);

    object_property_add_str(obj, "file",

    object_class_property_add_str(oc, "file",

                                  qcrypto_secret_prop_get_file,

                                  qcrypto_secret_prop_set_file,

                                  NULL);

    object_property_add_str(obj, "keyid",

    object_class_property_add_str(oc, "keyid",

                                  qcrypto_secret_prop_get_keyid,

                                  qcrypto_secret_prop_set_keyid,

                                  NULL);

    object_property_add_str(obj, "iv",

    object_class_property_add_str(oc, "iv",

                                  qcrypto_secret_prop_get_iv,

                                  qcrypto_secret_prop_set_iv,

                                  NULL);

}





static void

qcrypto_secret_finalize(Object *obj)

{

    QCryptoSecret *secret = QCRYPTO_SECRET(obj);



    g_free(secret->iv);

    g_free(secret->file);

    g_free(secret->keyid);

    g_free(secret->rawdata);

    g_free(secret->data);

}



static void

qcrypto_secret_class_init(ObjectClass *oc, void *data)

{

    UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);



    ucc->complete = qcrypto_secret_complete;

}





int qcrypto_secret_lookup(const char *secretid,

                          uint8_t **data,

                          size_t *datalen,
@@ -493,7 +488,6 @@ static const TypeInfo qcrypto_secret_info = { 
    .parent = TYPE_OBJECT,

    .name = TYPE_QCRYPTO_SECRET,

    .instance_size = sizeof(QCryptoSecret),

    .instance_init = qcrypto_secret_init,

    .instance_finalize = qcrypto_secret_finalize,

    .class_size = sizeof(QCryptoSecretClass),

    .class_init = qcrypto_secret_class_init,

crypto/tlscreds.c

+21 −15
Original line number Diff line number Diff line
@@ -199,21 +199,17 @@ qcrypto_tls_creds_prop_get_endpoint(Object *obj, 




static void

qcrypto_tls_creds_init(Object *obj)

qcrypto_tls_creds_class_init(ObjectClass *oc, void *data)

{

    QCryptoTLSCreds *creds = QCRYPTO_TLS_CREDS(obj);



    creds->verifyPeer = true;



    object_property_add_bool(obj, "verify-peer",

    object_class_property_add_bool(oc, "verify-peer",

                                   qcrypto_tls_creds_prop_get_verify,

                                   qcrypto_tls_creds_prop_set_verify,

                                   NULL);

    object_property_add_str(obj, "dir",

    object_class_property_add_str(oc, "dir",

                                  qcrypto_tls_creds_prop_get_dir,

                                  qcrypto_tls_creds_prop_set_dir,

                                  NULL);

    object_property_add_enum(obj, "endpoint",

    object_class_property_add_enum(oc, "endpoint",

                                   "QCryptoTLSCredsEndpoint",

                                   QCryptoTLSCredsEndpoint_lookup,

                                   qcrypto_tls_creds_prop_get_endpoint,
@@ -222,6 +218,15 @@ qcrypto_tls_creds_init(Object *obj) 
}





static void

qcrypto_tls_creds_init(Object *obj)

{

    QCryptoTLSCreds *creds = QCRYPTO_TLS_CREDS(obj);



    creds->verifyPeer = true;

}





static void

qcrypto_tls_creds_finalize(Object *obj)

{
@@ -237,6 +242,7 @@ static const TypeInfo qcrypto_tls_creds_info = { 
    .instance_size = sizeof(QCryptoTLSCreds),

    .instance_init = qcrypto_tls_creds_init,

    .instance_finalize = qcrypto_tls_creds_finalize,

    .class_init = qcrypto_tls_creds_class_init,

    .class_size = sizeof(QCryptoTLSCredsClass),

    .abstract = true,

};

crypto/tlscredsanon.c

+5 −11
Original line number Diff line number Diff line
@@ -171,16 +171,6 @@ qcrypto_tls_creds_anon_complete(UserCreatable *uc, Error **errp) 
}





static void

qcrypto_tls_creds_anon_init(Object *obj)

{

    object_property_add_bool(obj, "loaded",

                             qcrypto_tls_creds_anon_prop_get_loaded,

                             qcrypto_tls_creds_anon_prop_set_loaded,

                             NULL);

}





static void

qcrypto_tls_creds_anon_finalize(Object *obj)

{
@@ -196,6 +186,11 @@ qcrypto_tls_creds_anon_class_init(ObjectClass *oc, void *data) 
    UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);



    ucc->complete = qcrypto_tls_creds_anon_complete;



    object_class_property_add_bool(oc, "loaded",

                                   qcrypto_tls_creds_anon_prop_get_loaded,

                                   qcrypto_tls_creds_anon_prop_set_loaded,

                                   NULL);

}
@@ -203,7 +198,6 @@ static const TypeInfo qcrypto_tls_creds_anon_info = { 
    .parent = TYPE_QCRYPTO_TLS_CREDS,

    .name = TYPE_QCRYPTO_TLS_CREDS_ANON,

    .instance_size = sizeof(QCryptoTLSCredsAnon),

    .instance_init = qcrypto_tls_creds_anon_init,

    .instance_finalize = qcrypto_tls_creds_anon_finalize,

    .class_size = sizeof(QCryptoTLSCredsAnonClass),

    .class_init = qcrypto_tls_creds_anon_class_init,

crypto/tlscredsx509.c

+13 −13
Original line number Diff line number Diff line
@@ -804,19 +804,6 @@ qcrypto_tls_creds_x509_init(Object *obj) 
    QCryptoTLSCredsX509 *creds = QCRYPTO_TLS_CREDS_X509(obj);



    creds->sanityCheck = true;



    object_property_add_bool(obj, "loaded",

                             qcrypto_tls_creds_x509_prop_get_loaded,

                             qcrypto_tls_creds_x509_prop_set_loaded,

                             NULL);

    object_property_add_bool(obj, "sanity-check",

                             qcrypto_tls_creds_x509_prop_get_sanity,

                             qcrypto_tls_creds_x509_prop_set_sanity,

                             NULL);

    object_property_add_str(obj, "passwordid",

                            qcrypto_tls_creds_x509_prop_get_passwordid,

                            qcrypto_tls_creds_x509_prop_set_passwordid,

                            NULL);

}
@@ -836,6 +823,19 @@ qcrypto_tls_creds_x509_class_init(ObjectClass *oc, void *data) 
    UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);



    ucc->complete = qcrypto_tls_creds_x509_complete;



    object_class_property_add_bool(oc, "loaded",

                                   qcrypto_tls_creds_x509_prop_get_loaded,

                                   qcrypto_tls_creds_x509_prop_set_loaded,

                                   NULL);

    object_class_property_add_bool(oc, "sanity-check",

                                   qcrypto_tls_creds_x509_prop_get_sanity,

                                   qcrypto_tls_creds_x509_prop_set_sanity,

                                   NULL);

    object_class_property_add_str(oc, "passwordid",

                                  qcrypto_tls_creds_x509_prop_get_passwordid,

                                  qcrypto_tls_creds_x509_prop_set_passwordid,

                                  NULL);

}