pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-06 17:53:13 +02:00
Code Activity

Added protocol priority for gnutls (patch #5915)

Browse Source
This commit is contained in:
Sebastien Helleu
2007-05-04 09:48:33 +00:00
parent f5fadd9c12
commit 148e74d2c3
8 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2 -1
View File
@@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2007-05-02
ChangeLog - 2007-05-04
Version 0.2.5 (under dev!):
* added protocol priority for gnutls (patch #5915)
* added channel admin mode '!' for some IRC servers
* fixed bug with iso2022jp locale (bug #18719)
* fixed string format bug when displaying string thru plugin script API
src/common/session.c
+2 -2
View File
@@ -825,7 +825,6 @@ session_load_server (FILE *file)
void *session_data;
size_t session_size;
int session_size_int;
const int cert_type_prio[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
#endif
/* read server name */
@@ -958,7 +957,8 @@ session_load_server (FILE *file)
return 0;
}
gnutls_set_default_priority (session_current_server->gnutls_sess);
gnutls_certificate_type_set_priority (session_current_server->gnutls_sess, cert_type_prio);
gnutls_certificate_type_set_priority (session_current_server->gnutls_sess, gnutls_cert_type_prio);
gnutls_protocol_set_priority (session_current_server->gnutls_sess, gnutls_prot_prio);
gnutls_credentials_set (session_current_server->gnutls_sess, GNUTLS_CRD_CERTIFICATE, gnutls_xcred);
session_data = NULL;
rc = rc && (session_read_buf_alloc (file, &session_data, &session_size_int));
src/irc/irc-server.c
+13 -4
View File
@@ -64,6 +64,17 @@ int check_away = 0;
char *nick_modes = "aiwroOs";
#ifdef HAVE_GNUTLS
const int gnutls_cert_type_prio[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
#if LIBGNUTLS_VERSION_NUMBER >= 0x010700
const int gnutls_prot_prio[] = { GNUTLS_TLS1_2, GNUTLS_TLS1_1,
GNUTLS_TLS1_0, GNUTLS_SSL3, 0 };
#else
const int gnutls_prot_prio[] = { GNUTLS_TLS1_1, GNUTLS_TLS1_0,
GNUTLS_SSL3, 0 };
#endif
#endif
/*
* server_init: init server struct with default values
@@ -1730,9 +1741,6 @@ server_connect (t_irc_server *server)
{
int child_pipe[2], set;
pid_t pid;
#ifdef HAVE_GNUTLS
const int cert_type_prio[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
#endif
#ifndef HAVE_GNUTLS
if (server->ssl)
@@ -1790,7 +1798,8 @@ server_connect (t_irc_server *server)
return 0;
}
gnutls_set_default_priority (server->gnutls_sess);
gnutls_certificate_type_set_priority (server->gnutls_sess, cert_type_prio);
gnutls_certificate_type_set_priority (server->gnutls_sess, gnutls_cert_type_prio);
gnutls_protocol_set_priority (server->gnutls_sess, gnutls_prot_prio);
gnutls_credentials_set (server->gnutls_sess, GNUTLS_CRD_CERTIFICATE, gnutls_xcred);
server->ssl_connected = 1;
}
src/irc/irc.h
+4
View File
@@ -345,6 +345,10 @@ struct t_irc_ignore
extern t_irc_command irc_commands[];
extern t_irc_server *irc_servers;
#ifdef HAVE_GNUTLS
extern const int gnutls_cert_type_prio[];
extern const int gnutls_prot_prio[];
#endif
extern t_irc_message *recv_msgq, *msgq_last_msg;
extern int check_away;
extern t_irc_dcc *dcc_list;
weechat/ChangeLog
+2 -1
View File
@@ -1,10 +1,11 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2007-05-02
ChangeLog - 2007-05-04
Version 0.2.5 (under dev!):
* added protocol priority for gnutls (patch #5915)
* added channel admin mode '!' for some IRC servers
* fixed bug with iso2022jp locale (bug #18719)
* fixed string format bug when displaying string thru plugin script API
weechat/src/common/session.c
+2 -2
View File
@@ -825,7 +825,6 @@ session_load_server (FILE *file)
void *session_data;
size_t session_size;
int session_size_int;
const int cert_type_prio[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
#endif
/* read server name */
@@ -958,7 +957,8 @@ session_load_server (FILE *file)
return 0;
}
gnutls_set_default_priority (session_current_server->gnutls_sess);
gnutls_certificate_type_set_priority (session_current_server->gnutls_sess, cert_type_prio);
gnutls_certificate_type_set_priority (session_current_server->gnutls_sess, gnutls_cert_type_prio);
gnutls_protocol_set_priority (session_current_server->gnutls_sess, gnutls_prot_prio);
gnutls_credentials_set (session_current_server->gnutls_sess, GNUTLS_CRD_CERTIFICATE, gnutls_xcred);
session_data = NULL;
rc = rc && (session_read_buf_alloc (file, &session_data, &session_size_int));
weechat/src/irc/irc-server.c
+13 -4
View File
@@ -64,6 +64,17 @@ int check_away = 0;
char *nick_modes = "aiwroOs";
#ifdef HAVE_GNUTLS
const int gnutls_cert_type_prio[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
#if LIBGNUTLS_VERSION_NUMBER >= 0x010700
const int gnutls_prot_prio[] = { GNUTLS_TLS1_2, GNUTLS_TLS1_1,
GNUTLS_TLS1_0, GNUTLS_SSL3, 0 };
#else
const int gnutls_prot_prio[] = { GNUTLS_TLS1_1, GNUTLS_TLS1_0,
GNUTLS_SSL3, 0 };
#endif
#endif
/*
* server_init: init server struct with default values
@@ -1730,9 +1741,6 @@ server_connect (t_irc_server *server)
{
int child_pipe[2], set;
pid_t pid;
#ifdef HAVE_GNUTLS
const int cert_type_prio[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
#endif
#ifndef HAVE_GNUTLS
if (server->ssl)
@@ -1790,7 +1798,8 @@ server_connect (t_irc_server *server)
return 0;
}
gnutls_set_default_priority (server->gnutls_sess);
gnutls_certificate_type_set_priority (server->gnutls_sess, cert_type_prio);
gnutls_certificate_type_set_priority (server->gnutls_sess, gnutls_cert_type_prio);
gnutls_protocol_set_priority (server->gnutls_sess, gnutls_prot_prio);
gnutls_credentials_set (server->gnutls_sess, GNUTLS_CRD_CERTIFICATE, gnutls_xcred);
server->ssl_connected = 1;
}
weechat/src/irc/irc.h
+4
View File
@@ -345,6 +345,10 @@ struct t_irc_ignore
extern t_irc_command irc_commands[];
extern t_irc_server *irc_servers;
#ifdef HAVE_GNUTLS
extern const int gnutls_cert_type_prio[];
extern const int gnutls_prot_prio[];
#endif
extern t_irc_message *recv_msgq, *msgq_last_msg;
extern int check_away;
extern t_irc_dcc *dcc_list;