#include "eap_types.h"
#include "eap_sim.h"
+#include "comp128.h"
extern int sha1_data_problems;
+#undef DEBUG
+#undef DEBUG2
+#undef ERROR
+
+#define DEBUG if (fr_debug_lvl && fr_log_fp) fr_printf_log
+#define DEBUG2 if ((fr_debug_lvl >= 2) && fr_log_fp) fr_printf_log
+#define ERROR if (fr_debug_lvl && fr_log_fp) fr_printf_log
+
#define USEC 1000000
static uint32_t parallel = 1;
typedef struct rc_eap_context {
int eap_type; //!< contains the EAP-Type
char password[256]; //!< copy of User-Password (or CHAP-Password).
+ VALUE_PAIR *ki;
union {
rc_eap_sim_context_t sim;
rc_eap_md5_context_t md5;
char const *name; //!< Test name (as specified in the request).
};
+typedef struct eap_sim_server_state {
+ enum eapsim_serverstates state;
+ struct eapsim_keys keys;
+ int sim_id;
+} eap_sim_state_t;
+
static TALLOC_CTX *autofree;
static uint32_t num_trans = 0; //!< number of transactions initialized.
/* Determine where to read the VP's from. */
if (filename && strcmp(filename, "-") != 0) {
- DEBUG2("Opening input file: %s", filename);
+ DEBUG2("Opening input file: %s\n", filename);
file_in = fopen(filename, "r");
if (!file_in) {
- ERROR("Error opening %s: %s", filename, strerror(errno));
+ ERROR("Error opening %s: %s\n", filename, strerror(errno));
return 0;
}
input = filename;
} else {
- DEBUG2("Reading input vps from stdin");
+ DEBUG2("Reading input vps from stdin\n");
file_in = stdin;
input = "stdin";
}
MEM(request = talloc_zero(ctx, rc_input_vps_t));
if (fr_pair_list_afrom_file(request, &request->vps_in, file_in, &file_done) < 0) {
- ERROR("Error parsing entry %u from input: %s", input_num, input);
+ ERROR("Error parsing entry %u from input: %s\n", input_num, input);
talloc_free(request);
break;
}
if (file_in != stdin) fclose(file_in);
/* And we're done. */
- DEBUG("Read %d element(s) from input: %s", list->size, input);
+ DEBUG("Read %d element(s) from input: %s\n", list->size, input);
return 1;
}
case PW_PACKET_SRC_PORT:
if ((vp->vp_integer < 1024) ||
(vp->vp_integer > 65535)) {
- DEBUG("Invalid value '%u' for Packet-Src-Port", vp->vp_integer);
+ DEBUG("Invalid value '%u' for Packet-Src-Port\n", vp->vp_integer);
} else {
packet->src_port = (vp->vp_integer & 0xffff);
}
da = dict_attrbyvalue(PW_DIGEST_ATTRIBUTES, 0);
if (!da) {
- ERROR("Attribute 'Digest-Attributes' not found by value");
+ ERROR("Attribute 'Digest-Attributes' not found by value\n");
exit(1);
}
vp->da = da;
if (packet->dst_ipaddr.af == AF_UNSPEC) {
if (!server_addr_init) {
- DEBUG("No server was given, and input entry %u did not contain Packet-Dst-IP-Address, ignored.", trans->input_vps->num);
+ DEBUG("No server was given, and input entry %u did not contain Packet-Dst-IP-Address, ignored.\n", trans->input_vps->num);
return 0;
}
packet->dst_ipaddr = server_ipaddr;
/* Use the default set on the command line. */
if (packet->code == PW_CODE_UNDEFINED) {
if (packet_code == PW_CODE_UNDEFINED) {
- DEBUG("No packet type was given, and input entry %u did not contain Packet-Type, ignored.", trans->input_vps->num);
+ DEBUG("No packet type was given, and input entry %u did not contain Packet-Type, ignored.\n", trans->input_vps->num);
return 0;
}
packet->code = packet_code;
if (packet->dst_port == 0) {
rc_get_port(packet->code, &packet->dst_port);
if (packet->dst_port == 0) {
- DEBUG("Can't determine destination port for input entry %u, ignored.", trans->input_vps->num);
+ DEBUG("Can't determine destination port for input entry %u, ignored.\n", trans->input_vps->num);
return 0;
}
}
if (vp) {
strlcpy(trans->eap_context->password, vp->vp_strvalue, sizeof(trans->eap_context->password));
}
+
+ vp = fr_pair_find_by_num(packet->vps, PW_EAP_SIM_KI, 0, TAG_ANY);
+ if (vp) trans->eap_context->ki = fr_pair_copy(autofree, vp);
}
}
+
/** Grab an element from the input list. Initialize a new transaction context, using this element.
*/
static rc_transaction_t *rc_init_transaction(TALLOC_CTX *ctx)
num_ongoing --;
num_finished ++;
- DEBUG4("pl: %d, ev: %d, in: %d", fr_packet_list_num_outgoing(pl), fr_event_list_num_elements(ev_list), rc_vps_list_in.size);
+ DEBUG4("pl: %d, ev: %d, in: %d\n", fr_packet_list_num_outgoing(pl), fr_event_list_num_elements(ev_list), rc_vps_list_in.size);
}
}
}
+
+static void generate_triplets(RADIUS_PACKET *packet, VALUE_PAIR *ki, uint8_t const *ch)
+{
+ int i, idx;
+ eap_sim_state_t ess;
+
+ for (idx = 0; idx < 3; idx++) {
+ VALUE_PAIR *vp;
+ char *p;
+ char buffer[33]; /* 32 hexits (16 bytes) + 1 */
+
+ for (i = 0; i < EAPSIM_RAND_SIZE; i++) {
+ ess.keys.rand[idx][i] = ch[(idx * EAPSIM_RAND_SIZE) + i];
+ }
+
+ /*
+ * <sigh>, we always do version 1.
+ */
+ switch (EAP_SIM_VERSION) {
+ case 1:
+ comp128v1(ess.keys.sres[idx], ess.keys.Kc[idx], ki->vp_octets, ess.keys.rand[idx]);
+ break;
+
+ case 2:
+ comp128v23(ess.keys.sres[idx], ess.keys.Kc[idx], ki->vp_octets, ess.keys.rand[idx],
+ true);
+ break;
+
+ case 3:
+ comp128v23(ess.keys.sres[idx], ess.keys.Kc[idx], ki->vp_octets, ess.keys.rand[idx],
+ false);
+ break;
+
+ case 4:
+ DEBUG("Comp128-4 algorithm is not supported as details have not yet been published. "
+ "If you have details of this algorithm please contact the FreeRADIUS "
+ "maintainers\n");
+ break;
+
+ default:
+ DEBUG("Unknown/unsupported algorithm Comp128-4\n");
+ }
+
+
+ DEBUG2("Generated following triplets for round %i:\n", idx);
+
+ p = buffer;
+ for (i = 0; i < EAPSIM_RAND_SIZE; i++) {
+ p += sprintf(p, "%02x", ess.keys.rand[idx][i]);
+ }
+ DEBUG2("RAND%d : 0x%s\n", idx, buffer);
+ vp = fr_pair_afrom_num(packet, PW_EAP_SIM_RAND1 + idx, 0);
+ fr_pair_value_memcpy(vp, ess.keys.rand[idx], EAPSIM_RAND_SIZE);
+ fr_pair_add(&packet->vps, vp);
+
+ p = buffer;
+ for (i = 0; i < EAPSIM_SRES_SIZE; i++) {
+ p += sprintf(p, "%02x", ess.keys.sres[idx][i]);
+ }
+ DEBUG2("SRES%d : 0x%s\n", idx, buffer);
+ vp = fr_pair_afrom_num(packet, PW_EAP_SIM_SRES1 + idx, 0);
+ fr_pair_value_memcpy(vp, ess.keys.sres[idx], EAPSIM_SRES_SIZE);
+ fr_pair_add(&packet->vps, vp);
+
+ p = buffer;
+ for (i = 0; i < EAPSIM_KC_SIZE; i++) {
+ p += sprintf(p, "%02x", ess.keys.Kc[idx][i]);
+ }
+ DEBUG2("Kc%d : 0x%s\n", idx, buffer);
+ vp = fr_pair_afrom_num(packet, PW_EAP_SIM_KC1 + idx, 0);
+ fr_pair_value_memcpy(vp, ess.keys.Kc[idx], EAPSIM_KC_SIZE);
+ fr_pair_add(&packet->vps, vp);
+ }
+}
+
+
/*
* we got an EAP-Request/Sim/Start message in a legal state.
*
uint16_t const *versions;
uint16_t selectedversion;
unsigned int i,versioncount;
+ VALUE_PAIR *ki;
/* form new response clear of any EAP stuff */
rc_cleanresp(rep);
if ((vp = fr_pair_find_by_num(req->vps, PW_EAP_SIM_VERSION_LIST, 0, TAG_ANY)) == NULL) {
- ERROR("illegal start message has no VERSION_LIST");
+ ERROR("illegal start message has no VERSION_LIST\n");
return 0;
}
/* verify that the attribute length is big enough for a length field */
if (vp->vp_length < 4)
{
- ERROR("start message has illegal VERSION_LIST. Too short: %u", (unsigned int) vp->vp_length);
+ ERROR("start message has illegal VERSION_LIST. Too short: %u\n", (unsigned int) vp->vp_length);
return 0;
}
*/
if ((unsigned)vp->vp_length <= (versioncount*2 + 2))
{
- ERROR("start message is too short. Claimed %d versions does not fit in %u bytes", versioncount, (unsigned int) vp->vp_length);
+ ERROR("start message is too short. Claimed %d versions does not fit in %u bytes\n", versioncount, (unsigned int) vp->vp_length);
return 0;
}
}
if (selectedversion == 0)
{
- ERROR("eap-sim start message. No compatible version found. We need %d", EAP_SIM_VERSION);
+ ERROR("eap-sim start message. No compatible version found. We need %d\n", EAP_SIM_VERSION);
for (i=0; i < versioncount; i++)
{
- ERROR("\tfound version %d",
+ ERROR("\tfound version %d\n",
ntohs(versions[i+1]));
}
}
if (!fullauthidreq_vp ||
anyidreq_vp != NULL ||
permanentidreq_vp != NULL) {
- ERROR("start message has %sanyidreq, %sfullauthid and %spermanentid. Illegal combination.",
+ ERROR("start message has %sanyidreq, %sfullauthid and %spermanentid. Illegal combination.\n",
(anyidreq_vp != NULL ? "a ": "no "),
(fullauthidreq_vp != NULL ? "a ": "no "),
(permanentidreq_vp != NULL ? "a ": "no "));
vp = fr_pair_find_by_num(rep->vps, PW_USER_NAME, 0, TAG_ANY);
if (!vp)
{
- ERROR("eap-sim: We need to have a User-Name attribute!");
+ ERROR("eap-sim: We need to have a User-Name attribute!\n");
return 0;
}
newvp = fr_pair_afrom_num(rep, PW_EAP_SIM_IDENTITY, 0);
eap_context->eap.sim.keys.identitylen = idlen;
}
+ ki = fr_pair_find_by_num(req->vps, PW_EAP_SIM_KI, 0, TAG_ANY);
+ if (ki && !fr_pair_find_by_num(req->vps, PW_EAP_SIM_RAND1, 0, TAG_ANY)) {
+ generate_triplets(req, ki, NULL);
+ }
+
return 1;
}
+
/*
* we got an EAP-Request/Sim/Challenge message in a legal state.
*
mac = fr_pair_find_by_num(req->vps, PW_EAP_SIM_MAC, 0, TAG_ANY);
randvp= fr_pair_find_by_num(req->vps, PW_EAP_SIM_RAND, 0, TAG_ANY);
if (!mac || !randvp) {
- ERROR("challenge message needs to contain RAND and MAC");
+ ERROR("challenge message needs to contain RAND and MAC\n");
return 0;
}
if (!randcfgvp[0] ||
!randcfgvp[1] ||
!randcfgvp[2]) {
- ERROR("needs to have rand1, 2 and 3 set.");
- return 0;
+ int i;
+ VALUE_PAIR *ki;
+
+ /*
+ * Generate a new RAND value, and derive Kc and SRES from
+ * Ki, but only if we don't already have the random
+ * numbers.
+ */
+ ki = eap_context->ki;
+ if (!ki) {
+ ERROR("Need EAP-SIM-Rand1, EAP-SIM-Rand2, and EAP-SIM-Rand3\n");
+ return 0;
+ }
+
+ for (i = 0; i < 3; i++) {
+ fr_pair_delete_by_num(&req->vps, PW_EAP_SIM_RAND1 + i, 0, TAG_ANY);
+ fr_pair_delete_by_num(&req->vps, PW_EAP_SIM_SRES1 + i, 0, TAG_ANY);
+ fr_pair_delete_by_num(&req->vps, PW_EAP_SIM_KC1 + i, 0, TAG_ANY);
+ }
+
+ generate_triplets(rep, ki, randvp->vp_octets + 2);
+
+ randcfgvp[0] = fr_pair_find_by_num(rep->vps, PW_EAP_SIM_RAND1, 0, TAG_ANY);
+ randcfgvp[1] = fr_pair_find_by_num(rep->vps, PW_EAP_SIM_RAND2, 0, TAG_ANY);
+ randcfgvp[2] = fr_pair_find_by_num(rep->vps, PW_EAP_SIM_RAND3, 0, TAG_ANY);
+
+ if (!randcfgvp[0] ||
+ !randcfgvp[1] ||
+ !randcfgvp[2]) {
+ ERROR("Failed to create triplets\n");
+ return 0;
+ }
}
if (memcmp(randcfg[0], randcfgvp[0]->vp_octets, EAPSIM_RAND_SIZE)!=0 ||
- memcmp(randcfg[1], randcfgvp[1]->vp_octets, EAPSIM_RAND_SIZE)!=0 ||
- memcmp(randcfg[2], randcfgvp[2]->vp_octets, EAPSIM_RAND_SIZE)!=0) {
- int rnum,i;
-
- ERROR("one of rand 1,2,3 didn't match");
- for (rnum = 0; rnum < 3; rnum++) {
- ERROR("rand %d\trecv\tconfig", rnum);
- for (i = 0; i < EAPSIM_RAND_SIZE; i++) {
- fprintf(fr_log_fp, "\t%02x\t%02x\n",
- randcfg[rnum][i], randcfgvp[rnum]->vp_octets[i]);
- }
- }
- return 0;
+ memcmp(randcfg[1], randcfgvp[1]->vp_octets, EAPSIM_RAND_SIZE)!=0 ||
+ memcmp(randcfg[2], randcfgvp[2]->vp_octets, EAPSIM_RAND_SIZE)!=0) {
+ int rnum, i;
+
+ ERROR("one of rand 1,2,3 didn't match\n");
+ for (rnum = 0; rnum < 3; rnum++) {
+ ERROR("rand %d\trecv\tconfig\n", rnum);
+ for (i = 0; i < EAPSIM_RAND_SIZE; i++) {
+ fprintf(fr_log_fp, "\t%02x\t%02x\n",
+ randcfg[rnum][i], randcfgvp[rnum]->vp_octets[i]);
+ }
+ }
+ return 0;
}
}
if (!sres1 ||
!sres2 ||
!sres3) {
- ERROR("needs to have sres1, 2 and 3 set.");
+ ERROR("needs to have sres1, 2 and 3 set.\n");
return 0;
}
memcpy(eap_context->eap.sim.keys.sres[0], sres1->vp_strvalue, sizeof(eap_context->eap.sim.keys.sres[0]));
if (!Kc1 ||
!Kc2 ||
!Kc3) {
- ERROR("needs to have Kc1, 2 and 3 set.");
+ ERROR("needs to have Kc1, 2 and 3 set.\n");
return 0;
}
memcpy(eap_context->eap.sim.keys.Kc[0], Kc1->vp_strvalue, sizeof(eap_context->eap.sim.keys.Kc[0]));
/* all set, calculate keys */
eapsim_calculate_keys(&eap_context->eap.sim.keys);
- if (rad_debug_lvl) {
+ if (rad_debug_lvl > 2) {
eapsim_dump_mk(&eap_context->eap.sim.keys);
}
if (eapsim_checkmac(NULL, req->vps, eap_context->eap.sim.keys.K_aut,
eap_context->eap.sim.keys.nonce_mt, sizeof(eap_context->eap.sim.keys.nonce_mt),
calcmac)) {
- DEBUG("MAC check succeed");
+ DEBUG2("MAC check succeed\n");
} else {
int i, j;
j=0;
- DEBUG("calculated MAC (");
+ DEBUG("calculated MAC (\n");
for (i = 0; i < 20; i++) {
if (j==4) {
printf("_");
}
j++;
- DEBUG("%02x", calcmac[i]);
+ DEBUG("%02x\n", calcmac[i]);
}
- DEBUG("did not match");
+ DEBUG("did not match\n");
return 0;
}
RADIUS_PACKET *req, RADIUS_PACKET *resp)
{
enum eapsim_clientstates state, newstate;
- enum eapsim_subtype subtype;
+ enum eapsim_subtype subtype, newsubtype;
VALUE_PAIR *vp, *statevp, *radstate, *eapid;
char statenamebuf[32], subtypenamebuf[32];
}
subtype = vp->vp_integer;
+ DEBUG2("IN state %s subtype %s\n",
+ sim_state2name(state, statenamebuf, sizeof(statenamebuf)),
+ sim_subtype2name(subtype, subtypenamebuf, sizeof(subtypenamebuf)));
+
/*
* look for the appropriate state, and process incoming message
*/
case EAPSIM_NOTIFICATION:
case EAPSIM_REAUTH:
default:
- ERROR("sim in state %s message %s is illegal. Reply dropped.",
- sim_state2name(state, statenamebuf, sizeof(statenamebuf)),
- sim_subtype2name(subtype, subtypenamebuf, sizeof(subtypenamebuf)));
+ ERROR("sim in state %s message %s is illegal. Reply dropped.\n",
+ sim_state2name(state, statenamebuf, sizeof(statenamebuf)),
+ sim_subtype2name(subtype, subtypenamebuf, sizeof(subtypenamebuf)));
/* invalid state, drop message */
return 0;
}
break;
default:
- ERROR("sim in state %s message %s is illegal. Reply dropped.",
+ ERROR("sim in state %s message %s is illegal. Reply dropped.\n",
sim_state2name(state, statenamebuf, sizeof(statenamebuf)),
sim_subtype2name(subtype, subtypenamebuf, sizeof(subtypenamebuf)));
/* invalid state, drop message */
default:
- ERROR("sim in illegal state %s",
+ ERROR("sim in illegal state %s\n",
sim_state2name(state, statenamebuf, sizeof(statenamebuf)));
return 0;
}
/* copy the radius state object in */
fr_pair_replace(&(resp->vps), radstate);
+ vp = fr_pair_find_by_num(req->vps, PW_EAP_SIM_SUBTYPE, 0, TAG_ANY);
+ newsubtype = vp->vp_integer;
+
+
+ DEBUG2("MOVE from state %s subtype %s\n",
+ sim_state2name(state, statenamebuf, sizeof(statenamebuf)),
+ sim_subtype2name(subtype, subtypenamebuf, sizeof(subtypenamebuf)));
+
+ DEBUG2(" to state %s subtype %s\n",
+ sim_state2name(newstate, statenamebuf, sizeof(statenamebuf)),
+ sim_subtype2name(newsubtype, subtypenamebuf, sizeof(subtypenamebuf)));
+
statevp->vp_integer = newstate;
return 1;
}
if ((state = fr_pair_list_copy_by_num(NULL, req->vps, PW_STATE, 0, TAG_ANY)) == NULL)
{
- ERROR("no state attribute found");
+ ERROR("no state attribute found\n");
return 0;
}
if ((id = fr_pair_list_copy_by_num(NULL, req->vps, PW_EAP_ID, 0, TAG_ANY)) == NULL)
{
- ERROR("no EAP-ID attribute found");
+ ERROR("no EAP-ID attribute found\n");
return 0;
}
identifier = id->vp_integer;
if ((vp = fr_pair_find_by_num(req->vps, PW_EAP_TYPE_BASE+PW_EAP_MD5, 0, TAG_ANY)) == NULL)
{
- ERROR("no EAP-MD5 attribute found");
+ ERROR("no EAP-MD5 attribute found\n");
return 0;
}
/* sanitize items */
if (valuesize > vp->vp_length)
{
- ERROR("md5 valuesize if too big (%u > %u)",
+ ERROR("md5 valuesize if too big (%u > %u)\n",
(unsigned int) valuesize, (unsigned int) vp->vp_length);
return 0;
}
mysockfd = fr_socket(src_ipaddr, src_port);
if (mysockfd < 0) {
- ERROR("Failed to create new socket: %s", fr_strerror());
+ ERROR("Failed to create new socket: %s\n", fr_strerror());
exit(1);
}
if (!fr_packet_list_socket_add(pl, mysockfd, ipproto, dst_ipaddr, dst_port, NULL)) {
- ERROR("Failed to add new socket: %s", fr_strerror());
+ ERROR("Failed to add new socket: %s\n", fr_strerror());
exit(1);
}
num_sockets ++;
- DEBUG("Added new socket: %d (num sockets: %d)", mysockfd, num_sockets);
+ DEBUG("Added new socket: %d (num sockets: %d)\n", mysockfd, num_sockets);
}
/** Send one packet for a transaction.
break;
}
if (nb_sock_add >= 1) {
- ERROR("Added %d new socket(s), but still could not get an ID (currently: %d outgoing requests).",
+ ERROR("Added %d new socket(s), but still could not get an ID (currently: %d outgoing requests).\n",
nb_sock_add, fr_packet_list_num_outgoing(pl));
exit(1);
}
/*
* Send the packet.
*/
- DEBUG("Transaction: %u, sending packet: %u (id: %u)...", trans->id, trans->num_packet, packet->id);
+ DEBUG2("Transaction: %u, sending packet: %u (id: %u)...\n", trans->id, trans->num_packet, packet->id);
gettimeofday(&packet->timestamp, NULL); /* set outgoing packet timestamp. */
if (rad_send(packet, NULL, secret) < 0) {
- ERROR("Failed to send packet (sockfd: %d, id: %d): %s",
+ ERROR("Failed to send packet (sockfd: %d, id: %d): %s\n",
packet->sockfd, packet->id, fr_strerror());
}
RADIUS_PACKET *packet = trans->packet;
- DEBUG2("Deallocating (sockfd: %d, id: %d)", packet->sockfd, packet->id);
+ DEBUG2("Deallocating (sockfd: %d, id: %d)\n", packet->sockfd, packet->id);
/*
* One more unused RADIUS ID.
*/
reply = fr_packet_list_recv(pl, &set);
if (!reply) {
- ERROR("Received bad packet: %s", fr_strerror());
+ ERROR("Received bad packet: %s\n", fr_strerror());
return -1; /* bad packet */
}
/* got reply to packet we didn't send.
* (or maybe we sent it, got no response, freed the ID. Then server responds to first request.)
*/
- DEBUG("No outstanding request was found for reply from %s, port %d (sockfd: %d, id: %d)",
+ DEBUG("No outstanding request was found for reply from %s, port %d (sockfd: %d, id: %d)\n",
inet_ntop(reply->src_ipaddr.af, &reply->src_ipaddr.ipaddr, buffer, sizeof(buffer)),
reply->src_port, reply->sockfd, reply->id);
rad_free(&reply);
* (or maybe this is a response to another packet we sent, for which we got no response,
* freed the ID, then reused it. Then server responds to first packet.)
*/
- DEBUG("Conflicting response authenticator for reply from %s (sockfd: %d, id: %d)",
+ DEBUG("Conflicting response authenticator for reply from %s (sockfd: %d, id: %d)\n",
inet_ntop(reply->src_ipaddr.af, &reply->src_ipaddr.ipaddr, buffer, sizeof(buffer)),
reply->sockfd, reply->id);
if (rad_decode(trans->reply, trans->packet, secret) != 0) {
/* This can fail if packet contains too many attributes. */
- DEBUG("Failed decoding reply");
+ DEBUG("Failed decoding reply\n");
goto packet_done;
}
rc_unmap_eap_methods(trans->reply);
}
- DEBUG("Transaction: %u, received packet (id: %u).", trans->id, trans->reply->id);
+ DEBUG2("Transaction: %u, received packet (id: %u).\n", trans->id, trans->reply->id);
if (fr_debug_lvl > 0) fr_packet_header_print(fr_log_fp, trans->reply, true);
if (fr_debug_lvl > 0) vp_printlist(fr_log_fp, trans->reply->vps);
}
}
- goto eap_done;
-
-eap_done:
/* EAP transaction ends here (no more requests from EAP server). */
/*
DEBUG("EAP transaction finished, but reply does not contain EAP-Code = Success");
goto packet_done;
}
+
goto packet_done;
packet_done:
timeradd(&tv_event, &tv_timeout, &tv_event);
if (!fr_event_insert(ev_list, rc_evcb_packet_timeout, (void *)trans, &tv_event, &trans->event)) {
- ERROR("Failed to insert event");
+ ERROR("Failed to insert event\n");
exit(1);
}
}
}
if (ip_hton(&server_ipaddr, force_af, hostname, false) < 0) {
- ERROR("%s: Failed to find IP address for host %s: %s", progname, hostname, strerror(errno));
+ ERROR("%s: Failed to find IP address for host %s: %s\n", progname, hostname, strerror(errno));
exit(1);
}
server_addr_init = true;
case 'S':
fp = fopen(optarg, "r");
if (!fp) {
- ERROR("Error opening %s: %s",
+ ERROR("Error opening %s: %s\n",
optarg, fr_syserror(errno));
exit(1);
}
if (fgets(filesecret, sizeof(filesecret), fp) == NULL) {
- ERROR("Error reading %s: %s",
+ ERROR("Error reading %s: %s\n",
optarg, fr_syserror(errno));
exit(1);
}
}
if (strlen(filesecret) < 2) {
- ERROR("Secret in %s is too short", optarg);
+ ERROR("Secret in %s is too short\n", optarg);
exit(1);
}
secret = filesecret;
*/
DEBUG2("including dictionary file %s/%s", main_config.dictionary_dir, RADIUS_DICTIONARY);
if (dict_init(main_config.dictionary_dir, RADIUS_DICTIONARY) != 0) {
- ERROR("Errors reading dictionary: %s", fr_strerror());
+ ERROR("Errors reading dictionary: %s\n", fr_strerror());
exit(1);
}
*/
int rcode = dict_read(radius_dir, RADIUS_DICTIONARY);
if (rcode == -1) {
- ERROR("Errors reading %s/%s: %s", radius_dir, RADIUS_DICTIONARY, fr_strerror());
+ ERROR("Errors reading %s/%s: %s\n", radius_dir, RADIUS_DICTIONARY, fr_strerror());
exit(1);
}
if (!isdigit((int) argv[2][0])) {
packet_code = fr_str2int(rc_request_types, argv[2], -2);
if (packet_code == -2) {
- ERROR("Unrecognised request type \"%s\"", argv[2]);
+ ERROR("Unrecognised request type \"%s\"\n", argv[2]);
usage();
}
} else {
INFO("Loading input data...");
if (!rc_load_input(autofree, filename, &rc_vps_list_in, 0)
|| rc_vps_list_in.size == 0) {
- ERROR("No valid input. Nothing to send.");
+ ERROR("No valid input. Nothing to send.\n");
exit(EXIT_FAILURE);
}
INFO("Loaded: %d input element(s).", rc_vps_list_in.size);
/* Initialize the events list. */
ev_list = fr_event_list_create(autofree, NULL);
if (!ev_list) {
- ERROR("Failed to create event list");
+ ERROR("Failed to create event list\n");
exit(1);
}
/* find eap message */
e = eap_vp2packet(NULL, rep->vps);
if (!e) {
- ERROR("%s", fr_strerror());
+ ERROR("failed decoding EAP: %s\n", fr_strerror());
return;
}
/* create EAP-ID and EAP-CODE attributes to start */
esvp = fr_pair_find_by_num(r->vps, PW_EAP_TYPE_BASE+PW_EAP_SIM, 0, TAG_ANY);
if (!esvp) {
- ERROR("eap: EAP-Sim attribute not found");
+ ERROR("eap: EAP-Sim attribute not found\n");
return 0;
}
projects / thirdparty / freeradius-server.git / commitdiff
