X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-core.c;h=421fe6fc5874bd4ef432666f32c78bf229c94d53;hp=f1410e7f3e9cdd1f0a03a45f8b32578de71fd703;hb=413da0f8686910f5e627393157566ae729ca99c4;hpb=dbb05dc8bb36fe50bf04e54d81a38aa1bdb6a7d5 diff --git a/apps/irssi/src/silc/core/silc-core.c b/apps/irssi/src/silc/core/silc-core.c index f1410e7f..421fe6fc 100644 --- a/apps/irssi/src/silc/core/silc-core.c +++ b/apps/irssi/src/silc/core/silc-core.c @@ -29,7 +29,6 @@ #include "silc-channels.h" #include "silc-queries.h" #include "silc-nicklist.h" -#include "silcversion.h" #include "signals.h" #include "levels.h" @@ -53,6 +52,9 @@ extern bool silc_debug_hexdump; void silc_expandos_init(void); void silc_expandos_deinit(void); +void silc_lag_init(void); +void silc_lag_deinit(void); + static int my_silc_scheduler(void) { silc_client_run_one(silc_client); @@ -258,16 +260,6 @@ void silc_opt_callback(poptContext con, const struct poptOption *opt, const char *arg, void *data) { - if (strcmp(opt->longName, "show-key") == 0) { - /* Dump the key */ - silc_cipher_register_default(); - silc_pkcs_register_default(); - silc_hash_register_default(); - silc_hmac_register_default(); - silc_show_public_key((char *)arg); - exit(0); - } - if (strcmp(opt->longName, "list-ciphers") == 0) { silc_cipher_register_default(); silc_client_list_ciphers(); @@ -311,19 +303,58 @@ void silc_opt_callback(poptContext con, silc_hash_register_default(); silc_hmac_register_default(); silc_create_key_pair(opt_pkcs, opt_bits, NULL, NULL, NULL, - NULL, NULL, NULL, TRUE); + NULL, NULL, NULL, NULL, TRUE); + exit(0); + } + + if (strcmp(opt->longName, "passphrase-change") == 0) { + /* Change the passphrase of the private key file */ + silc_cipher_register_default(); + silc_pkcs_register_default(); + silc_hash_register_default(); + silc_hmac_register_default(); + silc_change_private_key_passphrase(arg, NULL, NULL); + exit(0); + } + + if (strcmp(opt->longName, "show-key") == 0) { + /* Dump the key */ + silc_cipher_register_default(); + silc_pkcs_register_default(); + silc_hash_register_default(); + silc_hmac_register_default(); + silc_show_public_key((char *)arg); exit(0); } } +static void sig_init_finished(void) +{ + /* Check ~/.silc directory and public and private keys */ + if (!silc_client_check_silc_dir()) { + idletag = -1; + exit(1); + } + + /* Load public and private key */ + if (!silc_client_load_keys(silc_client)) { + idletag = -1; + exit(1); + } + + /* Initialize the SILC client */ + if (!silc_client_init(silc_client)) { + idletag = -1; + exit(1); + } +} + /* Init SILC. Called from src/fe-text/silc.c */ void silc_core_init(void) { static struct poptOption silc_options[] = { { NULL, '\0', POPT_ARG_CALLBACK, (void *)&silc_opt_callback, '\0', NULL }, - { "show-key", 'S', POPT_ARG_STRING, NULL, 0, - "Show the contents of the public key", "FILE" }, { "list-ciphers", 0, POPT_ARG_NONE, NULL, 0, "List supported ciphers", NULL }, { "list-hash-funcs", 0, POPT_ARG_NONE, NULL, 0, @@ -332,14 +363,20 @@ void silc_core_init(void) "List supported HMACs", NULL }, { "list-pkcs", 0, POPT_ARG_NONE, NULL, 0, "List supported PKCSs", NULL }, +#ifdef SILC_DEBUG { "debug", 'd', POPT_ARG_STRING, NULL, 0, "Enable debugging", "STRING" }, +#endif /* SILC_DEBUG */ { "create-key-pair", 'C', POPT_ARG_NONE, NULL, 0, "Create new public key pair", NULL }, { "pkcs", 0, POPT_ARG_STRING, &opt_pkcs, 0, "Set the PKCS of the public key pair (-C)", "PKCS" }, { "bits", 0, POPT_ARG_INT, &opt_bits, 0, "Set the length of the public key pair (-C)", "VALUE" }, + { "passphrase-change", 'P', POPT_ARG_STRING, NULL, 0, + "Change the passphrase of private key file", "FILE" }, + { "show-key", 'S', POPT_ARG_STRING, NULL, 0, + "Show the contents of the public key", "FILE" }, { NULL, '\0', 0, NULL } }; @@ -363,6 +400,7 @@ void silc_core_init(void) settings_add_int("server", "key_exchange_rekey_secs", 3600); settings_add_int("server", "connauth_request_secs", 2); settings_add_int("server", "heartbeat", 300); + settings_add_bool("server", "ignore_message_signatures", FALSE); /* Requested Attributes settings */ settings_add_bool("silc", "attr_allow", TRUE); @@ -384,6 +422,7 @@ void silc_core_init(void) #endif signal_add("setup changed", (SIGNAL_FUNC) sig_setup_changed); + signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished); silc_init_userinfo(); @@ -412,24 +451,6 @@ void silc_core_init(void) silc_client->hostname = silc_net_localhost(); silc_client->realname = g_strdup(settings_get_str("real_name")); - /* Check ~/.silc directory and public and private keys */ - if (silc_client_check_silc_dir() == FALSE) { - idletag = -1; - return; - } - - /* Load public and private key */ - if (silc_client_load_keys(silc_client) == FALSE) { - idletag = -1; - return; - } - - /* Initialize the SILC client */ - if (!silc_client_init(silc_client)) { - idletag = -1; - return; - } - silc_log_set_callback(SILC_LOG_INFO, silc_log_misc, NULL); silc_log_set_callback(SILC_LOG_WARNING, silc_log_misc, NULL); silc_log_set_callback(SILC_LOG_ERROR, silc_log_misc, NULL); @@ -460,6 +481,7 @@ void silc_core_init(void) silc_channels_init(); silc_queries_init(); silc_expandos_init(); + silc_lag_init(); idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL); @@ -474,11 +496,13 @@ void silc_core_deinit(void) signal_emit("chat protocol deinit", 1, chat_protocol_find("SILC")); signal_remove("setup changed", (SIGNAL_FUNC) sig_setup_changed); + signal_remove("irssi init finished", (SIGNAL_FUNC) sig_init_finished); silc_server_deinit(); silc_channels_deinit(); silc_queries_deinit(); silc_expandos_deinit(); + silc_lag_deinit(); chat_protocol_unregister("SILC"); @@ -487,5 +511,9 @@ void silc_core_deinit(void) g_free(silc_client->username); g_free(silc_client->realname); + silc_free(silc_client->hostname); + silc_pkcs_free(silc_client->pkcs); + silc_pkcs_private_key_free(silc_client->private_key); + silc_pkcs_public_key_free(silc_client->public_key); silc_client_free(silc_client); }