X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fclientutil.c;h=c1632fea0d621615e278ab289df1c352b81c318c;hb=HEAD;hp=9130779f70d232e47f11f596d5414c8808de3c35;hpb=7b2c89711c8d7f20f9f1322c9af768727fc555a5;p=silc.git diff --git a/apps/irssi/src/silc/core/clientutil.c b/apps/irssi/src/silc/core/clientutil.c index 9130779f..c1632fea 100644 --- a/apps/irssi/src/silc/core/clientutil.c +++ b/apps/irssi/src/silc/core/clientutil.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2006 Pekka Riikonen + Copyright (C) 1997 - 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 @@ -52,7 +52,7 @@ void silc_client_print_list(char *list) int i=0; items = g_strsplit(list, ",", -1); - + while (items[i] != NULL) printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, SILCTXT_CONFIG_LIST, @@ -66,7 +66,7 @@ void silc_client_print_list(char *list) void silc_client_list_ciphers() { - char *ciphers = silc_cipher_get_supported(); + char *ciphers = silc_cipher_get_supported(FALSE); #ifdef SILC_PLUGIN printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, SILCTXT_CONFIG_ALGOS, @@ -406,7 +406,7 @@ void create_key_passphrase(const char *answer, CREATE_KEY_REC *rec) if (silc_create_key_pair(rec->pkcs, rec->bits, pub_key_file, priv_key_file, NULL, (rec->passphrase == NULL ? "" : rec->passphrase), - NULL, NULL, NULL, FALSE) == TRUE) + NULL, NULL, FALSE) == TRUE) printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, SILCTXT_CONFIG_CREATE); else @@ -416,7 +416,6 @@ void create_key_passphrase(const char *answer, CREATE_KEY_REC *rec) g_free(rec->passphrase); g_free(rec->pkcs); g_free(rec); - } void change_private_key_passphrase(const char *answer, CREATE_KEY_REC *rec) @@ -431,7 +430,7 @@ void change_private_key_passphrase(const char *answer, CREATE_KEY_REC *rec) ENTRY_REDIRECT_FLAG_HIDDEN, rec); return; } - + if ((rec->passphrase == NULL) && (answer) && (*answer != '\0')) { rec->passphrase = g_strdup(answer); keyboard_entry_redirect((SIGNAL_FUNC) change_private_key_passphrase, @@ -455,7 +454,7 @@ void change_private_key_passphrase(const char *answer, CREATE_KEY_REC *rec) } if (silc_change_private_key_passphrase(rec->file, rec->old, - (rec->passphrase == NULL ? + (rec->passphrase == NULL ? "" : rec->passphrase)) == TRUE) printformat_module("fe-common/silc", NULL, NULL, MSGLEVEL_CRAP, SILCTXT_CONFIG_PASSCHANGE);