coding style improvements

9 files changed, 60 insertions, 63 deletions

diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 7e675220..4cbc88c6 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -954,12 +954,13 @@ lasso_login_build_authn_response_msg(LassoLogin *login)
 
 	/* Countermeasure: The issuer should sign <lib:AuthnResponse> messages.
 	 * (binding and profiles (1.2errata2, page 65) */
-	if (profile->server->certificate)
+	if (profile->server->certificate) {
 		LASSO_SAMLP_RESPONSE_ABSTRACT(profile->response)->sign_type =
 			LASSO_SIGNATURE_TYPE_WITHX509;
-	else
+	} else {
 		LASSO_SAMLP_RESPONSE_ABSTRACT(profile->response)->sign_type =
 			LASSO_SIGNATURE_TYPE_SIMPLE;
+	}
 	LASSO_SAMLP_RESPONSE_ABSTRACT(profile->response)->sign_method =
 		LASSO_SIGNATURE_METHOD_RSA_SHA1;
 	LASSO_SAMLP_RESPONSE_ABSTRACT(profile->response)->private_key_file = 
diff --git a/lasso/id-wsf/authentication.c b/lasso/id-wsf/authentication.c
index 7db44ab1..84c83d49 100644
--- a/lasso/id-wsf/authentication.c
+++ b/lasso/id-wsf/authentication.c
@@ -214,8 +214,7 @@ lasso_authentication_init_request(LassoAuthentication *authentication,
 
 	if (description->Endpoint != NULL) {
 		LASSO_WSF_PROFILE(authentication)->msg_url = g_strdup(description->Endpoint);
-	}
-	else if (description->WsdlURI != NULL) {
+	} else if (description->WsdlURI != NULL) {
 
 	}
 
@@ -523,9 +522,8 @@ lasso_authentication_server_start(LassoAuthentication *authentication)
 				outbase64 = xmlSecBase64Encode(out, outlen, 0);
 				response->Data = g_list_append(response->Data, outbase64);
 			}
-		}
-		/* abort authentication */
-		else {
+		} else {
+			/* abort authentication */
 			response->Status->code = g_strdup(LASSO_SA_STATUS_CODE_ABORT);
 		}
 	}
@@ -583,9 +581,8 @@ lasso_authentication_server_step(LassoAuthentication *authentication)
 				outbase64 = xmlSecBase64Encode(out, outlen, 0);
 				response->Data = g_list_append(response->Data, outbase64);
 			}
