Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2005 Pekka Riikonen
+ Copyright (C) 2005 - 2007 Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
/* Connection authentication context */
struct SilcConnAuthStruct {
SilcSKE ske;
- SilcFSMStruct fsm;
+ SilcFSM fsm;
SilcConnectionType conn_type;
SilcAuthMethod auth_method;
void *auth_data;
{
SilcConnAuth connauth = callback_context;
connauth->packet = packet;
- silc_fsm_continue(&connauth->fsm);
+ silc_fsm_continue(connauth->fsm);
return TRUE;
}
/* Compute signature */
if (!silc_pkcs_sign(private_key, auth->data, silc_buffer_len(auth),
- *auth_data, len, auth_data_len, ske->prop->hash)) {
+ *auth_data, len, auth_data_len, TRUE, ske->prop->hash)) {
silc_free(*auth_data);
silc_buffer_free(auth);
return FALSE;
SilcConnAuth connauth = context;
SILC_LOG_DEBUG(("Protocol timeout"));
connauth->aborted = TRUE;
- silc_fsm_continue_sync(&connauth->fsm);
+ silc_fsm_continue_sync(connauth->fsm);
}
/* SKR callback */
connauth->public_keys = results;
connauth->skr_status = status;
- SILC_FSM_CALL_CONTINUE(&connauth->fsm);
+ SILC_FSM_CALL_CONTINUE(connauth->fsm);
+}
+
+/* FSM destructor */
+
+static void silc_connauth_fsm_destructor(SilcFSM fsm, void *fsm_context,
+ void *destructor_context)
+{
+ silc_fsm_free(fsm);
}
if (!connauth)
return NULL;
- if (!silc_fsm_init(&connauth->fsm, connauth, NULL, NULL, schedule)) {
+ connauth->fsm = silc_fsm_alloc(connauth, silc_connauth_fsm_destructor,
+ NULL, schedule);
+ if (!connauth->fsm) {
silc_connauth_free(connauth);
return NULL;
}
int payload_len = 0;
unsigned char *auth_data = NULL;
SilcUInt32 auth_data_len = 0;
+ SilcPacketFlags flags = 0;
SILC_LOG_DEBUG(("Start"));
return SILC_FSM_CONTINUE;
}
auth_data_len = connauth->auth_data_len;
+ flags = SILC_PACKET_FLAG_LONG_PAD;
break;
case SILC_AUTH_PUBLIC_KEY:
SILC_STR_END);
/* Send the packet */
- if (!silc_packet_send(connauth->ske->stream, SILC_PACKET_CONNECTION_AUTH, 0,
- packet->data, silc_buffer_len(packet))) {
+ if (!silc_packet_send(connauth->ske->stream, SILC_PACKET_CONNECTION_AUTH,
+ flags, packet->data, silc_buffer_len(packet))) {
/** Error sending packet */
silc_fsm_next(fsm, silc_connauth_st_initiator_failure);
return SILC_FSM_CONTINUE;
}
silc_packet_free(connauth->packet);
- /* Call completion callback */
- connauth->completion(connauth, connauth->success, connauth->context);
-
silc_packet_stream_unlink(connauth->ske->stream,
&silc_connauth_stream_cbs, connauth);
silc_schedule_task_del_by_context(silc_fsm_get_schedule(fsm), connauth);
+ /* Call completion callback */
+ connauth->completion(connauth, connauth->success, connauth->context);
+
return SILC_FSM_FINISH;
}
/* Start the protocol */
op = silc_async_alloc(silc_connauth_abort, NULL, connauth);
- silc_fsm_start(&connauth->fsm, silc_connauth_st_initiator_start);
+ silc_fsm_start(connauth->fsm, silc_connauth_st_initiator_start);
return op;
}
/* Start the protocol */
op = silc_async_alloc(silc_connauth_abort, NULL, connauth);
- silc_fsm_start(&connauth->fsm, silc_connauth_st_responder_start);
+ silc_fsm_start(connauth->fsm, silc_connauth_st_responder_start);
return op;
}