X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fclientutil.c;h=93b575fe9a5fdc14a38da05166f101a169c7ce1d;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=ee7fcec0af889ab801d0640feaacdba6cc0789cf;hpb=c46257aff172b7bff9c0fe560ae377543934ff64;p=silc.git diff --git a/apps/irssi/src/silc/core/clientutil.c b/apps/irssi/src/silc/core/clientutil.c index ee7fcec0..93b575fe 100644 --- a/apps/irssi/src/silc/core/clientutil.c +++ b/apps/irssi/src/silc/core/clientutil.c @@ -2,14 +2,13 @@ client.c - Author: Pekka Riikonen + Author: Pekka Riikonen - Copyright (C) 1997 - 2000 Pekka Riikonen + Copyright (C) 1997 - 2002 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -32,56 +31,18 @@ #include "misc.h" #include "settings.h" -#include "servers-setup.h" +#include "channels-setup.h" #include "silc-servers.h" #include "silc-channels.h" #include "silc-queries.h" +#include "silc-nicklist.h" #include "window-item-def.h" #include "fe-common/core/printtext.h" +#include "fe-common/core/keyboard.h" -/* Asks yes/no from user on the input line. Returns TRUE on "yes" and - FALSE on "no". */ - -int silc_client_ask_yes_no(SilcClient client, char *prompt) -{ -#if 0 - SilcClientInternal app = (SilcClientInternal)client->application; - char answer[4]; - int ret; - - again: - silc_screen_input_reset(app->screen); - - /* Print prompt */ - wattroff(app->screen->input_win, A_INVIS); - silc_screen_input_print_prompt(app->screen, prompt); - - /* Get string */ - memset(answer, 0, sizeof(answer)); - echo(); - wgetnstr(app->screen->input_win, answer, sizeof(answer)); - if (!strncasecmp(answer, "yes", strlen(answer)) || - !strncasecmp(answer, "y", strlen(answer))) { - ret = TRUE; - } else if (!strncasecmp(answer, "no", strlen(answer)) || - !strncasecmp(answer, "n", strlen(answer))) { - ret = FALSE; - } else { - silc_say(client, app->conn, "Type yes or no"); - goto again; - } - noecho(); - - silc_screen_input_reset(app->screen); - - return ret; -#endif - return 0; -} - -/* Lists supported (builtin) ciphers */ +/* Lists supported ciphers */ void silc_client_list_ciphers() { @@ -90,7 +51,7 @@ void silc_client_list_ciphers() silc_free(ciphers); } -/* Lists supported (builtin) hash functions */ +/* Lists supported hash functions */ void silc_client_list_hash_funcs() { @@ -99,6 +60,15 @@ void silc_client_list_hash_funcs() silc_free(hash); } +/* Lists supported hash functions */ + +void silc_client_list_hmacs() +{ + char *hash = silc_hmac_get_supported(); + fprintf(stdout, "%s\n", hash); + silc_free(hash); +} + /* Lists supported PKCS algorithms */ void silc_client_list_pkcs() @@ -112,7 +82,6 @@ void silc_client_list_pkcs() char *silc_client_get_input(const char *prompt) { -#if 0 char input[2048]; int fd; @@ -137,9 +106,8 @@ char *silc_client_get_input(const char *prompt) if (strchr(input, '\n')) *strchr(input, '\n') = '\0'; + return strdup(input); -#endif - return NULL; } /* Returns identifier string for public key generation. */ @@ -147,14 +115,16 @@ char *silc_client_get_input(const char *prompt) char *silc_client_create_identifier() { char *username = NULL, *realname = NULL; - char hostname[256], email[256]; + char *hostname, email[256]; + char *ident; /* Get realname */ realname = silc_get_real_name(); /* Get hostname */ - memset(hostname, 0, sizeof(hostname)); - gethostname(hostname, sizeof(hostname)); + hostname = silc_net_localhost(); + if (!hostname) + return NULL; /* Get username (mandatory) */ username = silc_get_username(); @@ -164,8 +134,14 @@ char *silc_client_create_identifier() /* Create default email address, whether it is right or not */ snprintf(email, sizeof(email), "%s@%s", username, hostname); - return silc_pkcs_encode_identifier(username, hostname, realname, email, - NULL, NULL); + ident = silc_pkcs_encode_identifier(username, hostname, realname, email, + NULL, NULL); + if (realname) + silc_free(realname); + silc_free(hostname); + silc_free(username); + + return ident; } /* Creates new public key and private key pair. This is used only @@ -182,7 +158,7 @@ int silc_client_create_key_pair(char *pkcs_name, int bits, SilcPrivateKey prv_key; SilcRng rng; unsigned char *key; - uint32 key_len; + SilcUInt32 key_len; char line[256]; char *pkfile = NULL, *prvfile = NULL; @@ -327,14 +303,16 @@ int silc_client_check_silc_dir() memset(file_public_key, 0, sizeof(file_public_key)); memset(file_private_key, 0, sizeof(file_private_key)); + identifier = silc_client_create_identifier(); + pw = getpwuid(getuid()); if (!pw) { fprintf(stderr, "silc: %s\n", strerror(errno)); + if (identifier) + silc_free(identifier); return FALSE; } - identifier = silc_client_create_identifier(); - /* We'll take home path from /etc/passwd file to be sure. */ snprintf(filename, sizeof(filename) - 1, "%s/.silc/", pw->pw_dir); snprintf(servfilename, sizeof(servfilename) - 1, "%s/.silc/serverkeys", @@ -374,6 +352,7 @@ int silc_client_check_silc_dir() return FALSE; } +#if 0 /* Check the permissions of the dir */ if ((st.st_mode & 0777) != 0755) { if ((chmod(filename, 0755)) == -1) { @@ -382,6 +361,7 @@ int silc_client_check_silc_dir() return FALSE; } } +#endif } /* @@ -558,6 +538,10 @@ int silc_client_load_keys(SilcClient client) SILC_PKCS_FILE_BIN) == FALSE) return FALSE; + silc_pkcs_alloc(client->public_key->name, &client->pkcs); + silc_pkcs_public_key_set(client->pkcs, client->public_key); + silc_pkcs_private_key_set(client->pkcs, client->private_key); + return TRUE; } @@ -567,9 +551,9 @@ int silc_client_show_key(char *keyfile) { SilcPublicKey public_key; SilcPublicKeyIdentifier ident; - char *fingerprint; + char *fingerprint, *babbleprint; unsigned char *pk; - uint32 pk_len; + SilcUInt32 pk_len; SilcPKCS pkcs; int key_len = 0; @@ -585,6 +569,7 @@ int silc_client_show_key(char *keyfile) pk = silc_pkcs_public_key_encode(public_key, &pk_len); fingerprint = silc_hash_fingerprint(NULL, pk, pk_len); + babbleprint = silc_hash_babbleprint(NULL, pk, pk_len); if (silc_pkcs_alloc(public_key->name, &pkcs)) { key_len = silc_pkcs_public_key_set(pkcs, public_key); @@ -608,10 +593,12 @@ int silc_client_show_key(char *keyfile) if (ident->country) printf("Country : %s\n", ident->country); printf("Fingerprint (SHA1) : %s\n", fingerprint); + printf("Babbleprint (SHA1) : %s\n", babbleprint); fflush(stdout); silc_free(fingerprint); + silc_free(babbleprint); silc_free(pk); silc_pkcs_public_key_free(public_key); silc_pkcs_free_identifier(ident);