diff options
Diffstat (limited to 'src/charon/plugins')
-rw-r--r-- | src/charon/plugins/eap_aka/eap_aka.c | 18 | ||||
-rw-r--r-- | src/charon/plugins/eap_mschapv2/eap_mschapv2.c | 6 | ||||
-rw-r--r-- | src/charon/plugins/eap_sim/eap_sim.c | 20 | ||||
-rw-r--r-- | src/charon/plugins/kernel_klips/kernel_klips_ipsec.c | 2 | ||||
-rw-r--r-- | src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c | 2 | ||||
-rw-r--r-- | src/charon/plugins/kernel_netlink/kernel_netlink_net.c | 2 | ||||
-rw-r--r-- | src/charon/plugins/medcli/medcli_config.c | 2 | ||||
-rw-r--r-- | src/charon/plugins/uci/uci_parser.c | 2 |
8 files changed, 27 insertions, 27 deletions
diff --git a/src/charon/plugins/eap_aka/eap_aka.c b/src/charon/plugins/eap_aka/eap_aka.c index 0b85428f9..c2c1a50f8 100644 --- a/src/charon/plugins/eap_aka/eap_aka.c +++ b/src/charon/plugins/eap_aka/eap_aka.c @@ -1197,8 +1197,8 @@ static status_t peer_process_challenge(private_eap_aka_t *this, chunk_free(&this->k); if (load_key(this->peer, this->server, &this->k) != SUCCESS) { - *out = build_aka_payload(this, EAP_RESPONSE, identifier, - AKA_AUTHENTICATION_REJECT, AT_END); + *out = build_aka_payload(this, EAP_RESPONSE, identifier, + AKA_AUTHENTICATION_REJECT, AT_END); DBG3(DBG_IKE, "no shared key found for IDs '%Y' - '%Y' to authenticate " "with EAP-AKA, sending %N", this->peer, this->server, aka_subtype_names, AKA_AUTHENTICATION_REJECT); @@ -1230,8 +1230,8 @@ static status_t peer_process_challenge(private_eap_aka_t *this, f1(this, this->k, this->rand, sqn, amf, xmac.ptr); if (!chunk_equals(mac, xmac)) { - *out = build_aka_payload(this, EAP_RESPONSE, identifier, - AKA_AUTHENTICATION_REJECT, AT_END); + *out = build_aka_payload(this, EAP_RESPONSE, identifier, + AKA_AUTHENTICATION_REJECT, AT_END); DBG1(DBG_IKE, "received MAC does not match XMAC, sending %N", aka_subtype_names, AKA_AUTHENTICATION_REJECT); DBG3(DBG_IKE, "MAC %B\nXMAC %B", &mac, &xmac); @@ -1258,9 +1258,9 @@ static status_t peer_process_challenge(private_eap_aka_t *this, memxor(aks.ptr, peer_sqn.ptr, aks.len); auts = chunk_cata("cc", aks, macs); - *out = build_aka_payload(this, EAP_RESPONSE, identifier, - AKA_SYNCHRONIZATION_FAILURE, - AT_AUTS, auts, AT_END); + *out = build_aka_payload(this, EAP_RESPONSE, identifier, + AKA_SYNCHRONIZATION_FAILURE, + AT_AUTS, auts, AT_END); DBG1(DBG_IKE, "received SQN invalid, sending %N", aka_subtype_names, AKA_SYNCHRONIZATION_FAILURE); DBG3(DBG_IKE, "received SQN %B\ncurrent SQN %B", &sqn, &peer_sqn); @@ -1363,8 +1363,8 @@ static status_t peer_process_notification(private_eap_aka_t *this, if (attribute >= 0 && attribute <= 127) { DBG1(DBG_IKE, "ignoring non-skippable attribute %N in %N", - aka_attribute_names, attribute, aka_subtype_names, - AKA_NOTIFICATION); + aka_attribute_names, attribute, aka_subtype_names, + AKA_NOTIFICATION); } else { diff --git a/src/charon/plugins/eap_mschapv2/eap_mschapv2.c b/src/charon/plugins/eap_mschapv2/eap_mschapv2.c index 26c6ffcb2..a063eba91 100644 --- a/src/charon/plugins/eap_mschapv2/eap_mschapv2.c +++ b/src/charon/plugins/eap_mschapv2/eap_mschapv2.c @@ -1035,9 +1035,9 @@ static status_t process_server_response(private_eap_mschapv2_t *this, /* FIXME: windows 7 always sends the username that is first entered in * the username box, even, if the user changes it during retries (probably * to keep consistent with the EAP-Identity). - * thus, we could actually fail here, because retries do not make much - * sense. on the other hand, an attacker could guess usernames, if the - * error messages were different. */ + * thus, we could actually fail here, because retries do not make much + * sense. on the other hand, an attacker could guess usernames, if the + * error messages were different. */ userid->destroy(userid); return process_server_retry(this, out); } diff --git a/src/charon/plugins/eap_sim/eap_sim.c b/src/charon/plugins/eap_sim/eap_sim.c index 56d79281d..811febdb3 100644 --- a/src/charon/plugins/eap_sim/eap_sim.c +++ b/src/charon/plugins/eap_sim/eap_sim.c @@ -475,17 +475,17 @@ static status_t peer_process_start(private_eap_sim_t *this, eap_payload_t *in, if (code <= 32767) /* no success bit */ { DBG1(DBG_IKE, "received %N error %d", - sim_attribute_names, attribute, code); + sim_attribute_names, attribute, code); *out = build_payload(this, in->get_identifier(in), SIM_CLIENT_ERROR, - AT_CLIENT_ERROR_CODE, client_error_general, + AT_CLIENT_ERROR_CODE, client_error_general, AT_END); return NEED_MORE; } else { DBG1(DBG_IKE, "received %N code %d", - sim_attribute_names, attribute, code); + sim_attribute_names, attribute, code); } break; } @@ -623,17 +623,17 @@ static status_t peer_process_challenge(private_eap_sim_t *this, if (code <= 32767) /* no success bit */ { DBG1(DBG_IKE, "received %N error %d", - sim_attribute_names, attribute, code); + sim_attribute_names, attribute, code); *out = build_payload(this, in->get_identifier(in), SIM_CLIENT_ERROR, - AT_CLIENT_ERROR_CODE, client_error_general, + AT_CLIENT_ERROR_CODE, client_error_general, AT_END); return NEED_MORE; } else { DBG1(DBG_IKE, "received %N code %d", - sim_attribute_names, attribute, code); + sim_attribute_names, attribute, code); } break; } @@ -877,17 +877,17 @@ static status_t peer_process_notification(private_eap_sim_t *this, if (code <= 32767) /* no success bit */ { DBG1(DBG_IKE, "received %N error %d", - sim_attribute_names, attribute, code); + sim_attribute_names, attribute, code); *out = build_payload(this, in->get_identifier(in), SIM_CLIENT_ERROR, - AT_CLIENT_ERROR_CODE, client_error_general, + AT_CLIENT_ERROR_CODE, client_error_general, AT_END); return NEED_MORE; } else { DBG1(DBG_IKE, "received %N code %d", - sim_attribute_names, attribute, code); + sim_attribute_names, attribute, code); } break; } @@ -924,7 +924,7 @@ static status_t server_process_client_error(private_eap_sim_t *this, code = ntohs(*(u_int16_t*)data.ptr); } DBG1(DBG_IKE, "received %N error %d", - sim_attribute_names, attribute, code); + sim_attribute_names, attribute, code); } else { diff --git a/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c b/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c index 0ae0beaef..1b6afe6ce 100644 --- a/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c +++ b/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c @@ -784,7 +784,7 @@ static kernel_algorithm_t encryption_algs[] = { /* {ENCR_3IDEA, 0 }, */ /* {ENCR_DES_IV32, 0 }, */ {ENCR_NULL, SADB_EALG_NULL }, - {ENCR_AES_CBC, SADB_EALG_AESCBC }, + {ENCR_AES_CBC, SADB_EALG_AESCBC }, /* {ENCR_AES_CTR, 0 }, */ /* {ENCR_AES_CCM_ICV8, 0 }, */ /* {ENCR_AES_CCM_ICV12, 0 }, */ diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c index bce6016c5..e4967de69 100644 --- a/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c +++ b/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c @@ -172,7 +172,7 @@ static kernel_algorithm_t encryption_algs[] = { /* {ENCR_3IDEA, "***" }, */ /* {ENCR_DES_IV32, "***" }, */ {ENCR_NULL, "cipher_null" }, - {ENCR_AES_CBC, "aes" }, + {ENCR_AES_CBC, "aes" }, {ENCR_AES_CTR, "rfc3686(ctr(aes))" }, {ENCR_AES_CCM_ICV8, "rfc4309(ccm(aes))" }, {ENCR_AES_CCM_ICV12, "rfc4309(ccm(aes))" }, diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c index d73f2c9cf..8fd25e96f 100644 --- a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c +++ b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c @@ -1079,7 +1079,7 @@ static status_t del_ip(private_kernel_netlink_net_t *this, host_t *virtual_ip) if (addr->refcount == 1) { status = manage_ipaddr(this, RTM_DELADDR, 0, - ifindex, virtual_ip); + ifindex, virtual_ip); if (status == SUCCESS) { /* wait until the address is really gone */ while (get_vip_refcount(this, virtual_ip) > 0) diff --git a/src/charon/plugins/medcli/medcli_config.c b/src/charon/plugins/medcli/medcli_config.c index 505e744e1..6f2cd094e 100644 --- a/src/charon/plugins/medcli/medcli_config.c +++ b/src/charon/plugins/medcli/medcli_config.c @@ -166,7 +166,7 @@ static peer_cfg_t *get_peer_cfg_by_name(private_medcli_config_t *this, char *nam this->rekey*5, this->rekey*3, /* jitter, overtime */ TRUE, this->dpd, /* mobike, dpddelay */ NULL, NULL, /* vip, pool */ - FALSE, med_cfg, /* mediation, med by */ + FALSE, med_cfg, /* mediation, med by */ identification_create_from_encoding(ID_KEY_ID, other)); auth = auth_cfg_create(); diff --git a/src/charon/plugins/uci/uci_parser.c b/src/charon/plugins/uci/uci_parser.c index 76019a3b4..6de55d218 100644 --- a/src/charon/plugins/uci/uci_parser.c +++ b/src/charon/plugins/uci/uci_parser.c @@ -93,7 +93,7 @@ static bool section_enumerator_enumerate(section_enumerator_t *this, ...) { value = va_arg(args, char**); if (value && uci_lookup(this->ctx, &element, this->package, - this->current->name, this->keywords[i]) == UCI_OK) + this->current->name, this->keywords[i]) == UCI_OK) { *value = uci_to_option(element)->value; } |