Use a seperate section for each nested struct member in INIT macro

src/libcharon/network/receiver.c

@@ -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,
 	);

src/libcharon/plugins/addrblock/addrblock_plugin.c

@@ -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(),
 	);

src/libcharon/plugins/android/android_plugin.c

@@ -79,8 +79,10 @@ plugin_t *android_plugin_create()
 	private_android_plugin_t *this;
 
 	INIT(this,
-		.public.plugin = {
+		.public = {
-			.destroy = _destroy,
+			.plugin = {
+				.destroy = _destroy,
+			},
 		},
 		.logger = android_logger_create(),
 		.handler = android_handler_create(),

src/libcharon/plugins/dhcp/dhcp_plugin.c

@@ -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(),
 	);
 

src/libcharon/plugins/eap_identity/eap_identity.c

@@ -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 = {
+		.public = {
-			.initiate = _initiate_server,
+			.eap_method = {
-			.process = _process_server,
+				.initiate = _initiate_server,
-			.get_type = _get_type,
+				.process = _process_server,
-			.is_mutual = _is_mutual,
+				.get_type = _get_type,
-			.get_msk = _get_msk,
+				.is_mutual = _is_mutual,
-			.destroy = _destroy,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		.peer = peer->clone(peer),
 		.identity = chunk_empty,

src/libcharon/plugins/eap_identity/eap_identity.h

@@ -33,7 +33,7 @@ struct eap_identity_t {
 	/**
 	 * Implemented eap_method_t interface.
 	 */
-	eap_method_t eap_method_interface;
+	eap_method_t eap_method;
 };
 
 /**

src/libcharon/plugins/eap_md5/eap_md5.c

@@ -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 = {
+		.public = {
-			.initiate = _initiate_peer,
+			.eap_method = {
-			.process = _process_peer,
+				.initiate = _initiate_peer,
-			.get_type = _get_type,
+				.process = _process_peer,
-			.is_mutual = _is_mutual,
+				.get_type = _get_type,
-			.get_msk = _get_msk,
+				.is_mutual = _is_mutual,
-			.destroy = _destroy,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		.peer = peer->clone(peer),
 		.server = server->clone(server),
-		.challenge = chunk_empty,
-		.identifier = 0,
 	);
 
 	return &this->public;

src/libcharon/plugins/eap_md5/eap_md5.h

@@ -33,7 +33,7 @@ struct eap_md5_t {
 	/**
 	 * Implemented eap_method_t interface.
 	 */
-	eap_method_t eap_method_interface;
+	eap_method_t eap_method;
 };
 
 /**

src/libcharon/plugins/eap_radius/eap_radius.c

@@ -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 = {
+		.public = {
-			.initiate = _initiate,
+			.eap_method = {
-			.process = _process,
+				.initiate = _initiate,
-			.get_type = _get_type,
+				.process = _process,
-			.is_mutual = _is_mutual,
+				.get_type = _get_type,
-			.get_msk = _get_msk,
+				.is_mutual = _is_mutual,
-			.destroy = _destroy,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		/* initially EAP_RADIUS, but is set to the method selected by RADIUS */
 		.type = EAP_RADIUS,

src/libcharon/plugins/eap_radius/eap_radius.h

@@ -33,7 +33,7 @@ struct eap_radius_t {
 	/**
 	 * Implemented eap_method_t interface.
 	 */
-	eap_method_t eap_method_interface;
+	eap_method_t eap_method;
 };
 
 /**

src/libcharon/plugins/eap_radius/eap_radius_plugin.c

@@ -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(),
 	);
 

src/libcharon/plugins/eap_simaka_sql/eap_simaka_sql_plugin.c

@@ -85,8 +85,10 @@ plugin_t *eap_simaka_sql_plugin_create()
 							"charon.plugins.eap-simaka-sql.remove_used", FALSE);
 
 	INIT(this,
-		.public.plugin =  {
+		.public = {
-			.destroy = _destroy,
+			.plugin = {
+				.destroy = _destroy,
+			},
 		},
 		.db = db,
 		.provider = eap_simaka_sql_provider_create(db, remove_used),

src/libcharon/plugins/eap_tls/eap_tls.c

@@ -422,13 +422,15 @@ static eap_tls_t *eap_tls_create(identification_t *server,
 	private_eap_tls_t *this;
 
 	INIT(this,
-		.public.eap_method = {
+		.public = {
-			.initiate = _initiate,
+			.eap_method = {
-			.process = _process,
+				.initiate = _initiate,
-			.get_type = _get_type,
+				.process = _process,
-			.is_mutual = _is_mutual,
+				.get_type = _get_type,
-			.get_msk = _get_msk,
+				.is_mutual = _is_mutual,
-			.destroy = _destroy,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		.is_server = is_server,
 	);

src/libcharon/plugins/eap_tls/eap_tls_plugin.c

@@ -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,

src/libcharon/plugins/eap_ttls/eap_ttls.c

@@ -431,13 +431,15 @@ static eap_ttls_t *eap_ttls_create(identification_t *server,
 	private_eap_ttls_t *this;
 
 	INIT(this,
-		.public.eap_method = {
+		.public = {
-			.initiate = _initiate,
+			.eap_method = {
-			.process = _process,
+				.initiate = _initiate,
-			.get_type = _get_type,
+				.process = _process,
-			.is_mutual = _is_mutual,
+				.get_type = _get_type,
-			.get_msk = _get_msk,
+				.is_mutual = _is_mutual,
-			.destroy = _destroy,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		.is_server = is_server,
 	);

src/libcharon/plugins/eap_ttls/eap_ttls_peer.c

@@ -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 = {
+		.public = {
-			.process = _process,
+			.application = {
-			.build = _build,
+				.process = _process,
-			.destroy = _destroy,
+				.build = _build,
+				.destroy = _destroy,
+			},
 		},
 		.server = server->clone(server),
 		.peer = peer->clone(peer),
 		.start_phase2 = TRUE,
-		.method = NULL,
-		.out = NULL,
 		.avp = eap_ttls_avp_create(),
 	);
 

src/libcharon/plugins/eap_ttls/eap_ttls_plugin.c

@@ -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,

src/libcharon/plugins/eap_ttls/eap_ttls_server.c

@@ -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 = {
+		.public = {
-			.process = _process,
+			.application = {
-			.build = _build,
+				.process = _process,
-			.destroy = _destroy,
+				.build = _build,
+				.destroy = _destroy,
+			},
 		},
 		.server = server->clone(server),
 		.peer = peer->clone(peer),
 		.start_phase2 = TRUE,
-		.method = NULL,
-		.out = NULL,
 		.avp = eap_ttls_avp_create(),
 	);
 

src/libcharon/plugins/farp/farp_plugin.c

@@ -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(),
 	);
 

src/libcharon/plugins/ha/ha_plugin.c

@@ -142,7 +142,11 @@ plugin_t *ha_plugin_create()
 	}
 
 	INIT(this,
-		.public.plugin.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
 	);
 
 	if (secret)

src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c

@@ -2598,18 +2598,20 @@ kernel_klips_ipsec_t *kernel_klips_ipsec_create()
 	private_kernel_klips_ipsec_t *this;
 
 	INIT(this,
-		.public.interface = {
+		.public = {
-			.get_spi = _get_spi,
+			.interface = {
-			.get_cpi = _get_cpi,
+				.get_spi = _get_spi,
-			.add_sa  = _add_sa,
+				.get_cpi = _get_cpi,
-			.update_sa = _update_sa,
+				.add_sa  = _add_sa,
-			.query_sa = _query_sa,
+				.update_sa = _update_sa,
-			.del_sa = _del_sa,
+				.query_sa = _query_sa,
-			.add_policy = _add_policy,
+				.del_sa = _del_sa,
-			.query_policy = _query_policy,
+				.add_policy = _add_policy,
-			.del_policy = _del_policy,
+				.query_policy = _query_policy,
-			.bypass_socket = _bypass_socket,
+				.del_policy = _del_policy,
-			.destroy = _destroy,
+				.bypass_socket = _bypass_socket,
+				.destroy = _destroy,
+			},
 		},
 		.policies = linked_list_create(),
 		.allocated_spis = linked_list_create(),

src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c

@@ -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 = {
+		.public = {
-			.get_spi = _get_spi,
+			.interface = {
-			.get_cpi = _get_cpi,
+				.get_spi = _get_spi,
-			.add_sa  = _add_sa,
+				.get_cpi = _get_cpi,
-			.update_sa = _update_sa,
+				.add_sa  = _add_sa,
-			.query_sa = _query_sa,
+				.update_sa = _update_sa,
-			.del_sa = _del_sa,
+				.query_sa = _query_sa,
-			.add_policy = _add_policy,
+				.del_sa = _del_sa,
-			.query_policy = _query_policy,
+				.add_policy = _add_policy,
-			.del_policy = _del_policy,
+				.query_policy = _query_policy,
-			.bypass_socket = _bypass_socket,
+				.del_policy = _del_policy,
-			.destroy = _destroy,
+				.bypass_socket = _bypass_socket,
+				.destroy = _destroy,
+			},
 		},
 		.policies = hashtable_create((hashtable_hash_t)policy_hash,
 									 (hashtable_equals_t)policy_equals, 32),

src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c

@@ -2154,18 +2154,20 @@ kernel_pfkey_ipsec_t *kernel_pfkey_ipsec_create()
 	private_kernel_pfkey_ipsec_t *this;
 
 	INIT(this,
-		.public.interface = {
+		.public = {
-			.get_spi = _get_spi,
+			.interface = {
-			.get_cpi = _get_cpi,
+				.get_spi = _get_spi,
-			.add_sa  = _add_sa,
+				.get_cpi = _get_cpi,
-			.update_sa = _update_sa,
+				.add_sa  = _add_sa,
-			.query_sa = _query_sa,
+				.update_sa = _update_sa,
-			.del_sa = _del_sa,
+				.query_sa = _query_sa,
-			.add_policy = _add_policy,
+				.del_sa = _del_sa,
-			.query_policy = _query_policy,
+				.add_policy = _add_policy,
-			.del_policy = _del_policy,
+				.query_policy = _query_policy,
-			.bypass_socket = _bypass_socket,
+				.del_policy = _del_policy,
-			.destroy = _destroy,
+				.bypass_socket = _bypass_socket,
+				.destroy = _destroy,
+			},
 		},
 		.policies = linked_list_create(),
 		.mutex = mutex_create(MUTEX_TYPE_DEFAULT),

src/libcharon/plugins/socket_default/socket_default_plugin.c

@@ -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(),
 	);
 

src/libcharon/plugins/socket_dynamic/socket_dynamic_plugin.c

@@ -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(),
 	);
 

src/libcharon/plugins/socket_raw/socket_raw_plugin.c

@@ -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(),
 	);
 

src/libcharon/processing/jobs/inactivity_job.c

@@ -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 = {
+		.public = {
-			.execute = _execute,
+				.job_interface = {
-			.destroy = _destroy,
+				.execute = _execute,
+				.destroy = _destroy,
+			},
 		},
 		.reqid = reqid,
 		.timeout = timeout,

src/libcharon/sa/authenticators/eap_authenticator.c

@@ -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 = {
+		.public = {
-			.build = _build_server,
+			.authenticator = {
-			.process = _process_server,
+				.build = _build_server,
-			.is_mutual = _is_mutual,
+				.process = _process_server,
-			.destroy = _destroy,
+				.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;

src/libcharon/sa/tasks/ike_vendor.c

@@ -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 = {
+		.public = {
-			.build = _build,
+			.task = {
-			.process = _process,
+				.build = _build,
-			.migrate = _migrate,
+				.process = _process,
-			.get_type = _get_type,
+				.migrate = _migrate,
-			.destroy = _destroy,
+				.get_type = _get_type,
+				.destroy = _destroy,
+			},
 		},
 		.initiator = initiator,
 		.ike_sa = ike_sa,

src/libstrongswan/plugins/aes/aes_crypter.c

@@ -1550,18 +1550,20 @@ aes_crypter_t *aes_crypter_create(encryption_algorithm_t algo, size_t key_size)
 	#endif
 
 	INIT(this,
-		.public.crypter = {
+		.public = {
-			.encrypt = _encrypt,
+			.crypter = {
-			.decrypt = _decrypt,
+				.encrypt = _encrypt,
-			.get_block_size = _get_block_size,
+				.decrypt = _decrypt,
-			.get_iv_size = _get_iv_size,
+				.get_block_size = _get_block_size,
-			.get_key_size = _get_key_size,
+				.get_iv_size = _get_iv_size,
-			.set_key = _set_key,
+				.get_key_size = _get_key_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 		.key_size = key_size,
 		.aes_Nkey = key_size / 4,
 	);
 
-	return &(this->public);
+	return &this->public;
 }

src/libstrongswan/plugins/aes/aes_plugin.c

@@ -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,

src/libstrongswan/plugins/agent/agent_plugin.c

@@ -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,

src/libstrongswan/plugins/agent/agent_private_key.c

@@ -402,19 +402,21 @@ agent_private_key_t *agent_private_key_open(key_type_t type, va_list args)
 	}
 
 	INIT(this,
-		.public.key = {
+		.public = {
-			.get_type = _get_type,
+			.key = {
-			.sign = _sign,
+				.get_type = _get_type,
-			.decrypt = _decrypt,
+				.sign = _sign,
-			.get_keysize = _get_keysize,
+				.decrypt = _decrypt,
-			.get_public_key = _get_public_key,
+				.get_keysize = _get_keysize,
-			.belongs_to = private_key_belongs_to,
+				.get_public_key = _get_public_key,
-			.equals = private_key_equals,
+				.belongs_to = private_key_belongs_to,
-			.get_fingerprint = _get_fingerprint,
+				.equals = private_key_equals,
-			.has_fingerprint = private_key_has_fingerprint,
+				.get_fingerprint = _get_fingerprint,
-			.get_encoding = _get_encoding,
+				.has_fingerprint = private_key_has_fingerprint,
-			.get_ref = _get_ref,
+				.get_encoding = _get_encoding,
-			.destroy = _destroy,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
 		},
 		.ref = 1,
 	);

src/libstrongswan/plugins/blowfish/blowfish_crypter.c

@@ -177,14 +177,16 @@ blowfish_crypter_t *blowfish_crypter_create(encryption_algorithm_t algo,
 	}
 
 	INIT(this,
-		.public.crypter = {
+		.public = {
-			.encrypt = _encrypt,
+			.crypter = {
-			.decrypt = _decrypt,
+				.encrypt = _encrypt,
-			.get_block_size = _get_block_size,
+				.decrypt = _decrypt,
-			.get_iv_size = _get_iv_size,
+				.get_block_size = _get_block_size,
-			.get_key_size = _get_key_size,
+				.get_iv_size = _get_iv_size,
-			.set_key = _set_key,
+				.get_key_size = _get_key_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 		.key_size = key_size ?: 16,
 	);

src/libstrongswan/plugins/blowfish/blowfish_plugin.c

@@ -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,

src/libstrongswan/plugins/ctr/ctr_ipsec_crypter.c

@@ -149,14 +149,16 @@ ctr_ipsec_crypter_t *ctr_ipsec_crypter_create(encryption_algorithm_t algo,
 	}
 
 	INIT(this,
-		.public.crypter = {
+		.public = {
-			.encrypt = _crypt,
+			.crypter = {
-			.decrypt = _crypt,
+				.encrypt = _crypt,
-			.get_block_size = _get_block_size,
+				.decrypt = _crypt,
-			.get_iv_size = _get_iv_size,
+				.get_block_size = _get_block_size,
-			.get_key_size = _get_key_size,
+				.get_iv_size = _get_iv_size,
-			.set_key = _set_key,
+				.get_key_size = _get_key_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 		.crypter = lib->crypto->create_crypter(lib->crypto, algo, key_size),
 	);

src/libstrongswan/plugins/ctr/ctr_plugin.c

@@ -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,

src/libstrongswan/plugins/curl/curl_fetcher.c

@@ -166,10 +166,12 @@ curl_fetcher_t *curl_fetcher_create()
 	private_curl_fetcher_t *this;
 
 	INIT(this,
-		.public.interface = {
+		.public = {
-			.fetch = _fetch,
+			.interface = {
-			.set_option = _set_option,
+				.fetch = _fetch,
-			.destroy = _destroy,
+				.set_option = _set_option,
+				.destroy = _destroy,
+			},
 		},
 		.curl = curl_easy_init(),
 	);

src/libstrongswan/plugins/des/des_crypter.c

@@ -1563,11 +1563,13 @@ des_crypter_t *des_crypter_create(encryption_algorithm_t algo)
 	private_des_crypter_t *this;
 
 	INIT(this,
-		.public.crypter = {
+		.public = {
-			.get_block_size = _get_block_size,
+			.crypter = {
-			.get_iv_size = _get_iv_size,
+				.get_block_size = _get_block_size,
-			.get_key_size = _get_key_size,
+				.get_iv_size = _get_iv_size,
-			.destroy = _destroy,
+				.get_key_size = _get_key_size,
+				.destroy = _destroy,
+			},
 		},
 	);
 

src/libstrongswan/plugins/des/des_plugin.c

@@ -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,

src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c

@@ -278,14 +278,16 @@ gcrypt_crypter_t *gcrypt_crypter_create(encryption_algorithm_t algo,
 	}
 
 	INIT(this,
-		.public.crypter = {
+		.public = {
-			.encrypt = _encrypt,
+			.crypter = {
-			.decrypt = _decrypt,
+				.encrypt = _encrypt,
-			.get_block_size = _get_block_size,
+				.decrypt = _decrypt,
-			.get_iv_size = _get_iv_size,
+				.get_block_size = _get_block_size,
-			.get_key_size = _get_key_size,
+				.get_iv_size = _get_iv_size,
-			.set_key = _set_key,
+				.get_key_size = _get_key_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 		.alg = gcrypt_alg,
 		.ctr_mode = mode == GCRY_CIPHER_MODE_CTR,

src/libstrongswan/plugins/gcrypt/gcrypt_dh.c

@@ -185,12 +185,14 @@ gcrypt_dh_t *gcrypt_dh_create(diffie_hellman_group_t group)
 	}
 
 	INIT(this,
-		.public.dh = {
+		.public = {
-			.get_shared_secret = _get_shared_secret,
+			.dh = {
-			.set_other_public_value = _set_other_public_value,
+				.get_shared_secret = _get_shared_secret,
-			.get_my_public_value = _get_my_public_value,
+				.set_other_public_value = _set_other_public_value,
-			.get_dh_group = _get_dh_group,
+				.get_my_public_value = _get_my_public_value,
-			.destroy = _destroy,
+				.get_dh_group = _get_dh_group,
+				.destroy = _destroy,
+			},
 		},
 		.group = group,
 		.p_len = params->prime.len,

src/libstrongswan/plugins/gcrypt/gcrypt_hasher.c

@@ -121,12 +121,14 @@ gcrypt_hasher_t *gcrypt_hasher_create(hash_algorithm_t algo)
 	}
 
 	INIT(this,
-		.public.hasher = {
+		.public = {
-			.get_hash = _get_hash,
+			.hasher = {
-			.allocate_hash = _allocate_hash,
+				.get_hash = _get_hash,
-			.get_hash_size = _get_hash_size,
+				.allocate_hash = _allocate_hash,
-			.reset = _reset,
+				.get_hash_size = _get_hash_size,
-			.destroy = _destroy,
+				.reset = _reset,
+				.destroy = _destroy,
+			},
 		},
 	);
 

src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c

@@ -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 */

src/libstrongswan/plugins/gcrypt/gcrypt_rng.c

@@ -83,10 +83,12 @@ gcrypt_rng_t *gcrypt_rng_create(rng_quality_t quality)
 	}
 
 	INIT(this,
-		.public.rng = {
+		.public = {
-			.get_bytes = _get_bytes,
+			.rng = {
-			.allocate_bytes = _allocate_bytes,
+				.get_bytes = _get_bytes,
-			.destroy = _destroy,
+				.allocate_bytes = _allocate_bytes,
+				.destroy = _destroy,
+			},
 		},
 		.quality = quality,
 	);

src/libstrongswan/plugins/gcrypt/gcrypt_rsa_private_key.c

@@ -427,19 +427,21 @@ static private_gcrypt_rsa_private_key_t *create_empty()
 	private_gcrypt_rsa_private_key_t *this;
 
 	INIT(this,
-		.public.key = {
+		.public = {
-			.get_type = _get_type,
+			.key = {
-			.sign = _sign,
+				.get_type = _get_type,
-			.decrypt = _decrypt,
+				.sign = _sign,
-			.get_keysize = _get_keysize,
+				.decrypt = _decrypt,
-			.get_public_key = _get_public_key,
+				.get_keysize = _get_keysize,
-			.equals = private_key_equals,
+				.get_public_key = _get_public_key,
-			.belongs_to = private_key_belongs_to,
+				.equals = private_key_equals,
-			.get_fingerprint = _get_fingerprint,
+				.belongs_to = private_key_belongs_to,
-			.has_fingerprint = private_key_has_fingerprint,
+				.get_fingerprint = _get_fingerprint,
-			.get_encoding = _get_encoding,
+				.has_fingerprint = private_key_has_fingerprint,
-			.get_ref = _get_ref,
+				.get_encoding = _get_encoding,
-			.destroy = _destroy,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
 		},
 		.ref = 1,
 	);

src/libstrongswan/plugins/gcrypt/gcrypt_rsa_public_key.c

@@ -322,17 +322,19 @@ gcrypt_rsa_public_key_t *gcrypt_rsa_public_key_load(key_type_t type,
 	}
 
 	INIT(this,
-		.public.key = {
+		.public = {
-			.get_type = _get_type,
+			.key = {
-			.verify = _verify,
+				.get_type = _get_type,
-			.encrypt = _encrypt_,
+				.verify = _verify,
-			.equals = public_key_equals,
+				.encrypt = _encrypt_,
-			.get_keysize = _get_keysize,
+				.equals = public_key_equals,
-			.get_fingerprint = _get_fingerprint,
+				.get_keysize = _get_keysize,
-			.has_fingerprint = public_key_has_fingerprint,
+				.get_fingerprint = _get_fingerprint,
-			.get_encoding = _get_encoding,
+				.has_fingerprint = public_key_has_fingerprint,
-			.get_ref = _get_ref,
+				.get_encoding = _get_encoding,
-			.destroy = _destroy,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
 		},
 		.ref = 1,
 	);

src/libstrongswan/plugins/gmp/gmp_diffie_hellman.c

@@ -206,12 +206,14 @@ gmp_diffie_hellman_t *gmp_diffie_hellman_create(diffie_hellman_group_t group)
 	}
 
 	INIT(this,
-		.public.dh = {
+		.public = {
-			.get_shared_secret = _get_shared_secret,
+			.dh = {
-			.set_other_public_value = _set_other_public_value,
+				.get_shared_secret = _get_shared_secret,
-			.get_my_public_value = _get_my_public_value,
+				.set_other_public_value = _set_other_public_value,
-			.get_dh_group = _get_dh_group,
+				.get_my_public_value = _get_my_public_value,
-			.destroy = _destroy,
+				.get_dh_group = _get_dh_group,
+				.destroy = _destroy,
+			},
 		},
 		.group = group,
 		.p_len = params->prime.len,

src/libstrongswan/plugins/gmp/gmp_plugin.c

@@ -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,

src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c

@@ -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 = {
+		.public = {
-			.get_type = _get_type,
+			.key = {
-			.sign = _sign,
+				.get_type = _get_type,
-			.decrypt = _decrypt,
+				.sign = _sign,
-			.get_keysize = _get_keysize,
+				.decrypt = _decrypt,
-			.get_public_key = _get_public_key,
+				.get_keysize = _get_keysize,
-			.equals = private_key_equals,
+				.get_public_key = _get_public_key,
-			.belongs_to = private_key_belongs_to,
+				.equals = private_key_equals,
-			.get_fingerprint = _get_fingerprint,
+				.belongs_to = private_key_belongs_to,
-			.has_fingerprint = private_key_has_fingerprint,
+				.get_fingerprint = _get_fingerprint,
-			.get_encoding = _get_encoding,
+				.has_fingerprint = private_key_has_fingerprint,
-			.get_ref = _get_ref,
+				.get_encoding = _get_encoding,
-			.destroy = _destroy,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
 		},
 		.ref = 1,
 	);

src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c

@@ -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 = {
+		.public = {
-			.get_type = _get_type,
+			.key = {
-			.verify = _verify,
+				.get_type = _get_type,
-			.encrypt = _encrypt_,
+				.verify = _verify,
-			.equals = public_key_equals,
+				.encrypt = _encrypt_,
-			.get_keysize = _get_keysize,
+				.equals = public_key_equals,
-			.get_fingerprint = _get_fingerprint,
+				.get_keysize = _get_keysize,
-			.has_fingerprint = public_key_has_fingerprint,
+				.get_fingerprint = _get_fingerprint,
-			.get_encoding = _get_encoding,
+				.has_fingerprint = public_key_has_fingerprint,
-			.get_ref = _get_ref,
+				.get_encoding = _get_encoding,
-			.destroy = _destroy,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
 		},
 		.ref = 1,
 	);

src/libstrongswan/plugins/hmac/hmac_plugin.c

@@ -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,

src/libstrongswan/plugins/hmac/hmac_prf.c

@@ -108,13 +108,15 @@ hmac_prf_t *hmac_prf_create(pseudo_random_function_t algo)
 	}
 
 	INIT(this,
-		.public.prf = {
+		.public = {
-			.get_bytes = _get_bytes,
+			.prf = {
-			.allocate_bytes = _allocate_bytes,
+				.get_bytes = _get_bytes,
-			.get_block_size = _get_block_size,
+				.allocate_bytes = _allocate_bytes,
-			.get_key_size = _get_key_size,
+				.get_block_size = _get_block_size,
-			.set_key = _set_key,
+				.get_key_size = _get_key_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 		.hmac = hmac,
 	);

src/libstrongswan/plugins/hmac/hmac_signer.c

@@ -172,14 +172,16 @@ hmac_signer_t *hmac_signer_create(integrity_algorithm_t algo)
 	}
 
 	INIT(this,
-		.public.signer = {
+		.public = {
-			.get_signature = _get_signature,
+			.signer = {
-			.allocate_signature = _allocate_signature,
+				.get_signature = _get_signature,
-			.verify_signature = _verify_signature,
+				.allocate_signature = _allocate_signature,
-			.get_key_size = _get_key_size,
+				.verify_signature = _verify_signature,
-			.get_block_size = _get_block_size,
+				.get_key_size = _get_key_size,
-			.set_key = _set_key,
+				.get_block_size = _get_block_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 		.block_size = min(trunc, hmac->get_block_size(hmac)),
 		.hmac = hmac,

src/libstrongswan/plugins/openssl/openssl_crypter.c

@@ -165,14 +165,16 @@ openssl_crypter_t *openssl_crypter_create(encryption_algorithm_t algo,
 	private_openssl_crypter_t *this;
 
 	INIT(this,
-		.public.crypter = {
+		.public = {
-			.encrypt = _encrypt,
+			.crypter = {
-			.decrypt = _decrypt,
+				.encrypt = _encrypt,
-			.get_block_size = _get_block_size,
+				.decrypt = _decrypt,
-			.get_iv_size = _get_iv_size,
+				.get_block_size = _get_block_size,
-			.get_key_size = _get_key_size,
+				.get_iv_size = _get_iv_size,
-			.set_key = _set_key,
+				.get_key_size = _get_key_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 	);
 

src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c

@@ -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 = {
+		.public = {
-			.get_shared_secret = _get_shared_secret,
+			.dh = {
-			.set_other_public_value = _set_other_public_value,
+				.get_shared_secret = _get_shared_secret,
-			.get_my_public_value = _get_my_public_value,
+				.set_other_public_value = _set_other_public_value,
-			.get_dh_group = _get_dh_group,
+				.get_my_public_value = _get_my_public_value,
-			.destroy = _destroy,
+				.get_dh_group = _get_dh_group,
+				.destroy = _destroy,
+			},
 		},
 	);
 

src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c

@@ -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 = {
+		.public = {
-			.get_shared_secret = _get_shared_secret,
+			.dh = {
-			.set_other_public_value = _set_other_public_value,
+				.get_shared_secret = _get_shared_secret,
-			.get_my_public_value = _get_my_public_value,
+				.set_other_public_value = _set_other_public_value,
-			.get_dh_group = _get_dh_group,
+				.get_my_public_value = _get_my_public_value,
-			.destroy = _destroy,
+				.get_dh_group = _get_dh_group,
+				.destroy = _destroy,
+			},
 		},
 		.group = group,
 	);

src/libstrongswan/plugins/openssl/openssl_ec_private_key.c

@@ -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 = {
+		.public = {
-			.get_type = _get_type,
+			.key = {
-			.sign = _sign,
+				.get_type = _get_type,
-			.decrypt = _decrypt,
+				.sign = _sign,
-			.get_keysize = _get_keysize,
+				.decrypt = _decrypt,
-			.get_public_key = _get_public_key,
+				.get_keysize = _get_keysize,
-			.equals = private_key_equals,
+				.get_public_key = _get_public_key,
-			.belongs_to = private_key_belongs_to,
+				.equals = private_key_equals,
-			.get_fingerprint = _get_fingerprint,
+				.belongs_to = private_key_belongs_to,
-			.has_fingerprint = private_key_has_fingerprint,
+				.get_fingerprint = _get_fingerprint,
-			.get_encoding = _get_encoding,
+				.has_fingerprint = private_key_has_fingerprint,
-			.get_ref = _get_ref,
+				.get_encoding = _get_encoding,
-			.destroy = _destroy,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
 		},
 		.ref = 1,
 	);

src/libstrongswan/plugins/openssl/openssl_ec_public_key.c

@@ -303,17 +303,19 @@ static private_openssl_ec_public_key_t *create_empty()
 	private_openssl_ec_public_key_t *this;
 
 	INIT(this,
-		.public.key = {
+		.public = {
-			.get_type = _get_type,
+			.key = {
-			.verify = _verify,
+				.get_type = _get_type,
-			.encrypt = _encrypt,
+				.verify = _verify,
-			.get_keysize = _get_keysize,
+				.encrypt = _encrypt,
-			.equals = public_key_equals,
+				.get_keysize = _get_keysize,
-			.get_fingerprint = _get_fingerprint,
+				.equals = public_key_equals,
-			.has_fingerprint = public_key_has_fingerprint,
+				.get_fingerprint = _get_fingerprint,
-			.get_encoding = _get_encoding,
+				.has_fingerprint = public_key_has_fingerprint,
-			.get_ref = _get_ref,
+				.get_encoding = _get_encoding,
-			.destroy = _destroy,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
 		},
 		.ref = 1,
 	);

src/libstrongswan/plugins/openssl/openssl_hasher.c

@@ -149,12 +149,14 @@ openssl_hasher_t *openssl_hasher_create(hash_algorithm_t algo)
 	}
 
 	INIT(this,
-		.public.hasher = {
+		.public = {
-			.get_hash = _get_hash,
+			.hasher = {
-			.allocate_hash = _allocate_hash,
+				.get_hash = _get_hash,
-			.get_hash_size = _get_hash_size,
+				.allocate_hash = _allocate_hash,
-			.reset = _reset,
+				.get_hash_size = _get_hash_size,
-			.destroy = _destroy,
+				.reset = _reset,
+				.destroy = _destroy,
+			},
 		},
 	);
 

src/libstrongswan/plugins/openssl/openssl_plugin.c

@@ -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();

src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c

@@ -293,19 +293,21 @@ static private_openssl_rsa_private_key_t *create_empty()
 	private_openssl_rsa_private_key_t *this;
 
 	INIT(this,
-		.public.key = {
+		.public = {
-			.get_type = _get_type,
+			.key = {
-			.sign = _sign,
+				.get_type = _get_type,
-			.decrypt = _decrypt,
+				.sign = _sign,
-			.get_keysize = _get_keysize,
+				.decrypt = _decrypt,
-			.get_public_key = _get_public_key,
+				.get_keysize = _get_keysize,
-			.equals = private_key_equals,
+				.get_public_key = _get_public_key,
-			.belongs_to = private_key_belongs_to,
+				.equals = private_key_equals,
-			.get_fingerprint = _get_fingerprint,
+				.belongs_to = private_key_belongs_to,
-			.has_fingerprint = private_key_has_fingerprint,
+				.get_fingerprint = _get_fingerprint,
-			.get_encoding = _get_encoding,
+				.has_fingerprint = private_key_has_fingerprint,
-			.get_ref = _get_ref,
+				.get_encoding = _get_encoding,
-			.destroy = _destroy,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
 		},
 		.ref = 1,
 	);

src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c

@@ -304,17 +304,19 @@ static private_openssl_rsa_public_key_t *create_empty()
 	private_openssl_rsa_public_key_t *this;
 
 	INIT(this,
-		.public.key = {
+		.public = {
-			.get_type = _get_type,
+			.key = {
-			.verify = _verify,
+				.get_type = _get_type,
-			.encrypt = _encrypt,
+				.verify = _verify,
-			.equals = public_key_equals,
+				.encrypt = _encrypt,
-			.get_keysize = _get_keysize,
+				.equals = public_key_equals,
-			.get_fingerprint = _get_fingerprint,
+				.get_keysize = _get_keysize,
-			.has_fingerprint = public_key_has_fingerprint,
+				.get_fingerprint = _get_fingerprint,
-			.get_encoding = _get_encoding,
+				.has_fingerprint = public_key_has_fingerprint,
-			.get_ref = _get_ref,
+				.get_encoding = _get_encoding,
-			.destroy = _destroy,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
 		},
 		.ref = 1,
 	);

src/libstrongswan/plugins/openssl/openssl_sha1_prf.c

@@ -124,13 +124,15 @@ openssl_sha1_prf_t *openssl_sha1_prf_create(pseudo_random_function_t algo)
 	}
 
 	INIT(this,
-		.public.prf = {
+		.public = {
-			.get_block_size = _get_block_size,
+			.prf = {
-			.get_bytes = _get_bytes,
+				.get_block_size = _get_block_size,
-			.allocate_bytes = _allocate_bytes,
+				.get_bytes = _get_bytes,
-			.get_key_size = _get_key_size,
+				.allocate_bytes = _allocate_bytes,
-			.set_key = _set_key,
+				.get_key_size = _get_key_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 	);
 

src/libstrongswan/plugins/padlock/padlock_aes_crypter.c

@@ -177,14 +177,16 @@ padlock_aes_crypter_t *padlock_aes_crypter_create(encryption_algorithm_t algo,
 	}
 
 	INIT(this,
-		.public.crypter = {
+		.public = {
-			.encrypt = _encrypt,
+			.crypter = {
-			.decrypt = _decrypt,
+				.encrypt = _encrypt,
-			.get_block_size = _get_block_size,
+				.decrypt = _decrypt,
-			.get_iv_size = _get_iv_size,
+				.get_block_size = _get_block_size,
-			.get_key_size = _get_key_size,
+				.get_iv_size = _get_iv_size,
-			.set_key = _set_key,
+				.get_key_size = _get_key_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 		.key = chunk_alloc(key_size),
 	);

src/libstrongswan/plugins/padlock/padlock_plugin.c

@@ -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(),
 	);
 

src/libstrongswan/plugins/padlock/padlock_rng.c

@@ -104,10 +104,12 @@ padlock_rng_t *padlock_rng_create(rng_quality_t quality)
 	private_padlock_rng_t *this;
 
 	INIT(this,
-		.public.rng = {
+		.public = {
-			.get_bytes = _get_bytes,
+			.rng = {
-			.allocate_bytes = _allocate_bytes,
+				.get_bytes = _get_bytes,
-			.destroy = _destroy,
+				.allocate_bytes = _allocate_bytes,
+				.destroy = _destroy,
+			},
 		},
 	);
 

src/libstrongswan/plugins/padlock/padlock_sha1_hasher.c

@@ -150,12 +150,14 @@ padlock_sha1_hasher_t *padlock_sha1_hasher_create(hash_algorithm_t algo)
 		return NULL;
 	}
 	INIT(this,
-		.public.hasher = {
+		.public = {
-			.get_hash = _get_hash,
+			.hasher = {
-			.allocate_hash = _allocate_hash,
+				.get_hash = _get_hash,
-			.get_hash_size = _get_hash_size,
+				.allocate_hash = _allocate_hash,
-			.reset = _reset,
+				.get_hash_size = _get_hash_size,
-			.destroy = _destroy,
+				.reset = _reset,
+				.destroy = _destroy,
+			},
 		},
 	);
 	return &this->public;

src/libstrongswan/plugins/pkcs11/pkcs11_hasher.c

@@ -300,12 +300,14 @@ pkcs11_hasher_t *pkcs11_hasher_create(hash_algorithm_t algo)
 	private_pkcs11_hasher_t *this;
 
 	INIT(this,
-		.public.hasher = {
+		.public = {
-			.get_hash_size = _get_hash_size,
+			.hasher = {
-			.reset = _reset,
+				.get_hash_size = _get_hash_size,
-			.get_hash = _get_hash,
+				.reset = _reset,
-			.allocate_hash = _allocate_hash,
+				.get_hash = _get_hash,
-			.destroy = _destroy,
+				.allocate_hash = _allocate_hash,
+				.destroy = _destroy,
+			},
 		},
 		.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
 	);

src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c

@@ -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),
 	);

src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c

@@ -531,19 +531,21 @@ pkcs11_private_key_t *pkcs11_private_key_connect(key_type_t type, va_list args)
 	}
 
 	INIT(this,
-		.public.key = {
+		.public = {
-			.get_type = _get_type,
+			.key = {
-			.sign = _sign,
+				.get_type = _get_type,
-			.decrypt = _decrypt,
+				.sign = _sign,
-			.get_keysize = _get_keysize,
+				.decrypt = _decrypt,
-			.get_public_key = _get_public_key,
+				.get_keysize = _get_keysize,
-			.equals = private_key_equals,
+				.get_public_key = _get_public_key,
-			.belongs_to = private_key_belongs_to,
+				.equals = private_key_equals,
-			.get_fingerprint = _get_fingerprint,
+				.belongs_to = private_key_belongs_to,
-			.has_fingerprint = private_key_has_fingerprint,
+				.get_fingerprint = _get_fingerprint,
-			.get_encoding = _get_encoding,
+				.has_fingerprint = private_key_has_fingerprint,
-			.get_ref = _get_ref,
+				.get_encoding = _get_encoding,
-			.destroy = _destroy,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
 		},
 		.ref = 1,
 	);

src/libstrongswan/plugins/revocation/revocation_plugin.c

@@ -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);

src/libstrongswan/plugins/xcbc/xcbc_plugin.c

@@ -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,

src/libstrongswan/plugins/xcbc/xcbc_prf.c

@@ -106,13 +106,15 @@ xcbc_prf_t *xcbc_prf_create(pseudo_random_function_t algo)
 	}
 
 	INIT(this,
-		.public.prf = {
+		.public = {
-			.get_bytes = _get_bytes,
+			.prf = {
-			.allocate_bytes = _allocate_bytes,
+				.get_bytes = _get_bytes,
-			.get_block_size = _get_block_size,
+				.allocate_bytes = _allocate_bytes,
-			.get_key_size = _get_key_size,
+				.get_block_size = _get_block_size,
-			.set_key = _set_key,
+				.get_key_size = _get_key_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 		.xcbc = xcbc,
 	);

src/libstrongswan/plugins/xcbc/xcbc_signer.c

@@ -144,14 +144,16 @@ xcbc_signer_t *xcbc_signer_create(integrity_algorithm_t algo)
 	}
 
 	INIT(this,
-		.public.signer = {
+		.public = {
-			.get_signature = _get_signature,
+			.signer = {
-			.allocate_signature = _allocate_signature,
+				.get_signature = _get_signature,
-			.verify_signature = _verify_signature,
+				.allocate_signature = _allocate_signature,
-			.get_key_size = _get_key_size,
+				.verify_signature = _verify_signature,
-			.get_block_size = _get_block_size,
+				.get_key_size = _get_key_size,
-			.set_key = _set_key,
+				.get_block_size = _get_block_size,
-			.destroy = _destroy,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
 		},
 		.xcbc = xcbc,
 		.block_size = min(trunc, xcbc->get_block_size(xcbc)),

src/libtls/tls_peer.c

@@ -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 = {
+		.public = {
-			.process = _process,
+			.handshake = {
-			.build = _build,
+				.process = _process,
-			.cipherspec_changed = _cipherspec_changed,
+				.build = _build,
-			.change_cipherspec = _change_cipherspec,
+				.cipherspec_changed = _cipherspec_changed,
-			.finished = _finished,
+				.change_cipherspec = _change_cipherspec,
-			.destroy = _destroy,
+				.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(),
 	);

src/libtls/tls_server.c

@@ -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 = {
+		.public = {
-			.process = _process,
+			.handshake = {
-			.build = _build,
+				.process = _process,
-			.cipherspec_changed = _cipherspec_changed,
+				.build = _build,
-			.change_cipherspec = _change_cipherspec,
+				.cipherspec_changed = _cipherspec_changed,
-			.finished = _finished,
+				.change_cipherspec = _change_cipherspec,
-			.destroy = _destroy,
+				.finished = _finished,
+				.destroy = _destroy,
+			},
 		},
 		.tls = tls,
 		.crypto = crypto,