Use a seperate section for each nested struct member in INIT macro
authorMartin Willi <martin@revosec.ch>
Wed, 18 Aug 2010 10:15:03 +0000 (12:15 +0200)
committerMartin Willi <martin@revosec.ch>
Wed, 18 Aug 2010 10:15:03 +0000 (12:15 +0200)
77 files changed:
src/libcharon/network/receiver.c
src/libcharon/plugins/addrblock/addrblock_plugin.c
src/libcharon/plugins/android/android_plugin.c
src/libcharon/plugins/dhcp/dhcp_plugin.c
src/libcharon/plugins/eap_identity/eap_identity.c
src/libcharon/plugins/eap_identity/eap_identity.h
src/libcharon/plugins/eap_md5/eap_md5.c
src/libcharon/plugins/eap_md5/eap_md5.h
src/libcharon/plugins/eap_radius/eap_radius.c
src/libcharon/plugins/eap_radius/eap_radius.h
src/libcharon/plugins/eap_radius/eap_radius_plugin.c
src/libcharon/plugins/eap_simaka_sql/eap_simaka_sql_plugin.c
src/libcharon/plugins/eap_tls/eap_tls.c
src/libcharon/plugins/eap_tls/eap_tls_plugin.c
src/libcharon/plugins/eap_ttls/eap_ttls.c
src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
src/libcharon/plugins/eap_ttls/eap_ttls_plugin.c
src/libcharon/plugins/eap_ttls/eap_ttls_server.c
src/libcharon/plugins/farp/farp_plugin.c
src/libcharon/plugins/ha/ha_plugin.c
src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c
src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
src/libcharon/plugins/socket_default/socket_default_plugin.c
src/libcharon/plugins/socket_dynamic/socket_dynamic_plugin.c
src/libcharon/plugins/socket_raw/socket_raw_plugin.c
src/libcharon/processing/jobs/inactivity_job.c
src/libcharon/sa/authenticators/eap_authenticator.c
src/libcharon/sa/tasks/ike_vendor.c
src/libstrongswan/plugins/aes/aes_crypter.c
src/libstrongswan/plugins/aes/aes_plugin.c
src/libstrongswan/plugins/agent/agent_plugin.c
src/libstrongswan/plugins/agent/agent_private_key.c
src/libstrongswan/plugins/blowfish/blowfish_crypter.c
src/libstrongswan/plugins/blowfish/blowfish_plugin.c
src/libstrongswan/plugins/ctr/ctr_ipsec_crypter.c
src/libstrongswan/plugins/ctr/ctr_plugin.c
src/libstrongswan/plugins/curl/curl_fetcher.c
src/libstrongswan/plugins/des/des_crypter.c
src/libstrongswan/plugins/des/des_plugin.c
src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c
src/libstrongswan/plugins/gcrypt/gcrypt_dh.c
src/libstrongswan/plugins/gcrypt/gcrypt_hasher.c
src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c
src/libstrongswan/plugins/gcrypt/gcrypt_rng.c
src/libstrongswan/plugins/gcrypt/gcrypt_rsa_private_key.c
src/libstrongswan/plugins/gcrypt/gcrypt_rsa_public_key.c
src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c
src/libstrongswan/plugins/gmp/gmp_plugin.c
src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c
src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c
src/libstrongswan/plugins/hmac/hmac_plugin.c
src/libstrongswan/plugins/hmac/hmac_prf.c
src/libstrongswan/plugins/hmac/hmac_signer.c
src/libstrongswan/plugins/openssl/openssl_crypter.c
src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c
src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
src/libstrongswan/plugins/openssl/openssl_hasher.c
src/libstrongswan/plugins/openssl/openssl_plugin.c
src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
src/libstrongswan/plugins/openssl/openssl_sha1_prf.c
src/libstrongswan/plugins/padlock/padlock_aes_crypter.c
src/libstrongswan/plugins/padlock/padlock_plugin.c
src/libstrongswan/plugins/padlock/padlock_rng.c
src/libstrongswan/plugins/padlock/padlock_sha1_hasher.c
src/libstrongswan/plugins/pkcs11/pkcs11_hasher.c
src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c
src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
src/libstrongswan/plugins/revocation/revocation_plugin.c
src/libstrongswan/plugins/xcbc/xcbc_plugin.c
src/libstrongswan/plugins/xcbc/xcbc_prf.c
src/libstrongswan/plugins/xcbc/xcbc_signer.c
src/libtls/tls_peer.c
src/libtls/tls_server.c

index 63a8cab..b53dea4 100644 (file)
@@ -383,7 +383,9 @@ receiver_t *receiver_create()
        u_int32_t now = time_monotonic(NULL);
 
        INIT(this,
-               .public.destroy = _destroy,
+               .public = {
+                       .destroy = _destroy,
+               },
                .secret_switch = now,
                .secret_offset = random() % now,
        );
index 1c40703..5fdb36c 100644 (file)
@@ -61,7 +61,11 @@ plugin_t *addrblock_plugin_create()
        private_addrblock_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
                .validator = addrblock_validator_create(),
                .narrower = addrblock_narrow_create(),
        );
index e2c8572..3d82d8f 100644 (file)
@@ -79,8 +79,10 @@ plugin_t *android_plugin_create()
        private_android_plugin_t *this;
 
        INIT(this,
-               .public.plugin = {
-                       .destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
                },
                .logger = android_logger_create(),
                .handler = android_handler_create(),
index 829fd63..fccc99b 100644 (file)
@@ -62,7 +62,11 @@ plugin_t *dhcp_plugin_create()
        private_dhcp_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
                .socket = dhcp_socket_create(),
        );
 
