X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fprotocol.c;h=da7bc07fb352423627398550db7c670bd609cb86;hb=386c883d8774999c6e74d7c6c37e52e4163a4cb1;hp=a6ced2c02a68f955bf5f2aadaac3d331259c3404;hpb=1780fdaeca19a2c8bea90ab8eabcd6c081a30ee6;p=silc.git diff --git a/lib/silcclient/protocol.c b/lib/silcclient/protocol.c index a6ced2c0..da7bc07f 100644 --- a/lib/silcclient/protocol.c +++ b/lib/silcclient/protocol.c @@ -29,8 +29,6 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth); SILC_TASK_CALLBACK(silc_client_protocol_key_exchange); SILC_TASK_CALLBACK(silc_client_protocol_rekey); -extern char *silc_version_string; - /* * Key Exhange protocol functions */ @@ -52,29 +50,57 @@ void silc_client_protocol_ke_send_packet(SilcSKE ske, packet->data, packet->len, TRUE); } -/* Callback that is called when we have received KE2 payload from +/* Public key verification callback. Called by the application. */ + +typedef struct { + SilcSKE ske; + SilcSKEVerifyCbCompletion completion; + void *completion_context; +} *VerifyKeyContext; + +static void silc_client_verify_key_cb(bool success, void *context) +{ + VerifyKeyContext verify = (VerifyKeyContext)context; + + SILC_LOG_DEBUG(("Start")); + + /* Call the completion callback back to the SKE */ + verify->completion(verify->ske, success ? SILC_SKE_STATUS_OK : + SILC_SKE_STATUS_UNSUPPORTED_PUBLIC_KEY, + verify->completion_context); + + silc_free(verify); +} + +/* Callback that is called when we have received KE payload from responder. We try to verify the public key now. */ -SilcSKEStatus silc_client_protocol_ke_verify_key(SilcSKE ske, - unsigned char *pk_data, - uint32 pk_len, - SilcSKEPKType pk_type, - void *context) +void silc_client_protocol_ke_verify_key(SilcSKE ske, + unsigned char *pk_data, + uint32 pk_len, + SilcSKEPKType pk_type, + void *context, + SilcSKEVerifyCbCompletion completion, + void *completion_context) { SilcProtocol protocol = (SilcProtocol)context; SilcClientKEInternalContext *ctx = (SilcClientKEInternalContext *)protocol->context; SilcClient client = (SilcClient)ctx->client; + VerifyKeyContext verify; SILC_LOG_DEBUG(("Start")); - /* Verify public key from user. */ - if (!client->ops->verify_public_key(client, ctx->sock->user_data, - ctx->sock->type, - pk_data, pk_len, pk_type)) - return SILC_SKE_STATUS_UNSUPPORTED_PUBLIC_KEY; + verify = silc_calloc(1, sizeof(*verify)); + verify->ske = ske; + verify->completion = completion; + verify->completion_context = completion_context; - return SILC_SKE_STATUS_OK; + /* Verify public key from user. */ + client->internal->ops->verify_public_key(client, ctx->sock->user_data, + ctx->sock->type, + pk_data, pk_len, pk_type, + silc_client_verify_key_cb, verify); } /* Sets the negotiated key material into use for particular connection. */ @@ -86,7 +112,8 @@ void silc_client_protocol_ke_set_keys(SilcSKE ske, SilcPKCS pkcs, SilcHash hash, SilcHmac hmac, - SilcSKEDiffieHellmanGroup group) + SilcSKEDiffieHellmanGroup group, + bool is_responder) { SilcClientConnection conn = (SilcClientConnection)sock->user_data; @@ -95,42 +122,43 @@ void silc_client_protocol_ke_set_keys(SilcSKE ske, /* Allocate cipher to be used in the communication */ silc_cipher_alloc(cipher->cipher->name, &conn->send_key); silc_cipher_alloc(cipher->cipher->name, &conn->receive_key); + silc_hmac_alloc((char *)silc_hmac_get_name(hmac), NULL, &conn->hmac_send); + silc_hmac_alloc((char *)silc_hmac_get_name(hmac), NULL, &conn->hmac_receive); - conn->send_key->cipher->set_key(conn->send_key->context, - keymat->send_enc_key, - keymat->enc_key_len); - conn->send_key->set_iv(conn->send_key, keymat->send_iv); - conn->receive_key->cipher->set_key(conn->receive_key->context, - keymat->receive_enc_key, - keymat->enc_key_len); - conn->receive_key->set_iv(conn->receive_key, keymat->receive_iv); - - /* Allocate PKCS to be used */ -#if 0 - /* XXX Do we ever need to allocate PKCS for the connection?? - If yes, we need to change KE protocol to get the initiators - public key. */ - silc_pkcs_alloc(pkcs->pkcs->name, &conn->public_Key); - silc_pkcs_set_public_key(conn->public_key, ske->ke2_payload->pk_data, - ske->ke2_payload->pk_len); -#endif + if (is_responder == TRUE) { + silc_cipher_set_key(conn->send_key, keymat->receive_enc_key, + keymat->enc_key_len); + silc_cipher_set_iv(conn->send_key, keymat->receive_iv); + silc_cipher_set_key(conn->receive_key, keymat->send_enc_key, + keymat->enc_key_len); + silc_cipher_set_iv(conn->receive_key, keymat->send_iv); + silc_hmac_set_key(conn->hmac_send, keymat->receive_hmac_key, + keymat->hmac_key_len); + silc_hmac_set_key(conn->hmac_receive, keymat->send_hmac_key, + keymat->hmac_key_len); + } else { + silc_cipher_set_key(conn->send_key, keymat->send_enc_key, + keymat->enc_key_len); + silc_cipher_set_iv(conn->send_key, keymat->send_iv); + silc_cipher_set_key(conn->receive_key, keymat->receive_enc_key, + keymat->enc_key_len); + silc_cipher_set_iv(conn->receive_key, keymat->receive_iv); + silc_hmac_set_key(conn->hmac_send, keymat->send_hmac_key, + keymat->hmac_key_len); + silc_hmac_set_key(conn->hmac_receive, keymat->receive_hmac_key, + keymat->hmac_key_len); + } + /* Rekey stuff */ conn->rekey = silc_calloc(1, sizeof(*conn->rekey)); - conn->rekey->send_enc_key = - silc_calloc(keymat->enc_key_len / 8, - sizeof(*conn->rekey->send_enc_key)); - memcpy(conn->rekey->send_enc_key, - keymat->send_enc_key, keymat->enc_key_len / 8); + conn->rekey->send_enc_key = silc_memdup(keymat->send_enc_key, + keymat->enc_key_len / 8); conn->rekey->enc_key_len = keymat->enc_key_len / 8; if (ske->start_payload->flags & SILC_SKE_SP_FLAG_PFS) conn->rekey->pfs = TRUE; conn->rekey->ske_group = silc_ske_group_get_number(group); - /* Save HMAC key to be used in the communication. */ - silc_hmac_alloc(hmac->hmac->name, NULL, &conn->hmac); - silc_hmac_set_key(conn->hmac, keymat->hmac_key, keymat->hmac_key_len); - /* Save the HASH function */ silc_hash_alloc(hash->hash->name, &conn->hash); } @@ -138,11 +166,13 @@ void silc_client_protocol_ke_set_keys(SilcSKE ske, /* Checks the version string of the server. */ SilcSKEStatus silc_ske_check_version(SilcSKE ske, unsigned char *version, - uint32 len) + uint32 len, void *context) { SilcClientConnection conn = (SilcClientConnection)ske->sock->user_data; SilcClient client = (SilcClient)ske->user_data; SilcSKEStatus status = SILC_SKE_STATUS_OK; + char *cp; + int maj = 0, min = 0, build = 0, maj2 = 0, min2 = 0, build2 = 0; /* Check for initial version string */ if (!strstr(version, "SILC-1.0-")) @@ -150,19 +180,96 @@ SilcSKEStatus silc_ske_check_version(SilcSKE ske, unsigned char *version, /* Check software version */ - if (len < strlen(silc_version_string)) + cp = version + 9; + if (!cp) + status = SILC_SKE_STATUS_BAD_VERSION; + + maj = atoi(cp); + cp = strchr(cp, '.'); + if (cp) { + min = atoi(cp + 1); + cp++; + } + cp = strchr(cp, '.'); + if (cp) + build = atoi(cp + 1); + + cp = client->internal->silc_client_version + 9; + if (!cp) + status = SILC_SKE_STATUS_BAD_VERSION; + + maj2 = atoi(cp); + cp = strchr(cp, '.'); + if (cp) { + min2 = atoi(cp + 1); + cp++; + } + cp = strchr(cp, '.'); + if (cp) + build2 = atoi(cp + 1); + + if (maj != maj2) status = SILC_SKE_STATUS_BAD_VERSION; - /* XXX for now there is no other tests due to the abnormal version - string that is used */ + /* XXX backward support for 0.6.1 */ + if (maj == 0 && min == 6 && build < 2) + ske->backward_version = 1; if (status != SILC_SKE_STATUS_OK) - client->ops->say(client, conn, - "We don't support server version `%s'", version); + client->internal->ops->say(client, conn, SILC_CLIENT_MESSAGE_AUDIT, + "We don't support server version `%s'", + version); return status; } +/* Callback that is called by the SKE to indicate that it is safe to + continue the execution of the protocol. Is given as argument to the + silc_ske_initiator_finish or silc_ske_responder_phase_2 functions. + This is called due to the fact that the public key verification + process is asynchronous and we must not continue the protocl until + the public key has been verified and this callback is called. */ + +static void silc_client_protocol_ke_continue(SilcSKE ske, + void *context) +{ + SilcProtocol protocol = (SilcProtocol)context; + SilcClientKEInternalContext *ctx = + (SilcClientKEInternalContext *)protocol->context; + SilcClient client = (SilcClient)ctx->client; + SilcClientConnection conn = ctx->sock->user_data; + + SILC_LOG_DEBUG(("Start")); + + if (ske->status != SILC_SKE_STATUS_OK) { + /* Call failure client operation */ + client->internal->ops->failure(client, conn, protocol, + (void *)ske->status); + protocol->state = SILC_PROTOCOL_STATE_ERROR; + silc_protocol_execute(protocol, client->schedule, 0, 0); + return; + } + + /* Send Ok to the other end. We will end the protocol as server + sends Ok to us when we will take the new keys into use. Do this + if we are initiator. This is happens when this callback was sent + to silc_ske_initiator_finish function. */ + if (ctx->responder == FALSE) { + silc_ske_end(ctx->ske); + + /* End the protocol on the next round */ + protocol->state = SILC_PROTOCOL_STATE_END; + } + + /* Advance protocol state and call the next state if we are responder. + This happens when this callback was sent to silc_ske_responder_phase_2 + function. */ + if (ctx->responder == TRUE) { + protocol->state++; + silc_protocol_execute(protocol, client->schedule, 0, 100000); + } +} + /* Performs key exchange protocol. This is used for both initiator and responder key exchange. This may be called recursively. */ @@ -173,7 +280,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) (SilcClientKEInternalContext *)protocol->context; SilcClient client = (SilcClient)ctx->client; SilcClientConnection conn = ctx->sock->user_data; - SilcSKEStatus status = 0; + SilcSKEStatus status = SILC_SKE_STATUS_OK; SILC_LOG_DEBUG(("Start")); @@ -189,34 +296,40 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) SilcSKE ske; /* Allocate Key Exchange object */ - ske = silc_ske_alloc(); - ctx->ske = ske; - ske->rng = client->rng; - ske->user_data = (void *)client; + ctx->ske = ske = silc_ske_alloc(client->rng, client); + + silc_ske_set_callbacks(ske, ctx->send_packet, NULL, + ctx->verify, + silc_client_protocol_ke_continue, + silc_ske_check_version, + context); if (ctx->responder == TRUE) { /* Start the key exchange by processing the received security properties packet from initiator. */ - status = silc_ske_responder_start(ske, ctx->rng, ctx->sock, - silc_version_string, - ctx->packet->buffer, TRUE, - NULL, NULL); + status = + silc_ske_responder_start(ske, ctx->rng, ctx->sock, + client->internal->silc_client_version, + ctx->packet->buffer, TRUE); } else { SilcSKEStartPayload *start_payload; /* Assemble security properties. */ - silc_ske_assemble_security_properties(ske, SILC_SKE_SP_FLAG_NONE, - silc_version_string, - &start_payload); + silc_ske_assemble_security_properties( + ske, SILC_SKE_SP_FLAG_MUTUAL, + client->internal->silc_client_version, + &start_payload); /* Start the key exchange by sending our security properties to the remote end. */ status = silc_ske_initiator_start(ske, ctx->rng, ctx->sock, - start_payload, - ctx->send_packet, - context); + start_payload); } + /* Return now if the procedure is pending */ + if (status == SILC_SKE_STATUS_PENDING) + return; + if (status != SILC_SKE_STATUS_OK) { SILC_LOG_WARNING(("Error (type %d) during Key Exchange protocol", status)); @@ -224,14 +337,14 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) status)); protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0); + silc_protocol_execute(protocol, client->schedule, 0, 0); return; } /* Advance protocol state and call the next state if we are responder */ protocol->state++; if (ctx->responder == TRUE) - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 100000); + silc_protocol_execute(protocol, client->schedule, 0, 100000); } break; case 2: @@ -241,18 +354,13 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) */ if (ctx->responder == TRUE) { /* Sends the selected security properties to the initiator. */ - status = - silc_ske_responder_phase_1(ctx->ske, - ctx->ske->start_payload, - ctx->send_packet, - context); + status = silc_ske_responder_phase_1(ctx->ske); } else { /* Call Phase-1 function. This processes the Key Exchange Start paylaod reply we just got from the responder. The callback function will receive the processed payload where we will save it. */ - status = silc_ske_initiator_phase_1(ctx->ske, ctx->packet->buffer, - NULL, NULL); + status = silc_ske_initiator_phase_1(ctx->ske, ctx->packet->buffer); } if (status != SILC_SKE_STATUS_OK) { @@ -262,14 +370,14 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) status)); protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0); + silc_protocol_execute(protocol, client->schedule, 0, 0); return; } /* Advance protocol state and call next state if we are initiator */ protocol->state++; if (ctx->responder == FALSE) - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 100000); + silc_protocol_execute(protocol, client->schedule, 0, 100000); } break; case 3: @@ -280,9 +388,9 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) if (ctx->responder == TRUE) { /* Process the received Key Exchange 1 Payload packet from the initiator. This also creates our parts of the Diffie - Hellman algorithm. */ - status = silc_ske_responder_phase_2(ctx->ske, ctx->packet->buffer, - ctx->verify, context, NULL, NULL); + Hellman algorithm. The silc_client_protocol_ke_continue will + be called after the public key has been verified. */ + status = silc_ske_responder_phase_2(ctx->ske, ctx->packet->buffer); } else { /* Call the Phase-2 function. This creates Diffie Hellman key exchange parameters and sends our public part inside @@ -290,10 +398,14 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) status = silc_ske_initiator_phase_2(ctx->ske, client->public_key, client->private_key, - ctx->send_packet, - context); + SILC_SKE_PK_TYPE_SILC); + protocol->state++; } + /* Return now if the procedure is pending */ + if (status == SILC_SKE_STATUS_PENDING) + return; + if (status != SILC_SKE_STATUS_OK) { SILC_LOG_WARNING(("Error (type %d) during Key Exchange protocol", status)); @@ -301,14 +413,9 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) status)); protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0); + silc_protocol_execute(protocol, client->schedule, 0, 0); return; } - - /* Advance protocol state and call the next state if we are responder */ - protocol->state++; - if (ctx->responder == TRUE) - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 100000); } break; case 4: @@ -322,40 +429,37 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) status = silc_ske_responder_finish(ctx->ske, client->public_key, client->private_key, - SILC_SKE_PK_TYPE_SILC, - ctx->send_packet, - context); - status = 0; + SILC_SKE_PK_TYPE_SILC); + + /* End the protocol on the next round */ + protocol->state = SILC_PROTOCOL_STATE_END; } else { /* Finish the protocol. This verifies the Key Exchange 2 payload - sent by responder. */ - status = silc_ske_initiator_finish(ctx->ske, ctx->packet->buffer, - ctx->verify, context, NULL, NULL); + sent by responder. The silc_client_protocol_ke_continue will + be called after the public key has been verified. */ + status = silc_ske_initiator_finish(ctx->ske, ctx->packet->buffer); } - if (status != SILC_SKE_STATUS_OK) { + /* Return now if the procedure is pending */ + if (status == SILC_SKE_STATUS_PENDING) + return; + if (status != SILC_SKE_STATUS_OK) { if (status == SILC_SKE_STATUS_UNSUPPORTED_PUBLIC_KEY) { - client->ops->say(client, conn, - "Received unsupported server %s public key", - ctx->sock->hostname); + client->internal->ops->say( + client, conn, SILC_CLIENT_MESSAGE_AUDIT, + "Received unsupported server %s public key", + ctx->sock->hostname); } else { - client->ops->say(client, conn, + client->internal->ops->say( + client, conn, SILC_CLIENT_MESSAGE_AUDIT, "Error during key exchange protocol with server %s", ctx->sock->hostname); } protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0); + silc_protocol_execute(protocol, client->schedule, 0, 0); return; } - - /* Send Ok to the other end. We will end the protocol as server - sends Ok to us when we will take the new keys into use. */ - if (ctx->responder == FALSE) - silc_ske_end(ctx->ske, ctx->send_packet, context); - - /* End the protocol on the next round */ - protocol->state = SILC_PROTOCOL_STATE_END; } break; @@ -374,7 +478,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) keymat); if (status != SILC_SKE_STATUS_OK) { protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 300000); + silc_protocol_execute(protocol, client->schedule, 0, 300000); silc_ske_free_key_material(keymat); return; } @@ -383,17 +487,17 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) /* Send Ok to the other end if we are responder. If we are initiator we have sent this already. */ if (ctx->responder == TRUE) - silc_ske_end(ctx->ske, ctx->send_packet, context); + silc_ske_end(ctx->ske); /* Unregister the timeout task since the protocol has ended. This was the timeout task to be executed if the protocol is not completed fast enough. */ if (ctx->timeout_task) - silc_task_unregister(client->timeout_queue, ctx->timeout_task); + silc_schedule_task_del(client->schedule, ctx->timeout_task); /* Protocol has ended, call the final callback */ if (protocol->final_callback) - protocol->execute_final(client->timeout_queue, 0, protocol, fd); + silc_protocol_execute_final(protocol, client->schedule); else silc_protocol_free(protocol); } @@ -405,12 +509,11 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) */ /* Send abort notification */ - silc_ske_abort(ctx->ske, ctx->ske->status, - ctx->send_packet, context); + silc_ske_abort(ctx->ske, ctx->ske->status); /* On error the final callback is always called. */ if (protocol->final_callback) - protocol->execute_final(client->timeout_queue, 0, protocol, fd); + silc_protocol_execute_final(protocol, client->schedule); else silc_protocol_free(protocol); break; @@ -424,11 +527,11 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) This was the timeout task to be executed if the protocol is not completed fast enough. */ if (ctx->timeout_task) - silc_task_unregister(client->timeout_queue, ctx->timeout_task); + silc_schedule_task_del(client->schedule, ctx->timeout_task); /* On error the final callback is always called. */ if (protocol->final_callback) - protocol->execute_final(client->timeout_queue, 0, protocol, fd); + silc_protocol_execute_final(protocol, client->schedule); else silc_protocol_free(protocol); break; @@ -443,7 +546,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange) static int silc_client_get_public_key_auth(SilcClient client, - char *filepath, + SilcClientConnection conn, unsigned char *auth_data, uint32 *auth_data_len, SilcSKE ske) @@ -451,18 +554,9 @@ silc_client_get_public_key_auth(SilcClient client, int len; SilcPKCS pkcs; SilcBuffer auth; - SilcPublicKey pub_key; - if (!silc_pkcs_load_public_key(filepath,&pub_key, SILC_PKCS_FILE_PEM)) - if (!silc_pkcs_load_public_key(filepath, &pub_key, SILC_PKCS_FILE_BIN)) - return FALSE; - - silc_pkcs_alloc(pub_key->name, &pkcs); - if (!silc_pkcs_public_key_set(pkcs, pub_key)) { - silc_pkcs_free(pkcs); - silc_pkcs_public_key_free(pub_key); - return FALSE; - } + /* Use our default key */ + pkcs = client->pkcs; /* Make the authentication data. Protocol says it is HASH plus KE Start Payload. */ @@ -475,19 +569,52 @@ silc_client_get_public_key_auth(SilcClient client, ske->start_payload_copy->len), SILC_STR_END); - if (silc_pkcs_sign(pkcs, auth->data, auth->len, auth_data, auth_data_len)) { - silc_pkcs_free(pkcs); + if (silc_pkcs_sign_with_hash(pkcs, ske->prop->hash, auth->data, + auth->len, auth_data, auth_data_len)) { silc_buffer_free(auth); - silc_pkcs_public_key_free(pub_key); return TRUE; } - silc_pkcs_free(pkcs); silc_buffer_free(auth); - silc_pkcs_public_key_free(pub_key); return FALSE; } +/* Continues the connection authentication protocol. This funtion may + be called directly or used as SilcAskPassphrase callback. */ + +static void +silc_client_conn_auth_continue(unsigned char *auth_data, + uint32 auth_data_len, void *context) +{ + SilcProtocol protocol = (SilcProtocol)context; + SilcClientConnAuthInternalContext *ctx = + (SilcClientConnAuthInternalContext *)protocol->context; + SilcClient client = (SilcClient)ctx->client; + SilcBuffer packet; + int payload_len = 0; + + SILC_LOG_DEBUG(("Start")); + + payload_len = 4 + auth_data_len; + packet = silc_buffer_alloc(payload_len); + silc_buffer_pull_tail(packet, SILC_BUFFER_END(packet)); + silc_buffer_format(packet, + SILC_STR_UI_SHORT(payload_len), + SILC_STR_UI_SHORT(SILC_SOCKET_TYPE_CLIENT), + SILC_STR_UI_XNSTRING(auth_data, auth_data_len), + SILC_STR_END); + + /* Send the packet to server */ + silc_client_packet_send(client, ctx->sock, + SILC_PACKET_CONNECTION_AUTH, + NULL, 0, NULL, NULL, + packet->data, packet->len, TRUE); + silc_buffer_free(packet); + + /* Next state is end of protocol */ + protocol->state = SILC_PROTOCOL_STATE_END; +} + SILC_TASK_CALLBACK(silc_client_protocol_connection_auth) { SilcProtocol protocol = (SilcProtocol)context; @@ -508,10 +635,9 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth) * Start protocol. We send authentication data to the server * to be authenticated. */ - SilcBuffer packet; - int payload_len = 0; unsigned char *auth_data = NULL; uint32 auth_data_len = 0; + unsigned char sign[1024]; switch(ctx->auth_meth) { case SILC_AUTH_NONE: @@ -526,50 +652,32 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth) break; } - client->ops->say(client, conn, - "Password authentication required by server %s", - ctx->sock->hostname); - auth_data = client->ops->ask_passphrase(client, conn); - auth_data_len = strlen(auth_data); + client->internal->ops->say( + client, conn, SILC_CLIENT_MESSAGE_INFO, + "Password authentication required by server %s", + ctx->sock->hostname); + client->internal->ops->ask_passphrase(client, conn, + silc_client_conn_auth_continue, + protocol); + return; break; case SILC_AUTH_PUBLIC_KEY: - { - unsigned char sign[1024]; - + if (!ctx->auth_data) { /* Public key authentication */ - silc_client_get_public_key_auth(client, ctx->auth_data, - sign, &auth_data_len, + silc_client_get_public_key_auth(client, conn, sign, &auth_data_len, ctx->ske); - auth_data = silc_calloc(auth_data_len, sizeof(*auth_data)); - memcpy(auth_data, sign, auth_data_len); - break; + auth_data = sign; + } else { + auth_data = ctx->auth_data; + auth_data_len = ctx->auth_data_len; } + + break; } - payload_len = 4 + auth_data_len; - packet = silc_buffer_alloc(payload_len); - silc_buffer_pull_tail(packet, SILC_BUFFER_END(packet)); - silc_buffer_format(packet, - SILC_STR_UI_SHORT(payload_len), - SILC_STR_UI_SHORT(SILC_SOCKET_TYPE_CLIENT), - SILC_STR_UI_XNSTRING(auth_data, auth_data_len), - SILC_STR_END); - - /* Send the packet to server */ - silc_client_packet_send(client, ctx->sock, - SILC_PACKET_CONNECTION_AUTH, - NULL, 0, NULL, NULL, - packet->data, packet->len, TRUE); - - if (auth_data) { - memset(auth_data, 0, auth_data_len); - silc_free(auth_data); - } - silc_buffer_free(packet); - - /* Next state is end of protocol */ - protocol->state = SILC_PROTOCOL_STATE_END; + silc_client_conn_auth_continue(auth_data, + auth_data_len, protocol); } break; @@ -581,7 +689,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth) /* Protocol has ended, call the final callback */ if (protocol->final_callback) - protocol->execute_final(client->timeout_queue, 0, protocol, fd); + silc_protocol_execute_final(protocol, client->schedule); else silc_protocol_free(protocol); } @@ -603,7 +711,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth) /* On error the final callback is always called. */ if (protocol->final_callback) - protocol->execute_final(client->timeout_queue, 0, protocol, fd); + silc_protocol_execute_final(protocol, client->schedule); else silc_protocol_free(protocol); } @@ -615,7 +723,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth) /* On error the final callback is always called. */ if (protocol->final_callback) - protocol->execute_final(client->timeout_queue, 0, protocol, fd); + silc_protocol_execute_final(protocol, client->schedule); else silc_protocol_free(protocol); break; @@ -635,51 +743,66 @@ static void silc_client_protocol_rekey_validate(SilcClient client, SilcClientRekeyInternalContext *ctx, SilcSocketConnection sock, - SilcSKEKeyMaterial *keymat) + SilcSKEKeyMaterial *keymat, + bool send) { SilcClientConnection conn = (SilcClientConnection)sock->user_data; if (ctx->responder == TRUE) { - silc_cipher_set_key(conn->send_key, keymat->receive_enc_key, - keymat->enc_key_len); - silc_cipher_set_iv(conn->send_key, keymat->receive_iv); - silc_cipher_set_key(conn->receive_key, keymat->send_enc_key, - keymat->enc_key_len); - silc_cipher_set_iv(conn->receive_key, keymat->send_iv); + if (send) { + silc_cipher_set_key(conn->send_key, keymat->receive_enc_key, + keymat->enc_key_len); + silc_cipher_set_iv(conn->send_key, keymat->receive_iv); + silc_hmac_set_key(conn->hmac_send, keymat->receive_hmac_key, + keymat->hmac_key_len); + } else { + silc_cipher_set_key(conn->receive_key, keymat->send_enc_key, + keymat->enc_key_len); + silc_cipher_set_iv(conn->receive_key, keymat->send_iv); + silc_hmac_set_key(conn->hmac_receive, keymat->send_hmac_key, + keymat->hmac_key_len); + } } else { - silc_cipher_set_key(conn->send_key, keymat->send_enc_key, - keymat->enc_key_len); - silc_cipher_set_iv(conn->send_key, keymat->send_iv); - silc_cipher_set_key(conn->receive_key, keymat->receive_enc_key, - keymat->enc_key_len); - silc_cipher_set_iv(conn->receive_key, keymat->receive_iv); + if (send) { + silc_cipher_set_key(conn->send_key, keymat->send_enc_key, + keymat->enc_key_len); + silc_cipher_set_iv(conn->send_key, keymat->send_iv); + silc_hmac_set_key(conn->hmac_send, keymat->send_hmac_key, + keymat->hmac_key_len); + } else { + silc_cipher_set_key(conn->receive_key, keymat->receive_enc_key, + keymat->enc_key_len); + silc_cipher_set_iv(conn->receive_key, keymat->receive_iv); + silc_hmac_set_key(conn->hmac_receive, keymat->receive_hmac_key, + keymat->hmac_key_len); + } } - silc_hmac_set_key(conn->hmac, keymat->hmac_key, keymat->hmac_key_len); - /* Save the current sending encryption key */ - memset(conn->rekey->send_enc_key, 0, conn->rekey->enc_key_len); - silc_free(conn->rekey->send_enc_key); - conn->rekey->send_enc_key = - silc_calloc(keymat->enc_key_len / 8, - sizeof(*conn->rekey->send_enc_key)); - memcpy(conn->rekey->send_enc_key, keymat->send_enc_key, - keymat->enc_key_len / 8); - conn->rekey->enc_key_len = keymat->enc_key_len / 8; + if (!send) { + memset(conn->rekey->send_enc_key, 0, conn->rekey->enc_key_len); + silc_free(conn->rekey->send_enc_key); + conn->rekey->send_enc_key = silc_memdup(keymat->send_enc_key, + keymat->enc_key_len / 8); + conn->rekey->enc_key_len = keymat->enc_key_len / 8; + } } /* This function actually re-generates (when not using PFS) the keys and takes them into use. */ -void silc_client_protocol_rekey_generate(SilcClient client, - SilcClientRekeyInternalContext *ctx) +static void +silc_client_protocol_rekey_generate(SilcClient client, + SilcClientRekeyInternalContext *ctx, + bool send) { SilcClientConnection conn = (SilcClientConnection)ctx->sock->user_data; SilcSKEKeyMaterial *keymat; uint32 key_len = silc_cipher_get_key_len(conn->send_key); uint32 hash_len = conn->hash->hash->hash_len; - SILC_LOG_DEBUG(("Generating new session keys (no PFS)")); + SILC_LOG_DEBUG(("Generating new %s session keys (no PFS)", + send ? "sending" : "receiving")); /* Generate the new key */ keymat = silc_calloc(1, sizeof(*keymat)); @@ -689,7 +812,7 @@ void silc_client_protocol_rekey_generate(SilcClient client, conn->hash, keymat); /* Set the keys into use */ - silc_client_protocol_rekey_validate(client, ctx, ctx->sock, keymat); + silc_client_protocol_rekey_validate(client, ctx, ctx->sock, keymat, send); silc_ske_free_key_material(keymat); } @@ -697,9 +820,10 @@ void silc_client_protocol_rekey_generate(SilcClient client, /* This function actually re-generates (with PFS) the keys and takes them into use. */ -void +static void silc_client_protocol_rekey_generate_pfs(SilcClient client, - SilcClientRekeyInternalContext *ctx) + SilcClientRekeyInternalContext *ctx, + bool send) { SilcClientConnection conn = (SilcClientConnection)ctx->sock->user_data; SilcSKEKeyMaterial *keymat; @@ -708,7 +832,8 @@ silc_client_protocol_rekey_generate_pfs(SilcClient client, unsigned char *tmpbuf; uint32 klen; - SILC_LOG_DEBUG(("Generating new session keys (with PFS)")); + SILC_LOG_DEBUG(("Generating new %s session keys (with PFS)", + send ? "sending" : "receiving")); /* Encode KEY to binary data */ tmpbuf = silc_mp_mp2bin(ctx->ske->KEY, 0, &klen); @@ -719,7 +844,7 @@ silc_client_protocol_rekey_generate_pfs(SilcClient client, conn->hash, keymat); /* Set the keys into use */ - silc_client_protocol_rekey_validate(client, ctx, ctx->sock, keymat); + silc_client_protocol_rekey_validate(client, ctx, ctx->sock, keymat, send); memset(tmpbuf, 0, klen); silc_free(tmpbuf); @@ -741,8 +866,8 @@ silc_client_protocol_rekey_send_packet(SilcSKE ske, SilcClient client = (SilcClient)ctx->client; /* Send the packet immediately */ - silc_client_packet_send_flush(client, ctx->sock, type, NULL, 0, NULL, NULL, - packet->data, packet->len); + silc_client_packet_send(client, ctx->sock, type, NULL, 0, NULL, NULL, + packet->data, packet->len, FALSE); } /* Performs re-key as defined in the SILC protocol specification. */ @@ -784,40 +909,46 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey) if (ctx->packet->type != SILC_PACKET_KEY_EXCHANGE_1) { /* Error in protocol */ protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, protocol, fd, - 0, 300000); + silc_protocol_execute(protocol, client->schedule, 0, 300000); } - ctx->ske = silc_ske_alloc(); - ctx->ske->rng = client->rng; + ctx->ske = silc_ske_alloc(client->rng, client); ctx->ske->prop = silc_calloc(1, sizeof(*ctx->ske->prop)); - silc_ske_get_group_by_number(conn->rekey->ske_group, + silc_ske_group_get_by_number(conn->rekey->ske_group, &ctx->ske->prop->group); - status = silc_ske_responder_phase_2(ctx->ske, ctx->packet->buffer, - NULL, NULL, NULL, NULL); + silc_ske_set_callbacks(ctx->ske, + silc_client_protocol_rekey_send_packet, + NULL, NULL, NULL, silc_ske_check_version, + context); + + status = silc_ske_responder_phase_2(ctx->ske, ctx->packet->buffer); if (status != SILC_SKE_STATUS_OK) { SILC_LOG_WARNING(("Error (type %d) during Re-key (PFS)", status)); protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, - protocol, fd, 0, 300000); + silc_protocol_execute(protocol, client->schedule, 0, 300000); return; } /* Advance the protocol state */ protocol->state++; - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0); + silc_protocol_execute(protocol, client->schedule, 0, 0); } else { /* * Do normal and simple re-key. */ /* Send the REKEY_DONE to indicate we will take new keys into use */ - silc_client_packet_send_flush(client, ctx->sock, - SILC_PACKET_REKEY_DONE, - NULL, 0, NULL, NULL, NULL, 0); + silc_client_packet_send(client, ctx->sock, + SILC_PACKET_REKEY_DONE, + NULL, 0, NULL, NULL, NULL, 0, FALSE); + + /* After we send REKEY_DONE we must set the sending encryption + key to the new key since all packets after this packet must + encrypted with the new key. */ + silc_client_protocol_rekey_generate(client, ctx, TRUE); /* The protocol ends in next stage. */ protocol->state = SILC_PROTOCOL_STATE_END; @@ -829,32 +960,31 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey) */ /* Start the re-key by sending the REKEY packet */ - silc_client_packet_send_flush(client, ctx->sock, SILC_PACKET_REKEY, - NULL, 0, NULL, NULL, NULL, 0); + silc_client_packet_send(client, ctx->sock, SILC_PACKET_REKEY, + NULL, 0, NULL, NULL, NULL, 0, FALSE); if (ctx->pfs == TRUE) { /* * Use Perfect Forward Secrecy, ie. negotiate the key material * using the SKE protocol. */ - ctx->ske = silc_ske_alloc(); - ctx->ske->rng = client->rng; + ctx->ske = silc_ske_alloc(client->rng, client); ctx->ske->prop = silc_calloc(1, sizeof(*ctx->ske->prop)); - silc_ske_get_group_by_number(conn->rekey->ske_group, + silc_ske_group_get_by_number(conn->rekey->ske_group, &ctx->ske->prop->group); - status = - silc_ske_initiator_phase_2(ctx->ske, NULL, NULL, - silc_client_protocol_rekey_send_packet, - context); - + silc_ske_set_callbacks(ctx->ske, + silc_client_protocol_rekey_send_packet, + NULL, NULL, NULL, silc_ske_check_version, + context); + + status = silc_ske_initiator_phase_2(ctx->ske, NULL, NULL, 0); if (status != SILC_SKE_STATUS_OK) { SILC_LOG_WARNING(("Error (type %d) during Re-key (PFS)", status)); protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, - protocol, fd, 0, 300000); + silc_protocol_execute(protocol, client->schedule, 0, 300000); return; } @@ -867,9 +997,14 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey) /* Send the REKEY_DONE to indicate we will take new keys into use now. */ - silc_client_packet_send_flush(client, ctx->sock, - SILC_PACKET_REKEY_DONE, - NULL, 0, NULL, NULL, NULL, 0); + silc_client_packet_send(client, ctx->sock, + SILC_PACKET_REKEY_DONE, + NULL, 0, NULL, NULL, NULL, 0, FALSE); + + /* After we send REKEY_DONE we must set the sending encryption + key to the new key since all packets after this packet must + encrypted with the new key. */ + silc_client_protocol_rekey_generate(client, ctx, TRUE); /* The protocol ends in next stage. */ protocol->state = SILC_PROTOCOL_STATE_END; @@ -888,19 +1023,15 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey) * Send our KE packe to the initiator now that we've processed * the initiator's KE packet. */ - status = - silc_ske_responder_finish(ctx->ske, NULL, NULL, - SILC_SKE_PK_TYPE_SILC, - silc_client_protocol_rekey_send_packet, - context); + status = silc_ske_responder_finish(ctx->ske, NULL, NULL, + SILC_SKE_PK_TYPE_SILC); if (status != SILC_SKE_STATUS_OK) { SILC_LOG_WARNING(("Error (type %d) during Re-key (PFS)", status)); protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, - protocol, fd, 0, 300000); + silc_protocol_execute(protocol, client->schedule, 0, 300000); return; } } @@ -913,18 +1044,16 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey) if (ctx->packet->type != SILC_PACKET_KEY_EXCHANGE_2) { /* Error in protocol */ protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 300000); + silc_protocol_execute(protocol, client->schedule, 0, 300000); } - status = silc_ske_initiator_finish(ctx->ske, ctx->packet->buffer, - NULL, NULL, NULL, NULL); + status = silc_ske_initiator_finish(ctx->ske, ctx->packet->buffer); if (status != SILC_SKE_STATUS_OK) { SILC_LOG_WARNING(("Error (type %d) during Re-key (PFS)", status)); protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, - protocol, fd, 0, 300000); + silc_protocol_execute(protocol, client->schedule, 0, 300000); return; } } @@ -932,9 +1061,14 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey) /* Send the REKEY_DONE to indicate we will take new keys into use now. */ - silc_client_packet_send_flush(client, ctx->sock, SILC_PACKET_REKEY_DONE, - NULL, 0, NULL, NULL, NULL, 0); + silc_client_packet_send(client, ctx->sock, SILC_PACKET_REKEY_DONE, + NULL, 0, NULL, NULL, NULL, 0, FALSE); + /* After we send REKEY_DONE we must set the sending encryption + key to the new key since all packets after this packet must + encrypted with the new key. */ + silc_client_protocol_rekey_generate_pfs(client, ctx, TRUE); + /* The protocol ends in next stage. */ protocol->state = SILC_PROTOCOL_STATE_END; break; @@ -947,12 +1081,16 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey) if (ctx->packet->type != SILC_PACKET_REKEY_DONE) { /* Error in protocol */ protocol->state = SILC_PROTOCOL_STATE_ERROR; - protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0); + silc_protocol_execute(protocol, client->schedule, 0, 0); } + /* We received the REKEY_DONE packet and all packets after this is + encrypted with the new key so set the decryption key to the new key */ + silc_client_protocol_rekey_generate(client, ctx, FALSE); + /* Protocol has ended, call the final callback */ if (protocol->final_callback) - protocol->execute_final(client->timeout_queue, 0, protocol, fd); + silc_protocol_execute_final(protocol, client->schedule); else silc_protocol_free(protocol); break; @@ -964,14 +1102,12 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey) if (ctx->pfs == TRUE) { /* Send abort notification */ - silc_ske_abort(ctx->ske, ctx->ske->status, - silc_client_protocol_ke_send_packet, - context); + silc_ske_abort(ctx->ske, ctx->ske->status); } /* On error the final callback is always called. */ if (protocol->final_callback) - protocol->execute_final(client->timeout_queue, 0, protocol, fd); + silc_protocol_execute_final(protocol, client->schedule); else silc_protocol_free(protocol); break; @@ -983,7 +1119,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey) /* On error the final callback is always called. */ if (protocol->final_callback) - protocol->execute_final(client->timeout_queue, 0, protocol, fd); + silc_protocol_execute_final(protocol, client->schedule); else silc_protocol_free(protocol); break;