Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2002 Pekka Riikonen
+ Copyright (C) 1997 - 2006 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; 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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
silc_free(pkcs);
}
-/* This checks stats for various SILC files and directories. First it
- checks if ~/.silc directory exist and is owned by the correct user. If
+/* This checks stats for various SILC files and directories. First it
+ checks if ~/.silc directory exist and is owned by the correct user. If
it doesn't exist, it will create the directory. After that it checks if
- user's Public and Private key files exists and that they aren't expired.
- If they doesn't exist or they are expired, they will be (re)created
- after return. */
+ user's Public and Private key files exists. If they doesn't exist they
+ will be created after return. */
int silc_client_check_silc_dir()
{
char servfilename[256], clientfilename[256], friendsfilename[256];
struct stat st;
struct passwd *pw;
- time_t curtime, modtime;
SILC_LOG_DEBUG(("Checking ~./silc directory"));
/* We'll take home path from /etc/passwd file to be sure. */
snprintf(filename, sizeof(filename) - 1, "%s/", get_irssi_dir());
- snprintf(servfilename, sizeof(servfilename) - 1, "%s/serverkeys",
+ snprintf(servfilename, sizeof(servfilename) - 1, "%s/serverkeys",
get_irssi_dir());
- snprintf(clientfilename, sizeof(clientfilename) - 1, "%s/clientkeys",
+ snprintf(clientfilename, sizeof(clientfilename) - 1, "%s/clientkeys",
get_irssi_dir());
- snprintf(friendsfilename, sizeof(friendsfilename) - 1, "%s/friends",
+ snprintf(friendsfilename, sizeof(friendsfilename) - 1, "%s/friends",
get_irssi_dir());
/*
return FALSE;
}
} else {
-
+
/* Check the owner of the dir */
- if (st.st_uid != 0 && st.st_uid != pw->pw_uid) {
+ if (st.st_uid != 0 && st.st_uid != pw->pw_uid) {
fprintf(stderr, "You don't seem to own `%s' directory\n",
filename);
return FALSE;
}
-
+
#if 0
/* Check the permissions of the dir */
if ((st.st_mode & 0777) != 0755) {
if ((chmod(filename, 0755)) == -1) {
- fprintf(stderr, "Permissions for `%s' directory must be 0755\n",
+ fprintf(stderr, "Permissions for `%s' directory must be 0755\n",
filename);
return FALSE;
}
return FALSE;
}
}
-
+
/*
* Check ~./silc/clientkeys directory
*/
return FALSE;
}
}
-
+
/*
* Check ~./silc/friends directory
*/
return FALSE;
}
}
-
+
/*
* Check Public and Private keys
*/
- snprintf(file_public_key, sizeof(file_public_key) - 1, "%s%s",
+ snprintf(file_public_key, sizeof(file_public_key) - 1, "%s%s",
filename, SILC_CLIENT_PUBLIC_KEY_NAME);
- snprintf(file_private_key, sizeof(file_private_key) - 1, "%s%s",
+ snprintf(file_private_key, sizeof(file_private_key) - 1, "%s%s",
filename, SILC_CLIENT_PRIVATE_KEY_NAME);
-
+
if ((stat(file_public_key, &st)) == -1) {
/* If file doesn't exist */
if (errno == ENOENT) {
fprintf(stdout, "Running SILC for the first time\n");
silc_create_key_pair(SILC_CLIENT_DEF_PKCS,
SILC_CLIENT_DEF_PKCS_LEN,
- file_public_key, file_private_key, NULL,
+ file_public_key, file_private_key,
NULL, NULL, NULL, NULL, FALSE);
printf("Press <Enter> to continue...\n");
getchar();
return FALSE;
}
}
-
+
/* Check the owner of the public key */
- if (st.st_uid != 0 && st.st_uid != pw->pw_uid) {
+ if (st.st_uid != 0 && st.st_uid != pw->pw_uid) {
fprintf(stderr, "You don't seem to own your public key!?\n");
return FALSE;
}
-
+
if ((stat(file_private_key, &st)) == -1) {
/* If file doesn't exist */
if (errno == ENOENT) {
fprintf(stdout, "Your private key doesn't exist\n");
silc_create_key_pair(SILC_CLIENT_DEF_PKCS,
SILC_CLIENT_DEF_PKCS_LEN,
- file_public_key, file_private_key, NULL,
+ file_public_key, file_private_key,
NULL, NULL, NULL, NULL, FALSE);
printf("Press <Enter> to continue...\n");
getchar();
return FALSE;
}
}
-
+
/* Check the owner of the private key */
- if (st.st_uid != 0 && st.st_uid != pw->pw_uid) {
+ if (st.st_uid != 0 && st.st_uid != pw->pw_uid) {
fprintf(stderr, "You don't seem to own your private key!?\n");
return FALSE;
}
-
+
/* Check the permissions for the private key */
if ((st.st_mode & 0777) != 0600) {
fprintf(stderr, "Wrong permissions in your private key file `%s'!\n"
"Trying to change them ... ", file_private_key);
if ((chmod(file_private_key, 0600)) == -1) {
fprintf(stderr,
- "Failed to change permissions for private key file!\n"
+ "Failed to change permissions for private key file!\n"
"Permissions for your private key file must be 0600.\n");
return FALSE;
}
fprintf(stderr, "Done.\n\n");
}
- /* See if the key has expired. */
- modtime = st.st_mtime; /* last modified */
- curtime = time(0) - modtime;
-
- /* 86400 is seconds in a day. */
- if (curtime >= (86400 * SILC_CLIENT_KEY_EXPIRES)) {
- char *answer;
-
- fprintf(stdout,
- "----------------------------------------------------\n"
- "Your private key has expired and needs to be\n"
- "recreated. Would you like to create a new key pair\n"
- "now? If you answer Yes, the new key will expire in\n"
- "%d days from today. If you answer No, the old key\n"
- "will expire again in %d days from today.\n"
- "----------------------------------------------------\n",
- SILC_CLIENT_KEY_EXPIRES, SILC_CLIENT_KEY_EXPIRES);
-
- answer = silc_get_input("Would you like to create a new key pair "
- "(y/n)?: ", FALSE);
- while (!answer) {
- printf("Answer 'y' or 'n' and press Enter\n");
- answer = silc_get_input("Would you like to create a new key pair "
- "(y/n)?: ", FALSE);
- }
- if (answer[0] == 'Y' || answer[0] == 'y') {
- silc_create_key_pair(SILC_CLIENT_DEF_PKCS,
- SILC_CLIENT_DEF_PKCS_LEN,
- file_public_key, file_private_key, NULL,
- NULL, NULL, NULL, NULL, FALSE);
- printf("Press <Enter> to continue...\n");
- getchar();
- } else {
-#ifdef HAVE_UTIME
- struct utimbuf utim;
- utim.actime = time(NULL);
- utim.modtime = time(NULL);
- utime(file_private_key, &utim);
-#endif
- }
- silc_free(answer);
- }
-
return TRUE;
}
memset(pub, 0, sizeof(pub));
snprintf(pub, sizeof(pub) - 1, "%s/%s",
get_irssi_dir(), SILC_CLIENT_PUBLIC_KEY_NAME);
-
+
/* Try loading first with "" passphrase, for those that didn't set
passphrase for private key, and only if that fails let it prompt
for passphrase. */
- ret = silc_load_key_pair(pub, prv, "", &client->pkcs, &client->public_key,
- &client->private_key);
+ ret = silc_load_key_pair(pub, prv, "", &irssi_pubkey, &irssi_privkey);
if (!ret)
- ret = silc_load_key_pair(pub, prv, NULL, &client->pkcs,
- &client->public_key, &client->private_key);
+ ret = silc_load_key_pair(pub, prv, NULL, &irssi_pubkey, &irssi_privkey);
+
+ if (!ret)
+ SILC_LOG_ERROR(("Could not load key pair"));
+
return ret;
}
projects / crypto.git / blobdiff