-		}
+		} else  {
 		/* authentication failed, abort exchange */
-		else  {
 			response->Status->code = g_strdup(LASSO_SA_STATUS_CODE_ABORT);
 		}
 	}
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index 9f2d2feb..b3fb1c83 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -109,8 +109,7 @@ lasso_discovery_build_credential(LassoDiscovery *discovery, const gchar *provide
 	if (provider) {
 		identifier->Format = g_strdup(LASSO_LIB_NAME_IDENTIFIER_FORMAT_ENTITYID);
 		identifier->content = g_strdup(provider->providerID);
-	}
-	else {
+	} else {
 		identifier->Format = g_strdup(LASSO_LIB_NAME_IDENTIFIER_FORMAT_FEDERATED);
 	}
 	subject->NameIdentifier = identifier;
@@ -222,19 +221,16 @@ lasso_discovery_init_request(LassoDiscovery *discovery,
 		if (LASSO_IS_DISCO_MODIFY(profile->request)) {
 			LASSO_DISCO_MODIFY(profile->request)->ResourceID = \
 				resourceOffering->ResourceID;
-		}
-		else if (LASSO_IS_DISCO_QUERY(profile->request)) {
+		} else if (LASSO_IS_DISCO_QUERY(profile->request)) {
 			LASSO_DISCO_QUERY(profile->request)->ResourceID = \
 				resourceOffering->ResourceID;
 		}
-	}
-	else if (resourceOffering->EncryptedResourceID != NULL) {
+	} else if (resourceOffering->EncryptedResourceID != NULL) {
 		g_object_ref(resourceOffering->EncryptedResourceID);
 		if (LASSO_IS_DISCO_MODIFY(profile->request)) {
 			LASSO_DISCO_MODIFY(profile->request)->EncryptedResourceID = \
 				resourceOffering->EncryptedResourceID;
-		}
-		else if (LASSO_IS_DISCO_QUERY(profile->request)) {
+		} else if (LASSO_IS_DISCO_QUERY(profile->request)) {
 			LASSO_DISCO_QUERY(profile->request)->EncryptedResourceID = \
 				resourceOffering->EncryptedResourceID;
 		}
@@ -242,8 +238,7 @@ lasso_discovery_init_request(LassoDiscovery *discovery,
 
 	if (description->Endpoint != NULL) {
 		profile->msg_url = g_strdup(description->Endpoint);
-	}
-	else if (description->WsdlURI != NULL) {
+	} else if (description->WsdlURI != NULL) {
 		/* TODO: get Endpoint at WsdlURI */
 	}
 
@@ -793,11 +788,11 @@ lasso_discovery_process_query_msg(LassoDiscovery *discovery, const gchar *messag
 	envelope = LASSO_WSF_PROFILE(discovery)->soap_envelope_response;
 	request = LASSO_DISCO_QUERY(LASSO_WSF_PROFILE(discovery)->request);
 	
-	if (request->ResourceID)
+	if (request->ResourceID) {
 		discovery->resource_id = g_object_ref(request->ResourceID);
-	else if (request->EncryptedResourceID)
+	} else if (request->EncryptedResourceID) {
 		discovery->encrypted_resource_id = g_object_ref(request->EncryptedResourceID);
-	else {
+	} else {
 		return LASSO_ERROR_UNIMPLEMENTED; /* implied ? */
 	}
 
diff --git a/lasso/id-wsf/personal_profile_service.c b/lasso/id-wsf/personal_profile_service.c
index 4bb5e20f..fba909c4 100644
--- a/lasso/id-wsf/personal_profile_service.c
+++ b/lasso/id-wsf/personal_profile_service.c
@@ -51,8 +51,7 @@ lasso_personal_profile_service_get_email(LassoPersonalProfileService *service)
 
 		if (strcmp((char *)child->name, "MsgAccount") == 0) {
 			msgAccount = xmlNodeGetContent(child);
-		}
-		else if (strcmp((char *)child->name, "MsgProvider") == 0) {
+		} else if (strcmp((char *)child->name, "MsgProvider") == 0) {
 			msgProvider = xmlNodeGetContent(child);
 		}
 				
diff --git a/lasso/id-wsf/wsf_profile.c b/lasso/id-wsf/wsf_profile.c
index 07f209e4..c57458b7 100644
--- a/lasso/id-wsf/wsf_profile.c
+++ b/lasso/id-wsf/wsf_profile.c
@@ -248,8 +248,7 @@ lasso_wsf_profile_verify_credential_signature(
 		if (keys_mngr == NULL) {
 			return LASSO_DS_ERROR_CA_CERT_CHAIN_LOAD_FAILED;
 		}
-	}
-	else if (x509data != NULL) {
+	} else if (x509data != NULL) {
 		return LASSO_DS_ERROR_CA_CERT_CHAIN_LOAD_FAILED;
 	}
 
@@ -257,9 +256,9 @@ lasso_wsf_profile_verify_credential_signature(
 
 	/* Case of simple public key signature type */
 	if (keys_mngr == NULL) {
-		if (lasso_provider != NULL)
+		if (lasso_provider != NULL) {
 			dsigCtx->signKey = lasso_provider_get_public_key(lasso_provider);
-		else if (profile->private_data->public_key) {
+		} else if (profile->private_data->public_key) {
 			/* TODO */
 		}
 		if (dsigCtx->signKey == NULL) {
@@ -446,10 +445,11 @@ lasso_wsf_profile_get_public_key_from_credential(LassoWsfProfile *profile, xmlNo
 		}
 		xmlnode = rsa_key_value->children;
 		while (xmlnode) {
-			if (strcmp((char*)xmlnode->name, "Modulus") == 0)
+			if (strcmp((char*)xmlnode->name, "Modulus") == 0) {
 				modulus_value = xmlNodeGetContent(xmlnode);
-			else if (strcmp((char*)xmlnode->name, "Exponent") == 0)
+			} else if (strcmp((char*)xmlnode->name, "Exponent") == 0) {
 				exponent_value = xmlNodeGetContent(xmlnode);
+			}
 			xmlnode = xmlnode->next;
 		}
 		
@@ -531,10 +531,11 @@ lasso_wsf_profile_add_soap_signature(LassoWsfProfile *profile,
 	/* Get Correlation, Provider, Security, Body elements */
 	t = envelope_node->children;
 	while (t) {
-		if (strcmp((char *) t->name, "Header") == 0)
+		if (strcmp((char *) t->name, "Header") == 0) {
 			header = t;
-		else if (strcmp((char *) t->name, "Body") == 0)
+		} else if (strcmp((char *) t->name, "Body") == 0) {
 			body = t;
+		}
 		t = t->next;
 	}
 	if (header == NULL)
@@ -545,12 +546,13 @@ lasso_wsf_profile_add_soap_signature(LassoWsfProfile *profile,
 
 	t = header->children;
 	while (t) {
-		if (strcmp((char *) t->name, "Correlation") == 0)
+		if (strcmp((char *) t->name, "Correlation") == 0) {
 			correlation = t;
-		else if (strcmp((char *) t->name, "Provider") == 0)
+		} else if (strcmp((char *) t->name, "Provider") == 0) {
 			provider = t;
-		else if (strcmp((char *) t->name, "Security") == 0)
+		} else if (strcmp((char *) t->name, "Security") == 0) {
 			security = t;
+		}
 		t = t->next;
 	}
 	if (correlation == NULL)
@@ -726,8 +728,7 @@ lasso_wsf_profile_verify_x509_authentication(LassoWsfProfile *profile,
 		if (keys_mngr == NULL) {
 			return LASSO_DS_ERROR_CA_CERT_CHAIN_LOAD_FAILED;
 		}
-	}
-	else if (x509data != NULL) {
+	} else if (x509data != NULL) {
 		return LASSO_DS_ERROR_CA_CERT_CHAIN_LOAD_FAILED;
 	}
 
@@ -737,8 +738,7 @@ lasso_wsf_profile_verify_x509_authentication(LassoWsfProfile *profile,
 	if (keys_mngr == NULL) {
 		if (lasso_provider != NULL) {
 			dsigCtx->signKey = lasso_provider_get_public_key(lasso_provider);
-		}
-		else if (public_key) {
+		} else if (public_key) {
 			dsigCtx->signKey = public_key;
 		}
 		if (dsigCtx->signKey == NULL) {
@@ -1227,17 +1227,20 @@ lasso_wsf_profile_process_soap_request_msg(LassoWsfProfile *profile, const gchar
 
 	si = lasso_server_get_service(profile->server, (char *) service_type);
 
-	if (!security_mech_id) {
-		if (si)
+	if (security_mech_id == NULL) {
+		if (si) {
 			profile->private_data->description = LASSO_DISCO_DESCRIPTION(
 				si->Description->data);
-		else
+		} else {
 			profile->private_data->description = NULL;
-	} else
-		if (si == NULL)
+		}
+	} else {
+		if (si == NULL) {
 			return LASSO_PROFILE_ERROR_MISSING_SERVICE_INSTANCE;
-		else
+		} else {
 			lasso_wsf_profile_get_description_auto(si, security_mech_id);	
+		}
+	}
 
 	doc = xmlParseMemory(message, strlen(message));
 	/* FIXME: doc will never be freed */
@@ -1245,17 +1248,15 @@ lasso_wsf_profile_process_soap_request_msg(LassoWsfProfile *profile, const gchar
 	/* Verify authentication mecanisms */
 	if (lasso_wsf_profile_has_x509_authentication(profile) == TRUE) {
 		res = lasso_wsf_profile_verify_x509_authentication(profile, doc, NULL);
-	}
-	else if (lasso_wsf_profile_has_saml_authentication(profile) == TRUE) {
+	} else if (lasso_wsf_profile_has_saml_authentication(profile) == TRUE) {
 		res = lasso_wsf_profile_verify_saml_authentication(profile, doc);
 	}
 
 	/* FIXME: Return a soap fault if authentication verification failed ? */
 	if (res > 0) {
 		fault = lasso_soap_fault_new();
-		fault->faultstring = "Invalid signature";
-	}
-	else if (res < 0)
+		fault->faultstring = g_strdup("Invalid signature");
+	} else if (res < 0)
 		return res;
 
 	/* FIXME: Remove Signature element if exists, it seg fault when a call to
diff --git a/lasso/saml-2.0/login.c b/lasso/saml-2.0/login.c
index 1ee98464..7748c70c 100644
--- a/lasso/saml-2.0/login.c
+++ b/lasso/saml-2.0/login.c
@@ -850,12 +850,13 @@ lasso_saml20_login_build_response_msg(LassoLogin *login, gchar *remote_providerI
 	if (login->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_LECP) {
 		const char *assertionConsumerURL;
 
-		if (profile->server->certificate)
+		if (profile->server->certificate) {
 			LASSO_SAMLP2_STATUS_RESPONSE(profile->response)->sign_type =
 				LASSO_SIGNATURE_TYPE_WITHX509;
-		else
+		} else {
 			LASSO_SAMLP2_STATUS_RESPONSE(profile->response)->sign_type =
 				LASSO_SIGNATURE_TYPE_SIMPLE;
+		}
 		LASSO_SAMLP2_STATUS_RESPONSE(profile->response)->sign_method =
 			LASSO_SIGNATURE_METHOD_RSA_SHA1;
 
@@ -1182,12 +1183,13 @@ lasso_saml20_login_build_authn_response_msg(LassoLogin *login)
 		return critical_error(LASSO_PROFILE_ERROR_INVALID_PROTOCOLPROFILE);
 	}
 
-	if (profile->server->certificate)
+	if (profile->server->certificate) {
 		LASSO_SAMLP2_STATUS_RESPONSE(profile->response)->sign_type =
 			LASSO_SIGNATURE_TYPE_WITHX509;
-	else
+	} else {
 		LASSO_SAMLP2_STATUS_RESPONSE(profile->response)->sign_type =
 			LASSO_SIGNATURE_TYPE_SIMPLE;
+	}
 	LASSO_SAMLP2_STATUS_RESPONSE(profile->response)->sign_method =
 		LASSO_SIGNATURE_METHOD_RSA_SHA1;
 
diff --git a/lasso/xml/lib_authentication_statement.c b/lasso/xml/lib_authentication_statement.c
index cf5439ad..d08ffd52 100644
--- a/lasso/xml/lib_authentication_statement.c
+++ b/lasso/xml/lib_authentication_statement.c
@@ -156,10 +156,11 @@ lasso_lib_authentication_statement_new_full(const char *authenticationMethod,
 	statement = g_object_new(LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT, NULL);
 	statement->AuthenticationMethod = g_strdup(authenticationMethod);
 
-	if (authenticationInstant == NULL)
+	if (authenticationInstant == NULL) {
 		time = lasso_get_current_time();
-	else
+	} else {
 		time = g_strdup(authenticationInstant);
+	}
 
 	statement->AuthenticationInstant = time;
 
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index b301ca69..a7b0717a 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -369,8 +369,7 @@ lasso_query_sign(char *query, LassoSignatureMethod sign_method, const char *priv
 		/* sign digest message */
 		status = RSA_sign(NID_sha1, (unsigned char*)digest, 20, sigret, &siglen, rsa);
 		RSA_free(rsa);
-	}
-	else if (sign_method == LASSO_SIGNATURE_METHOD_DSA_SHA1) {
+	} else if (sign_method == LASSO_SIGNATURE_METHOD_DSA_SHA1) {
 		dsa = PEM_read_bio_DSAPrivateKey(bio, NULL, NULL, NULL);
 		if (dsa == NULL) {
 			goto done;
@@ -379,6 +378,7 @@ lasso_query_sign(char *query, LassoSignatureMethod sign_method, const char *priv
 		status = DSA_sign(NID_sha1, (unsigned char*)digest, 20, sigret, &siglen, dsa);
 		DSA_free(dsa);
 	}
+
 	if (status == 0) {
 		goto done;
 	}
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index fc99ec9f..de88a712 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -350,10 +350,11 @@ lasso_node_export_to_query(LassoNode *node,
 	g_return_val_if_fail (LASSO_IS_NODE(node), NULL);
 
 	unsigned_query = lasso_node_build_query(node);
-	if (private_key_file)
+	if (private_key_file) {
 		query = lasso_query_sign(unsigned_query, sign_method, private_key_file);
-	else
+	} else {
 		query = g_strdup(unsigned_query);
+	}
 	g_free(unsigned_query);
 
 	return query;
@@ -866,11 +867,11 @@ lasso_node_impl_init_from_xml(LassoNode *node, xmlNode *xmlnode)
 					if (t2)
 						tmp = lasso_node_new_from_xmlNode_with_type(t2,
 								snippet->class_name);
-				} else if (type == SNIPPET_CONTENT)
+				} else if (type == SNIPPET_CONTENT) {
 					tmp = xmlNodeGetContent(t);
-				else if (type == SNIPPET_NAME_IDENTIFIER)
+				} else if (type == SNIPPET_NAME_IDENTIFIER) {
 					tmp = lasso_saml_name_identifier_new_from_xmlNode(t);
-				else if (type == SNIPPET_LIST_NODES) {
+				} else if (type == SNIPPET_LIST_NODES) {
 					GList **location = value;
 					LassoNode *n = lasso_node_new_from_xmlNode_with_type(t,
 							snippet->class_name);