index 01998e8..03066b2 100644 (file)
@@ -157,7 +157,7 @@ eap_identity_t *eap_identity_create_peer(identification_t *server,
 
        INIT(this,
                .public =  {
-                       .eap_method_interface = {
+                       .eap_method = {
                                .initiate = _initiate_peer,
                                .process = _process_peer,
                                .get_type = _get_type,
@@ -182,13 +182,15 @@ eap_identity_t *eap_identity_create_server(identification_t *server,
        private_eap_identity_t *this;
 
        INIT(this,
-               .public.eap_method_interface = {
-                       .initiate = _initiate_server,
-                       .process = _process_server,
-                       .get_type = _get_type,
-                       .is_mutual = _is_mutual,
-                       .get_msk = _get_msk,
-                       .destroy = _destroy,
+               .public = {
+                       .eap_method = {
+                               .initiate = _initiate_server,
+                               .process = _process_server,
+                               .get_type = _get_type,
+                               .is_mutual = _is_mutual,
+                               .get_msk = _get_msk,
+                               .destroy = _destroy,
+                       },
                },
                .peer = peer->clone(peer),
                .identity = chunk_empty,
index 7364a8b..9a7f285 100644 (file)
@@ -33,7 +33,7 @@ struct eap_identity_t {
        /**
         * Implemented eap_method_t interface.
         */
-       eap_method_t eap_method_interface;
+       eap_method_t eap_method;
 };
 
 /**
index a74151a..f70754a 100644 (file)
@@ -236,7 +236,7 @@ eap_md5_t *eap_md5_create_server(identification_t *server, identification_t *pee
 
        INIT(this,
                .public = {
-                       .eap_method_interface = {
+                       .eap_method = {
                                .initiate = _initiate_server,
                                .process = _process_server,
                                .get_type = _get_type,
@@ -247,8 +247,6 @@ eap_md5_t *eap_md5_create_server(identification_t *server, identification_t *pee
                },
                .peer = peer->clone(peer),
                .server = server->clone(server),
-               .challenge = chunk_empty,
-               .identifier = 0,
        );
 
        /* generate a non-zero identifier */
@@ -267,18 +265,18 @@ eap_md5_t *eap_md5_create_peer(identification_t *server, identification_t *peer)
        private_eap_md5_t *this;
 
        INIT(this,
-               .public.eap_method_interface = {
-                       .initiate = _initiate_peer,
-                       .process = _process_peer,
-                       .get_type = _get_type,
-                       .is_mutual = _is_mutual,
-                       .get_msk = _get_msk,
-                       .destroy = _destroy,
+               .public = {
+                       .eap_method = {
+                               .initiate = _initiate_peer,
+                               .process = _process_peer,
+                               .get_type = _get_type,
+                               .is_mutual = _is_mutual,
+                               .get_msk = _get_msk,
+                               .destroy = _destroy,
+                       },
                },
                .peer = peer->clone(peer),
                .server = server->clone(server),
-               .challenge = chunk_empty,
-               .identifier = 0,
        );
 
        return &this->public;
index 3cff0dd..c668714 100644 (file)
@@ -33,7 +33,7 @@ struct eap_md5_t {
        /**
         * Implemented eap_method_t interface.
         */
-       eap_method_t eap_method_interface;
+       eap_method_t eap_method;
 };
 
 /**
index 65b868b..340eb60 100644 (file)
@@ -313,13 +313,15 @@ eap_radius_t *eap_radius_create(identification_t *server, identification_t *peer
        private_eap_radius_t *this;
 
        INIT(this,
-               .public.eap_method_interface = {
-                       .initiate = _initiate,
-                       .process = _process,
-                       .get_type = _get_type,
-                       .is_mutual = _is_mutual,
-                       .get_msk = _get_msk,
-                       .destroy = _destroy,
+               .public = {
+                       .eap_method = {
+                               .initiate = _initiate,
+                               .process = _process,
+                               .get_type = _get_type,
+                               .is_mutual = _is_mutual,
+                               .get_msk = _get_msk,
+                               .destroy = _destroy,
+                       },
                },
                /* initially EAP_RADIUS, but is set to the method selected by RADIUS */
                .type = EAP_RADIUS,
index 8eb9e8c..e98cb06 100644 (file)
@@ -33,7 +33,7 @@ struct eap_radius_t {
        /**
         * Implemented eap_method_t interface.
         */
-       eap_method_t eap_method_interface;
+       eap_method_t eap_method;
 };
 
 /**
index 91aae2f..1c24d77 100644 (file)
@@ -151,7 +151,11 @@ plugin_t *eap_radius_plugin_create()
        private_eap_radius_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
                .servers = linked_list_create(),
        );
 
index 0f53197..1cc5352 100644 (file)
@@ -85,8 +85,10 @@ plugin_t *eap_simaka_sql_plugin_create()
                                                        "charon.plugins.eap-simaka-sql.remove_used", FALSE);
 
        INIT(this,
-               .public.plugin =  {
-                       .destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
                },
                .db = db,
                .provider = eap_simaka_sql_provider_create(db, remove_used),
index 849f038..ac835c7 100644 (file)
@@ -422,13 +422,15 @@ static eap_tls_t *eap_tls_create(identification_t *server,
        private_eap_tls_t *this;
 
        INIT(this,
-               .public.eap_method = {
-                       .initiate = _initiate,
-                       .process = _process,
-                       .get_type = _get_type,
-                       .is_mutual = _is_mutual,
-                       .get_msk = _get_msk,
-                       .destroy = _destroy,
+               .public = {
+                       .eap_method = {
+                               .initiate = _initiate,
+                               .process = _process,
+                               .get_type = _get_type,
+                               .is_mutual = _is_mutual,
+                               .get_msk = _get_msk,
+                               .destroy = _destroy,
+                       },
                },
                .is_server = is_server,
        );
index 15165d9..a7c040b 100644 (file)
@@ -38,7 +38,9 @@ plugin_t *eap_tls_plugin_create()
        eap_tls_plugin_t *this;
 
        INIT(this,
-               .plugin.destroy = _destroy,
+               .plugin = {
+                       .destroy = _destroy,
+               },
        );
 
        charon->eap->add_method(charon->eap, EAP_TLS, 0, EAP_SERVER,
index ad3360d..ccc326e 100644 (file)
@@ -431,13 +431,15 @@ static eap_ttls_t *eap_ttls_create(identification_t *server,
        private_eap_ttls_t *this;
 
        INIT(this,
-               .public.eap_method = {
-                       .initiate = _initiate,
-                       .process = _process,
-                       .get_type = _get_type,
-                       .is_mutual = _is_mutual,
-                       .get_msk = _get_msk,
-                       .destroy = _destroy,
+               .public = {
+                       .eap_method = {
+                               .initiate = _initiate,
+                               .process = _process,
+                               .get_type = _get_type,
+                               .is_mutual = _is_mutual,
+                               .get_msk = _get_msk,
+                               .destroy = _destroy,
+                       },
                },
                .is_server = is_server,
        );
index b675d9a..cbed4d1 100644 (file)
@@ -49,12 +49,12 @@ struct private_eap_ttls_peer_t {
        bool start_phase2;
 
        /**
-     * Current phase 2 EAP method 
+     * Current phase 2 EAP method
         */
        eap_method_t *method;
 
        /**
-     * Pending outbound EAP message 
+     * Pending outbound EAP message
         */
        eap_payload_t *out;
 
@@ -123,7 +123,7 @@ METHOD(tls_application_t, process, status_t,
                        return NEED_MORE;
                }
        }
-               
+
        type = this->method->get_type(this->method, &vendor);
 
        if (type != received_type || vendor != received_vendor)
@@ -156,7 +156,7 @@ METHOD(tls_application_t, process, status_t,
                                DBG1(DBG_IKE, "%N method failed", eap_type_names, type);
                        }
                        return FAILED;
-       }               
+       }
 }
 
 METHOD(tls_application_t, build, status_t,
@@ -220,16 +220,16 @@ eap_ttls_peer_t *eap_ttls_peer_create(identification_t *server,
        private_eap_ttls_peer_t *this;
 
        INIT(this,
-               .public.application = {
-                       .process = _process,
-                       .build = _build,
-                       .destroy = _destroy,
+               .public = {
+                       .application = {
+                               .process = _process,
+                               .build = _build,
+                               .destroy = _destroy,
+                       },
                },
                .server = server->clone(server),
                .peer = peer->clone(peer),
                .start_phase2 = TRUE,
-               .method = NULL,
-               .out = NULL,
                .avp = eap_ttls_avp_create(),
        );
 
index 642e004..48e759d 100644 (file)
@@ -38,7 +38,9 @@ plugin_t *eap_ttls_plugin_create()
        eap_ttls_plugin_t *this;
 
        INIT(this,
-               .plugin.destroy = _destroy,
+               .plugin = {
+                       .destroy = _destroy,
+               },
        );
 
        charon->eap->add_method(charon->eap, EAP_TTLS, 0, EAP_SERVER,
index 8401f85..94fd555 100644 (file)
@@ -49,12 +49,12 @@ struct private_eap_ttls_server_t {
        bool start_phase2;
 
        /**
-     * Current phase 2 EAP method 
+     * Current phase 2 EAP method
         */
        eap_method_t *method;
 
        /**
-     * Pending outbound EAP message 
+     * Pending outbound EAP message
         */
        eap_payload_t *out;
 
@@ -118,7 +118,7 @@ METHOD(tls_application_t, process, status_t,
                        return FAILED;
                }
        }
-               
+
        if (!received_vendor && received_type == EAP_IDENTITY)
        {
                chunk_t eap_id;
@@ -184,7 +184,7 @@ METHOD(tls_application_t, process, status_t,
                        return FAILED;
                }
        }
-               
+
        if (this->method == 0)
        {
                DBG1(DBG_IKE, "no %N phase2 method installed", eap_type_names, EAP_TTLS);
@@ -194,7 +194,7 @@ METHOD(tls_application_t, process, status_t,
 
        status = this->method->process(this->method, in, &this->out);
        in->destroy(in);
-       
+
        switch (status)
        {
                case SUCCESS:
@@ -218,7 +218,7 @@ METHOD(tls_application_t, process, status_t,
                                DBG1(DBG_IKE, "%N method failed", eap_type_names, type);
                        }
                        return FAILED;
-       }               
+       }
        return status;
 }
 
@@ -285,16 +285,16 @@ eap_ttls_server_t *eap_ttls_server_create(identification_t *server,
        private_eap_ttls_server_t *this;
 
        INIT(this,
-               .public.application = {
-                       .process = _process,
-                       .build = _build,
-                       .destroy = _destroy,
+               .public = {
+                       .application = {
+                               .process = _process,
+                               .build = _build,
+                               .destroy = _destroy,
+                       },
                },
                .server = server->clone(server),
                .peer = peer->clone(peer),
                .start_phase2 = TRUE,
-               .method = NULL,
-               .out = NULL,
                .avp = eap_ttls_avp_create(),
        );
 
index 01c2a39..d83bc1f 100644 (file)
@@ -60,7 +60,11 @@ plugin_t *farp_plugin_create()
        private_farp_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
                .listener = farp_listener_create(),
        );
 
index e722b4f..581294e 100644 (file)
@@ -142,7 +142,11 @@ plugin_t *ha_plugin_create()
        }
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        if (secret)
index 6b5aeb3..f8a5d5b 100644 (file)
@@ -2598,18 +2598,20 @@ kernel_klips_ipsec_t *kernel_klips_ipsec_create()
        private_kernel_klips_ipsec_t *this;
 
        INIT(this,
-               .public.interface = {
-                       .get_spi = _get_spi,
-                       .get_cpi = _get_cpi,
-                       .add_sa  = _add_sa,
-                       .update_sa = _update_sa,
-                       .query_sa = _query_sa,
-                       .del_sa = _del_sa,
-                       .add_policy = _add_policy,
-                       .query_policy = _query_policy,
-                       .del_policy = _del_policy,
-                       .bypass_socket = _bypass_socket,
-                       .destroy = _destroy,
+               .public = {
+                       .interface = {
+                               .get_spi = _get_spi,
+                               .get_cpi = _get_cpi,
+                               .add_sa  = _add_sa,
+                               .update_sa = _update_sa,
+                               .query_sa = _query_sa,
+                               .del_sa = _del_sa,
+                               .add_policy = _add_policy,
+                               .query_policy = _query_policy,
+                               .del_policy = _del_policy,
+                               .bypass_socket = _bypass_socket,
+                               .destroy = _destroy,
+                       },
                },
                .policies = linked_list_create(),
                .allocated_spis = linked_list_create(),
index 019ec93..dcd6871 100644 (file)
@@ -305,7 +305,7 @@ static u_int policy_hash(policy_entry_t *key)
  */
 static bool policy_equals(policy_entry_t *key, policy_entry_t *other_key)
 {
-       return memeq(&key->sel, &other_key->sel, 
+       return memeq(&key->sel, &other_key->sel,
                                 sizeof(struct xfrm_selector) + sizeof(u_int32_t)) &&
                   key->direction == other_key->direction;
 }
@@ -1379,7 +1379,7 @@ METHOD(kernel_ipsec_t, query_sa, status_t,
                                case NLMSG_ERROR:
                                {
                                        struct nlmsgerr *err = NLMSG_DATA(hdr);
-                                       
+
                                        if (mark.value)
                                        {
                                                DBG1(DBG_KNL, "querying SAD entry with SPI %.8x  "
@@ -2202,18 +2202,20 @@ kernel_netlink_ipsec_t *kernel_netlink_ipsec_create()
        int fd;
 
        INIT(this,
-               .public.interface = {
-                       .get_spi = _get_spi,
-                       .get_cpi = _get_cpi,
-                       .add_sa  = _add_sa,
-                       .update_sa = _update_sa,
-                       .query_sa = _query_sa,
-                       .del_sa = _del_sa,
-                       .add_policy = _add_policy,
-                       .query_policy = _query_policy,
-                       .del_policy = _del_policy,
-                       .bypass_socket = _bypass_socket,
-                       .destroy = _destroy,
+               .public = {
+                       .interface = {
+                               .get_spi = _get_spi,
+                               .get_cpi = _get_cpi,
+                               .add_sa  = _add_sa,
+                               .update_sa = _update_sa,
+                               .query_sa = _query_sa,
+                               .del_sa = _del_sa,
+                               .add_policy = _add_policy,
+                               .query_policy = _query_policy,
+                               .del_policy = _del_policy,
+                               .bypass_socket = _bypass_socket,
+                               .destroy = _destroy,
+                       },
                },
                .policies = hashtable_create((hashtable_hash_t)policy_hash,
                                                                         (hashtable_equals_t)policy_equals, 32),
index a64c27f..b01f627 100644 (file)
@@ -2154,18 +2154,20 @@ kernel_pfkey_ipsec_t *kernel_pfkey_ipsec_create()
        private_kernel_pfkey_ipsec_t *this;
 
        INIT(this,
-               .public.interface = {
-                       .get_spi = _get_spi,
-                       .get_cpi = _get_cpi,
-                       .add_sa  = _add_sa,
-                       .update_sa = _update_sa,
-                       .query_sa = _query_sa,
-                       .del_sa = _del_sa,
-                       .add_policy = _add_policy,
-                       .query_policy = _query_policy,
-                       .del_policy = _del_policy,
-                       .bypass_socket = _bypass_socket,
-                       .destroy = _destroy,
+               .public = {
+                       .interface = {
+                               .get_spi = _get_spi,
+                               .get_cpi = _get_cpi,
+                               .add_sa  = _add_sa,
+                               .update_sa = _update_sa,
+                               .query_sa = _query_sa,
+                               .del_sa = _del_sa,
+                               .add_policy = _add_policy,
+                               .query_policy = _query_policy,
+                               .del_policy = _del_policy,
+                               .bypass_socket = _bypass_socket,
+                               .destroy = _destroy,
+                       },
                },
                .policies = linked_list_create(),
                .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
index 45390dd..29549b0 100644 (file)
@@ -53,7 +53,11 @@ plugin_t *socket_default_plugin_create()
        private_socket_default_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
                .socket = socket_default_socket_create(),
        );
 
index 3410fc7..eb3cbb9 100644 (file)
@@ -53,7 +53,11 @@ plugin_t *socket_dynamic_plugin_create()
        private_socket_dynamic_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
                .socket = socket_dynamic_socket_create(),
        );
 
index 5b011ab..5b4c044 100644 (file)
@@ -53,7 +53,11 @@ plugin_t *socket_raw_plugin_create()
        private_socket_raw_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
                .socket = socket_raw_socket_create(),
        );
 
index 13fc5e3..f205558 100644 (file)
@@ -136,9 +136,11 @@ inactivity_job_t *inactivity_job_create(u_int32_t reqid, u_int32_t timeout,
        private_inactivity_job_t *this;
 
        INIT(this,
-               .public.job_interface = {
-                       .execute = _execute,
-                       .destroy = _destroy,
+               .public = {
+                               .job_interface = {
+                               .execute = _execute,
+                               .destroy = _destroy,
+                       },
                },
                .reqid = reqid,
                .timeout = timeout,
index 23105f6..0a2cb65 100644 (file)
@@ -652,13 +652,6 @@ eap_authenticator_t *eap_authenticator_create_builder(ike_sa_t *ike_sa,
                .received_nonce = received_nonce,
                .sent_init = sent_init,
                .sent_nonce = sent_nonce,
-               .msk = chunk_empty,
-               .method = NULL,
-               .eap_payload = NULL,
-               .eap_complete = FALSE,
-               .auth_complete = FALSE,
-               .eap_identity = NULL,
-               .require_mutual = FALSE,
        );
 
        return &this->public;
@@ -674,24 +667,19 @@ eap_authenticator_t *eap_authenticator_create_verifier(ike_sa_t *ike_sa,
        private_eap_authenticator_t *this;
 
        INIT(this,
-               .public.authenticator = {
-                       .build = _build_server,
-                       .process = _process_server,
-                       .is_mutual = _is_mutual,
-                       .destroy = _destroy,
+               .public = {
+                       .authenticator = {
+                               .build = _build_server,
+                               .process = _process_server,
+                               .is_mutual = _is_mutual,
+                               .destroy = _destroy,
+                       },
                },
                .ike_sa = ike_sa,
                .received_init = received_init,
                .received_nonce = received_nonce,
                .sent_init = sent_init,
                .sent_nonce = sent_nonce,
-               .msk = chunk_empty,
-               .method = NULL,
-               .eap_payload = NULL,
-               .eap_complete = FALSE,
-               .auth_complete = FALSE,
-               .eap_identity = NULL,
-               .require_mutual = FALSE,
        );
 
        return &this->public;
index 7c435b6..1c14ee0 100644 (file)
@@ -123,12 +123,14 @@ ike_vendor_t *ike_vendor_create(ike_sa_t *ike_sa, bool initiator)
        private_ike_vendor_t *this;
 
        INIT(this,
-               .public.task = {
-                       .build = _build,
-                       .process = _process,
-                       .migrate = _migrate,
-                       .get_type = _get_type,
-                       .destroy = _destroy,
+               .public = {
+                       .task = {
+                               .build = _build,
+                               .process = _process,
+                               .migrate = _migrate,
+                               .get_type = _get_type,
+                               .destroy = _destroy,
+                       },
                },
                .initiator = initiator,
                .ike_sa = ike_sa,
index 5ba92f8..f13e334 100644 (file)
@@ -1550,18 +1550,20 @@ aes_crypter_t *aes_crypter_create(encryption_algorithm_t algo, size_t key_size)
        #endif
 
        INIT(this,
-               .public.crypter = {
-                       .encrypt = _encrypt,
-                       .decrypt = _decrypt,
-                       .get_block_size = _get_block_size,
-                       .get_iv_size = _get_iv_size,
-                       .get_key_size = _get_key_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .crypter = {
+                               .encrypt = _encrypt,
+                               .decrypt = _decrypt,
+                               .get_block_size = _get_block_size,
+                               .get_iv_size = _get_iv_size,
+                               .get_key_size = _get_key_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
                .key_size = key_size,
                .aes_Nkey = key_size / 4,
        );
 
-       return &(this->public);
+       return &this->public;
 }
index 1d20b8d..22b47e3 100644 (file)
@@ -47,7 +47,11 @@ plugin_t *aes_plugin_create()
        private_aes_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC,
index 33043d8..f5b725d 100644 (file)
@@ -47,7 +47,11 @@ plugin_t *agent_plugin_create()
        private_agent_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_RSA,
index 31f0b07..0864f41 100644 (file)
@@ -402,19 +402,21 @@ agent_private_key_t *agent_private_key_open(key_type_t type, va_list args)
        }
 
        INIT(this,
-               .public.key = {
-                       .get_type = _get_type,
-                       .sign = _sign,
-                       .decrypt = _decrypt,
-                       .get_keysize = _get_keysize,
-                       .get_public_key = _get_public_key,
-                       .belongs_to = private_key_belongs_to,
-                       .equals = private_key_equals,
-                       .get_fingerprint = _get_fingerprint,
-                       .has_fingerprint = private_key_has_fingerprint,
-                       .get_encoding = _get_encoding,
-                       .get_ref = _get_ref,
-                       .destroy = _destroy,
+               .public = {
+                       .key = {
+                               .get_type = _get_type,
+                               .sign = _sign,
+                               .decrypt = _decrypt,
+                               .get_keysize = _get_keysize,
+                               .get_public_key = _get_public_key,
+                               .belongs_to = private_key_belongs_to,
+                               .equals = private_key_equals,
+                               .get_fingerprint = _get_fingerprint,
+                               .has_fingerprint = private_key_has_fingerprint,
+                               .get_encoding = _get_encoding,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
                },
                .ref = 1,
        );
index 8135faa..784c07e 100644 (file)
@@ -177,14 +177,16 @@ blowfish_crypter_t *blowfish_crypter_create(encryption_algorithm_t algo,
        }
 
        INIT(this,
-               .public.crypter = {
-                       .encrypt = _encrypt,
-                       .decrypt = _decrypt,
-                       .get_block_size = _get_block_size,
-                       .get_iv_size = _get_iv_size,
-                       .get_key_size = _get_key_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .crypter = {
+                               .encrypt = _encrypt,
+                               .decrypt = _decrypt,
+                               .get_block_size = _get_block_size,
+                               .get_iv_size = _get_iv_size,
+                               .get_key_size = _get_key_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
                .key_size = key_size ?: 16,
        );
index b4b92c8..6ab093d 100644 (file)
@@ -48,7 +48,11 @@ plugin_t *blowfish_plugin_create()
        private_blowfish_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH,
index 5f7666f..ddcae42 100644 (file)
@@ -149,14 +149,16 @@ ctr_ipsec_crypter_t *ctr_ipsec_crypter_create(encryption_algorithm_t algo,
        }
 
        INIT(this,
-               .public.crypter = {
-                       .encrypt = _crypt,
-                       .decrypt = _crypt,
-                       .get_block_size = _get_block_size,
-                       .get_iv_size = _get_iv_size,
-                       .get_key_size = _get_key_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .crypter = {
+                               .encrypt = _crypt,
+                               .decrypt = _crypt,
+                               .get_block_size = _get_block_size,
+                               .get_iv_size = _get_iv_size,
+                               .get_key_size = _get_key_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
                .crypter = lib->crypto->create_crypter(lib->crypto, algo, key_size),
        );
index d9ff436..5e47f23 100644 (file)
@@ -49,7 +49,11 @@ plugin_t *ctr_plugin_create()
        private_ctr_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        lib->crypto->add_crypter(lib->crypto, ENCR_AES_CTR,
index 2341c90..4835f64 100644 (file)
@@ -166,10 +166,12 @@ curl_fetcher_t *curl_fetcher_create()
        private_curl_fetcher_t *this;
 
        INIT(this,
-               .public.interface = {
-                       .fetch = _fetch,
-                       .set_option = _set_option,
-                       .destroy = _destroy,
+               .public = {
+                       .interface = {
+                               .fetch = _fetch,
+                               .set_option = _set_option,
+                               .destroy = _destroy,
+                       },
                },
                .curl = curl_easy_init(),
        );
index eae01df..7d9fbe8 100644 (file)
@@ -1563,11 +1563,13 @@ des_crypter_t *des_crypter_create(encryption_algorithm_t algo)
        private_des_crypter_t *this;
 
        INIT(this,
-               .public.crypter = {
-                       .get_block_size = _get_block_size,
-                       .get_iv_size = _get_iv_size,
-                       .get_key_size = _get_key_size,
-                       .destroy = _destroy,
+               .public = {
+                       .crypter = {
+                               .get_block_size = _get_block_size,
+                               .get_iv_size = _get_iv_size,
+                               .get_key_size = _get_key_size,
+                               .destroy = _destroy,
+                       },
                },
        );
 
index 8e3fc1f..43b457c 100644 (file)
@@ -47,7 +47,11 @@ plugin_t *des_plugin_create()
        private_des_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        lib->crypto->add_crypter(lib->crypto, ENCR_3DES,
index 943f9c2..5994819 100644 (file)
@@ -278,14 +278,16 @@ gcrypt_crypter_t *gcrypt_crypter_create(encryption_algorithm_t algo,
        }
 
        INIT(this,
-               .public.crypter = {
-                       .encrypt = _encrypt,
-                       .decrypt = _decrypt,
-                       .get_block_size = _get_block_size,
-                       .get_iv_size = _get_iv_size,
-                       .get_key_size = _get_key_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .crypter = {
+                               .encrypt = _encrypt,
+                               .decrypt = _decrypt,
+                               .get_block_size = _get_block_size,
+                               .get_iv_size = _get_iv_size,
+                               .get_key_size = _get_key_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
                .alg = gcrypt_alg,
                .ctr_mode = mode == GCRY_CIPHER_MODE_CTR,
index 183d34d..1d519ce 100644 (file)
@@ -185,12 +185,14 @@ gcrypt_dh_t *gcrypt_dh_create(diffie_hellman_group_t group)
        }
 
        INIT(this,
-               .public.dh = {
-                       .get_shared_secret = _get_shared_secret,
-                       .set_other_public_value = _set_other_public_value,
-                       .get_my_public_value = _get_my_public_value,
-                       .get_dh_group = _get_dh_group,
-                       .destroy = _destroy,
+               .public = {
+                       .dh = {
+                               .get_shared_secret = _get_shared_secret,
+                               .set_other_public_value = _set_other_public_value,
+                               .get_my_public_value = _get_my_public_value,
+                               .get_dh_group = _get_dh_group,
+                               .destroy = _destroy,
+                       },
                },
                .group = group,
                .p_len = params->prime.len,
index ece4fab..96c8761 100644 (file)
@@ -121,12 +121,14 @@ gcrypt_hasher_t *gcrypt_hasher_create(hash_algorithm_t algo)
        }
 
        INIT(this,
-               .public.hasher = {
-                       .get_hash = _get_hash,
-                       .allocate_hash = _allocate_hash,
-                       .get_hash_size = _get_hash_size,
-                       .reset = _reset,
-                       .destroy = _destroy,
+               .public = {
+                       .hasher = {
+                               .get_hash = _get_hash,
+                               .allocate_hash = _allocate_hash,
+                               .get_hash_size = _get_hash_size,
+                               .reset = _reset,
+                               .destroy = _destroy,
+                       },
                },
        );
 
index cc13f55..eb9b950 100644 (file)
@@ -138,7 +138,11 @@ plugin_t *gcrypt_plugin_create()
        gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        /* hashers */
index fb4443d..d29755d 100644 (file)
@@ -83,10 +83,12 @@ gcrypt_rng_t *gcrypt_rng_create(rng_quality_t quality)
        }
 
        INIT(this,
-               .public.rng = {
-                       .get_bytes = _get_bytes,
-                       .allocate_bytes = _allocate_bytes,
-                       .destroy = _destroy,
+               .public = {
+                       .rng = {
+                               .get_bytes = _get_bytes,
+                               .allocate_bytes = _allocate_bytes,
+                               .destroy = _destroy,
+                       },
                },
                .quality = quality,
        );
index 2d9baa4..38ce2cd 100644 (file)
@@ -427,19 +427,21 @@ static private_gcrypt_rsa_private_key_t *create_empty()
        private_gcrypt_rsa_private_key_t *this;
 
        INIT(this,
-               .public.key = {
-                       .get_type = _get_type,
-                       .sign = _sign,
-                       .decrypt = _decrypt,
-                       .get_keysize = _get_keysize,
-                       .get_public_key = _get_public_key,
-                       .equals = private_key_equals,
-                       .belongs_to = private_key_belongs_to,
-                       .get_fingerprint = _get_fingerprint,
-                       .has_fingerprint = private_key_has_fingerprint,
-                       .get_encoding = _get_encoding,
-                       .get_ref = _get_ref,
-                       .destroy = _destroy,
+               .public = {
+                       .key = {
+                               .get_type = _get_type,
+                               .sign = _sign,
+                               .decrypt = _decrypt,
+                               .get_keysize = _get_keysize,
+                               .get_public_key = _get_public_key,
+                               .equals = private_key_equals,
+                               .belongs_to = private_key_belongs_to,
+                               .get_fingerprint = _get_fingerprint,
+                               .has_fingerprint = private_key_has_fingerprint,
+                               .get_encoding = _get_encoding,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
                },
                .ref = 1,
        );
index a49a6e5..f8645da 100644 (file)
@@ -322,17 +322,19 @@ gcrypt_rsa_public_key_t *gcrypt_rsa_public_key_load(key_type_t type,
        }
 
        INIT(this,
-               .public.key = {
-                       .get_type = _get_type,
-                       .verify = _verify,
-                       .encrypt = _encrypt_,
-                       .equals = public_key_equals,
-                       .get_keysize = _get_keysize,
-                       .get_fingerprint = _get_fingerprint,
-                       .has_fingerprint = public_key_has_fingerprint,
-                       .get_encoding = _get_encoding,
-                       .get_ref = _get_ref,
-                       .destroy = _destroy,
+               .public = {
+                       .key = {
+                               .get_type = _get_type,
+                               .verify = _verify,
+                               .encrypt = _encrypt_,
+                               .equals = public_key_equals,
+                               .get_keysize = _get_keysize,
+                               .get_fingerprint = _get_fingerprint,
+                               .has_fingerprint = public_key_has_fingerprint,
+                               .get_encoding = _get_encoding,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
                },
                .ref = 1,
        );
index 00455af..9f992c6 100644 (file)
@@ -206,12 +206,14 @@ gmp_diffie_hellman_t *gmp_diffie_hellman_create(diffie_hellman_group_t group)
        }
 
        INIT(this,
-               .public.dh = {
-                       .get_shared_secret = _get_shared_secret,
-                       .set_other_public_value = _set_other_public_value,
-                       .get_my_public_value = _get_my_public_value,
-                       .get_dh_group = _get_dh_group,
-                       .destroy = _destroy,
+               .public = {
+                       .dh = {
+                               .get_shared_secret = _get_shared_secret,
+                               .set_other_public_value = _set_other_public_value,
+                               .get_my_public_value = _get_my_public_value,
+                               .get_dh_group = _get_dh_group,
+                               .destroy = _destroy,
+                       },
                },
                .group = group,
                .p_len = params->prime.len,
index dd04b94..5081844 100644 (file)
@@ -55,7 +55,11 @@ plugin_t *gmp_plugin_create()
        private_gmp_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        lib->crypto->add_dh(lib->crypto, MODP_2048_BIT,
index 5001a87..1b6c208 100644 (file)
@@ -566,19 +566,21 @@ static private_gmp_rsa_private_key_t *gmp_rsa_private_key_create_empty(void)
        private_gmp_rsa_private_key_t *this;
 
        INIT(this,
-               .public.key = {
-                       .get_type = _get_type,
-                       .sign = _sign,
-                       .decrypt = _decrypt,
-                       .get_keysize = _get_keysize,
-                       .get_public_key = _get_public_key,
-                       .equals = private_key_equals,
-                       .belongs_to = private_key_belongs_to,
-                       .get_fingerprint = _get_fingerprint,
-                       .has_fingerprint = private_key_has_fingerprint,
-                       .get_encoding = _get_encoding,
-                       .get_ref = _get_ref,
-                       .destroy = _destroy,
+               .public = {
+                       .key = {
+                               .get_type = _get_type,
+                               .sign = _sign,
+                               .decrypt = _decrypt,
+                               .get_keysize = _get_keysize,
+                               .get_public_key = _get_public_key,
+                               .equals = private_key_equals,
+                               .belongs_to = private_key_belongs_to,
+                               .get_fingerprint = _get_fingerprint,
+                               .has_fingerprint = private_key_has_fingerprint,
+                               .get_encoding = _get_encoding,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
                },
                .ref = 1,
        );
index 4beeaa5..a7ba801 100644 (file)
@@ -471,17 +471,19 @@ gmp_rsa_public_key_t *gmp_rsa_public_key_load(key_type_t type, va_list args)
        }
 
        INIT(this,
-               .public.key = {
-                       .get_type = _get_type,
-                       .verify = _verify,
-                       .encrypt = _encrypt_,
-                       .equals = public_key_equals,
-                       .get_keysize = _get_keysize,
-                       .get_fingerprint = _get_fingerprint,
-                       .has_fingerprint = public_key_has_fingerprint,
-                       .get_encoding = _get_encoding,
-                       .get_ref = _get_ref,
-                       .destroy = _destroy,
+               .public = {
+                       .key = {
+                               .get_type = _get_type,
+                               .verify = _verify,
+                               .encrypt = _encrypt_,
+                               .equals = public_key_equals,
+                               .get_keysize = _get_keysize,
+                               .get_fingerprint = _get_fingerprint,
+                               .has_fingerprint = public_key_has_fingerprint,
+                               .get_encoding = _get_encoding,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
                },
                .ref = 1,
        );
index 0cf13ff..1838117 100644 (file)
@@ -50,7 +50,11 @@ plugin_t *hmac_plugin_create()
        private_hmac_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_256,
index 72f83d6..ca10612 100644 (file)
@@ -108,13 +108,15 @@ hmac_prf_t *hmac_prf_create(pseudo_random_function_t algo)
        }
 
        INIT(this,
-               .public.prf = {
-                       .get_bytes = _get_bytes,
-                       .allocate_bytes = _allocate_bytes,
-                       .get_block_size = _get_block_size,
-                       .get_key_size = _get_key_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .prf = {
+                               .get_bytes = _get_bytes,
+                               .allocate_bytes = _allocate_bytes,
+                               .get_block_size = _get_block_size,
+                               .get_key_size = _get_key_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
                .hmac = hmac,
        );
index b5cbf1e..26483a9 100644 (file)
@@ -172,14 +172,16 @@ hmac_signer_t *hmac_signer_create(integrity_algorithm_t algo)
        }
 
        INIT(this,
-               .public.signer = {
-                       .get_signature = _get_signature,
-                       .allocate_signature = _allocate_signature,
-                       .verify_signature = _verify_signature,
-                       .get_key_size = _get_key_size,
-                       .get_block_size = _get_block_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .signer = {
+                               .get_signature = _get_signature,
+                               .allocate_signature = _allocate_signature,
+                               .verify_signature = _verify_signature,
+                               .get_key_size = _get_key_size,
+                               .get_block_size = _get_block_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
                .block_size = min(trunc, hmac->get_block_size(hmac)),
                .hmac = hmac,
index 1cecec8..2ed07ff 100644 (file)
@@ -165,14 +165,16 @@ openssl_crypter_t *openssl_crypter_create(encryption_algorithm_t algo,
        private_openssl_crypter_t *this;
 
        INIT(this,
-               .public.crypter = {
-                       .encrypt = _encrypt,
-                       .decrypt = _decrypt,
-                       .get_block_size = _get_block_size,
-                       .get_iv_size = _get_iv_size,
-                       .get_key_size = _get_key_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .crypter = {
+                               .encrypt = _encrypt,
+                               .decrypt = _decrypt,
+                               .get_block_size = _get_block_size,
+                               .get_iv_size = _get_iv_size,
+                               .get_key_size = _get_key_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
        );
 
index ff49a2d..4a00c31 100644 (file)
@@ -143,12 +143,14 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create(diffie_hellman_group_t g
        private_openssl_diffie_hellman_t *this;
 
        INIT(this,
-               .public.dh = {
-                       .get_shared_secret = _get_shared_secret,
-                       .set_other_public_value = _set_other_public_value,
-                       .get_my_public_value = _get_my_public_value,
-                       .get_dh_group = _get_dh_group,
-                       .destroy = _destroy,
+               .public = {
+                       .dh = {
+                               .get_shared_secret = _get_shared_secret,
+                               .set_other_public_value = _set_other_public_value,
+                               .get_my_public_value = _get_my_public_value,
+                               .get_dh_group = _get_dh_group,
+                               .destroy = _destroy,
+                       },
                },
        );
 
index 2a856ce..32fc2bc 100644 (file)
@@ -269,12 +269,14 @@ openssl_ec_diffie_hellman_t *openssl_ec_diffie_hellman_create(diffie_hellman_gro
        private_openssl_ec_diffie_hellman_t *this;
 
        INIT(this,
-               .public.dh = {
-                       .get_shared_secret = _get_shared_secret,
-                       .set_other_public_value = _set_other_public_value,
-                       .get_my_public_value = _get_my_public_value,
-                       .get_dh_group = _get_dh_group,
-                       .destroy = _destroy,
+               .public = {
+                       .dh = {
+                               .get_shared_secret = _get_shared_secret,
+                               .set_other_public_value = _set_other_public_value,
+                               .get_my_public_value = _get_my_public_value,
+                               .get_dh_group = _get_dh_group,
+                               .destroy = _destroy,
+                       },
                },
                .group = group,
        );
index 15b0f57..f4c4759 100644 (file)
@@ -286,19 +286,21 @@ static private_openssl_ec_private_key_t *create_empty(void)
        private_openssl_ec_private_key_t *this;
 
        INIT(this,
-               .public.key = {
-                       .get_type = _get_type,
-                       .sign = _sign,
-                       .decrypt = _decrypt,
-                       .get_keysize = _get_keysize,
-                       .get_public_key = _get_public_key,
-                       .equals = private_key_equals,
-                       .belongs_to = private_key_belongs_to,
-                       .get_fingerprint = _get_fingerprint,
-                       .has_fingerprint = private_key_has_fingerprint,
-                       .get_encoding = _get_encoding,
-                       .get_ref = _get_ref,
-                       .destroy = _destroy,
+               .public = {
+                       .key = {
+                               .get_type = _get_type,
+                               .sign = _sign,
+                               .decrypt = _decrypt,
+                               .get_keysize = _get_keysize,
+                               .get_public_key = _get_public_key,
+                               .equals = private_key_equals,
+                               .belongs_to = private_key_belongs_to,
+                               .get_fingerprint = _get_fingerprint,
+                               .has_fingerprint = private_key_has_fingerprint,
+                               .get_encoding = _get_encoding,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
                },
                .ref = 1,
        );
index f680749..7461695 100644 (file)
@@ -303,17 +303,19 @@ static private_openssl_ec_public_key_t *create_empty()
        private_openssl_ec_public_key_t *this;
 
        INIT(this,
-               .public.key = {
-                       .get_type = _get_type,
-                       .verify = _verify,
-                       .encrypt = _encrypt,
-                       .get_keysize = _get_keysize,
-                       .equals = public_key_equals,
-                       .get_fingerprint = _get_fingerprint,
-                       .has_fingerprint = public_key_has_fingerprint,
-                       .get_encoding = _get_encoding,
-                       .get_ref = _get_ref,
-                       .destroy = _destroy,
+               .public = {
+                       .key = {
+                               .get_type = _get_type,
+                               .verify = _verify,
+                               .encrypt = _encrypt,
+                               .get_keysize = _get_keysize,
+                               .equals = public_key_equals,
+                               .get_fingerprint = _get_fingerprint,
+                               .has_fingerprint = public_key_has_fingerprint,
+                               .get_encoding = _get_encoding,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
                },
                .ref = 1,
        );
index 8904ae9..d81f4b2 100644 (file)
@@ -149,12 +149,14 @@ openssl_hasher_t *openssl_hasher_create(hash_algorithm_t algo)
        }
 
        INIT(this,
-               .public.hasher = {
-                       .get_hash = _get_hash,
-                       .allocate_hash = _allocate_hash,
-                       .get_hash_size = _get_hash_size,
-                       .reset = _reset,
-                       .destroy = _destroy,
+               .public = {
+                       .hasher = {
+                               .get_hash = _get_hash,
+                               .allocate_hash = _allocate_hash,
+                               .get_hash_size = _get_hash_size,
+                               .reset = _reset,
+                               .destroy = _destroy,
+                       },
                },
        );
 
index d8c66dc..b8f00ff 100644 (file)
@@ -245,7 +245,11 @@ plugin_t *openssl_plugin_create()
        private_openssl_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        threading_init();
index e780906..0b607c3 100644 (file)
@@ -293,19 +293,21 @@ static private_openssl_rsa_private_key_t *create_empty()
        private_openssl_rsa_private_key_t *this;
 
        INIT(this,
-               .public.key = {
-                       .get_type = _get_type,
-                       .sign = _sign,
-                       .decrypt = _decrypt,
-                       .get_keysize = _get_keysize,
-                       .get_public_key = _get_public_key,
-                       .equals = private_key_equals,
-                       .belongs_to = private_key_belongs_to,
-                       .get_fingerprint = _get_fingerprint,
-                       .has_fingerprint = private_key_has_fingerprint,
-                       .get_encoding = _get_encoding,
-                       .get_ref = _get_ref,
-                       .destroy = _destroy,
+               .public = {
+                       .key = {
+                               .get_type = _get_type,
+                               .sign = _sign,
+                               .decrypt = _decrypt,
+                               .get_keysize = _get_keysize,
+                               .get_public_key = _get_public_key,
+                               .equals = private_key_equals,
+                               .belongs_to = private_key_belongs_to,
+                               .get_fingerprint = _get_fingerprint,
+                               .has_fingerprint = private_key_has_fingerprint,
+                               .get_encoding = _get_encoding,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
                },
                .ref = 1,
        );
index 667ddad..422e315 100644 (file)
@@ -304,17 +304,19 @@ static private_openssl_rsa_public_key_t *create_empty()
        private_openssl_rsa_public_key_t *this;
 
        INIT(this,
-               .public.key = {
-                       .get_type = _get_type,
-                       .verify = _verify,
-                       .encrypt = _encrypt,
-                       .equals = public_key_equals,
-                       .get_keysize = _get_keysize,
-                       .get_fingerprint = _get_fingerprint,
-                       .has_fingerprint = public_key_has_fingerprint,
-                       .get_encoding = _get_encoding,
-                       .get_ref = _get_ref,
-                       .destroy = _destroy,
+               .public = {
+                       .key = {
+                               .get_type = _get_type,
+                               .verify = _verify,
+                               .encrypt = _encrypt,
+                               .equals = public_key_equals,
+                               .get_keysize = _get_keysize,
+                               .get_fingerprint = _get_fingerprint,
+                               .has_fingerprint = public_key_has_fingerprint,
+                               .get_encoding = _get_encoding,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
                },
                .ref = 1,
        );
index b653880..20f2fa9 100644 (file)
@@ -124,13 +124,15 @@ openssl_sha1_prf_t *openssl_sha1_prf_create(pseudo_random_function_t algo)
        }
 
        INIT(this,
-               .public.prf = {
-                       .get_block_size = _get_block_size,
-                       .get_bytes = _get_bytes,
-                       .allocate_bytes = _allocate_bytes,
-                       .get_key_size = _get_key_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .prf = {
+                               .get_block_size = _get_block_size,
+                               .get_bytes = _get_bytes,
+                               .allocate_bytes = _allocate_bytes,
+                               .get_key_size = _get_key_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
        );
 
index bbeef54..06c2029 100644 (file)
@@ -177,14 +177,16 @@ padlock_aes_crypter_t *padlock_aes_crypter_create(encryption_algorithm_t algo,
        }
 
        INIT(this,
-               .public.crypter = {
-                       .encrypt = _encrypt,
-                       .decrypt = _decrypt,
-                       .get_block_size = _get_block_size,
-                       .get_iv_size = _get_iv_size,
-                       .get_key_size = _get_key_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .crypter = {
+                               .encrypt = _encrypt,
+                               .decrypt = _decrypt,
+                               .get_block_size = _get_block_size,
+                               .get_iv_size = _get_iv_size,
+                               .get_key_size = _get_key_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
                .key = chunk_alloc(key_size),
        );
index d846108..027c53c 100644 (file)
@@ -134,7 +134,11 @@ plugin_t *padlock_plugin_create()
        private_padlock_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
                .features = get_padlock_features(),
        );
 
index 2f26a3a..3d805df 100644 (file)
@@ -104,10 +104,12 @@ padlock_rng_t *padlock_rng_create(rng_quality_t quality)
        private_padlock_rng_t *this;
 
        INIT(this,
-               .public.rng = {
-                       .get_bytes = _get_bytes,
-                       .allocate_bytes = _allocate_bytes,
-                       .destroy = _destroy,
+               .public = {
+                       .rng = {
+                               .get_bytes = _get_bytes,
+                               .allocate_bytes = _allocate_bytes,
+                               .destroy = _destroy,
+                       },
                },
        );
 
index ed331d9..66a0773 100644 (file)
@@ -150,12 +150,14 @@ padlock_sha1_hasher_t *padlock_sha1_hasher_create(hash_algorithm_t algo)
                return NULL;
        }
        INIT(this,
-               .public.hasher = {
-                       .get_hash = _get_hash,
-                       .allocate_hash = _allocate_hash,
-                       .get_hash_size = _get_hash_size,
-                       .reset = _reset,
-                       .destroy = _destroy,
+               .public = {
+                       .hasher = {
+                               .get_hash = _get_hash,
+                               .allocate_hash = _allocate_hash,
+                               .get_hash_size = _get_hash_size,
+                               .reset = _reset,
+                               .destroy = _destroy,
+                       },
                },
        );
        return &this->public;
index d610836..6d327be 100644 (file)
@@ -300,12 +300,14 @@ pkcs11_hasher_t *pkcs11_hasher_create(hash_algorithm_t algo)
        private_pkcs11_hasher_t *this;
 
        INIT(this,
-               .public.hasher = {
-                       .get_hash_size = _get_hash_size,
-                       .reset = _reset,
-                       .get_hash = _get_hash,
-                       .allocate_hash = _allocate_hash,
-                       .destroy = _destroy,
+               .public = {
+                       .hasher = {
+                               .get_hash_size = _get_hash_size,
+                               .reset = _reset,
+                               .get_hash = _get_hash,
+                               .allocate_hash = _allocate_hash,
+                               .destroy = _destroy,
+                       },
                },
                .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
        );
index 5e527f4..86fce1b 100644 (file)
@@ -132,7 +132,11 @@ plugin_t *pkcs11_plugin_create()
        CK_SLOT_ID slot;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
                .creds = linked_list_create(),
                .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
        );
index e51d0aa..cabca3f 100644 (file)
@@ -531,19 +531,21 @@ pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args)
        }
 
        INIT(this,
-               .public.key = {
-                       .get_type = _get_type,
-                       .sign = _sign,
-                       .decrypt = _decrypt,
-                       .get_keysize = _get_keysize,
-                       .get_public_key = _get_public_key,
-                       .equals = private_key_equals,
-                       .belongs_to = private_key_belongs_to,
-                       .get_fingerprint = _get_fingerprint,
-                       .has_fingerprint = private_key_has_fingerprint,
-                       .get_encoding = _get_encoding,
-                       .get_ref = _get_ref,
-                       .destroy = _destroy,
+               .public = {
+                       .key = {
+                               .get_type = _get_type,
+                               .sign = _sign,
+                               .decrypt = _decrypt,
+                               .get_keysize = _get_keysize,
+                               .get_public_key = _get_public_key,
+                               .equals = private_key_equals,
+                               .belongs_to = private_key_belongs_to,
+                               .get_fingerprint = _get_fingerprint,
+                               .has_fingerprint = private_key_has_fingerprint,
+                               .get_encoding = _get_encoding,
+                               .get_ref = _get_ref,
+                               .destroy = _destroy,
+                       },
                },
                .ref = 1,
        );
index d352a95..02393b9 100644 (file)
@@ -52,7 +52,11 @@ plugin_t *revocation_plugin_create()
        private_revocation_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
                .validator = revocation_validator_create(),
        );
        lib->credmgr->add_validator(lib->credmgr, &this->validator->validator);
index 8c25a5e..88156f3 100644 (file)
@@ -50,7 +50,11 @@ plugin_t *xcbc_plugin_create()
        private_xcbc_plugin_t *this;
 
        INIT(this,
-               .public.plugin.destroy = _destroy,
+               .public = {
+                       .plugin = {
+                               .destroy = _destroy,
+                       },
+               },
        );
 
        lib->crypto->add_prf(lib->crypto, PRF_AES128_XCBC,
index 33a6c4b..ac9e1fd 100644 (file)
@@ -106,13 +106,15 @@ xcbc_prf_t *xcbc_prf_create(pseudo_random_function_t algo)
        }
 
        INIT(this,
-               .public.prf = {
-                       .get_bytes = _get_bytes,
-                       .allocate_bytes = _allocate_bytes,
-                       .get_block_size = _get_block_size,
-                       .get_key_size = _get_key_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .prf = {
+                               .get_bytes = _get_bytes,
+                               .allocate_bytes = _allocate_bytes,
+                               .get_block_size = _get_block_size,
+                               .get_key_size = _get_key_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
                .xcbc = xcbc,
        );
index ad7e2f4..ece5923 100644 (file)
@@ -144,14 +144,16 @@ xcbc_signer_t *xcbc_signer_create(integrity_algorithm_t algo)
        }
 
        INIT(this,
-               .public.signer = {
-                       .get_signature = _get_signature,
-                       .allocate_signature = _allocate_signature,
-                       .verify_signature = _verify_signature,
-                       .get_key_size = _get_key_size,
-                       .get_block_size = _get_block_size,
-                       .set_key = _set_key,
-                       .destroy = _destroy,
+               .public = {
+                       .signer = {
+                               .get_signature = _get_signature,
+                               .allocate_signature = _allocate_signature,
+                               .verify_signature = _verify_signature,
+                               .get_key_size = _get_key_size,
+                               .get_block_size = _get_block_size,
+                               .set_key = _set_key,
+                               .destroy = _destroy,
+                       },
                },
                .xcbc = xcbc,
                .block_size = min(trunc, xcbc->get_block_size(xcbc)),
index 79f97ae..01adc6c 100644 (file)
@@ -645,20 +645,21 @@ tls_peer_t *tls_peer_create(tls_t *tls, tls_crypto_t *crypto,
        private_tls_peer_t *this;
 
        INIT(this,
-               .public.handshake = {
-                       .process = _process,
-                       .build = _build,
-                       .cipherspec_changed = _cipherspec_changed,
-                       .change_cipherspec = _change_cipherspec,
-                       .finished = _finished,
-                       .destroy = _destroy,
+               .public = {
+                       .handshake = {
+                               .process = _process,
+                               .build = _build,
+                               .cipherspec_changed = _cipherspec_changed,
+                               .change_cipherspec = _change_cipherspec,
+                               .finished = _finished,
+                               .destroy = _destroy,
+                       },
                },
                .state = STATE_INIT,
                .tls = tls,
                .crypto = crypto,
                .peer = peer,
                .server = server,
-               .peer_auth_requested = FALSE,
                .peer_auth = auth_cfg_create(),
                .server_auth = auth_cfg_create(),
        );
index faaecb5..3303365 100644 (file)
@@ -635,13 +635,15 @@ tls_server_t *tls_server_create(tls_t *tls, tls_crypto_t *crypto,
        private_tls_server_t *this;
 
        INIT(this,
-               .public.handshake = {
-                       .process = _process,
-                       .build = _build,
-                       .cipherspec_changed = _cipherspec_changed,
-                       .change_cipherspec = _change_cipherspec,
-                       .finished = _finished,
-                       .destroy = _destroy,
+               .public = {
+                       .handshake = {
+                               .process = _process,
+                               .build = _build,
+                               .cipherspec_changed = _cipherspec_changed,
+                               .change_cipherspec = _change_cipherspec,
+                               .finished = _finished,
+                               .destroy = _destroy,
+                       },
                },
                .tls = tls,
                .crypto = crypto,