Initial commit for utf8 everywhere.

This commit is contained in:
Arnavion
2012-11-03 10:24:25 -07:00
parent e0b1724158
commit 5d9264aff6
21 changed files with 374 additions and 723 deletions

View File

@@ -1718,21 +1718,21 @@ server_connect (server *serv, char *hostname, int port, int no_login)
#ifdef USE_OPENSSL
if (serv->use_ssl)
{
char cert_file[256];
char *cert_file;
/* first try network specific cert/key */
snprintf (cert_file, sizeof (cert_file), "%s/%s.pem",
get_xdir_fs (), server_get_network (serv, TRUE));
cert_file = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.pem",
get_xdir (), server_get_network (serv, TRUE));
if (SSL_CTX_use_certificate_file (ctx, cert_file, SSL_FILETYPE_PEM) == 1)
SSL_CTX_use_PrivateKey_file (ctx, cert_file, SSL_FILETYPE_PEM);
else
{
/* if that doesn't exist, try ~/.xchat2/client.pem */
snprintf (cert_file, sizeof (cert_file), "%s/%s.pem",
get_xdir_fs (), "client");
/* if that doesn't exist, try <xdir>/client.pem */
cert_file = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "client.pem", get_xdir ());
if (SSL_CTX_use_certificate_file (ctx, cert_file, SSL_FILETYPE_PEM) == 1)
SSL_CTX_use_PrivateKey_file (ctx, cert_file, SSL_FILETYPE_PEM);
}
g_free (cert_file);
}
#endif