summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2010-07-06 13:36:23 +0200
committerSebastien Helleu <flashcode@flashtux.org>2010-07-06 13:36:23 +0200
commit558ca510f78eb7ae60c3d9bf83442918aa15fce0 (patch)
tree92d4894d48ce9e8276a6a713dea3e7777eee482b
parenta31d01a46d33fee2bf6f57042e1fa80148bf760f (diff)
downloadweechat-558ca510f78eb7ae60c3d9bf83442918aa15fce0.zip
Fix display of local SSL certificate when it is sent to IRC server
-rw-r--r--ChangeLog1
-rw-r--r--src/plugins/irc/irc-server.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bf25ff208..da838a8b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ Version 0.3.3 (under dev!)
* core: add hashtables with new functions in plugin API
* api: add function "string_expand_home", fix bug with replacement of home in
paths
+* irc: fix display of local SSL certificate when it is sent to server
* irc: improve lag indicator: two colors (counting and finished), update item
even when pong has not been received, lag_min_show is now in milliseconds
* irc: use empty real name by default in config, instead of reading real name
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 26b7ac14f..ab26e6224 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -2706,11 +2706,11 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
#if LIBGNUTLS_VERSION_NUMBER >= 0x010706
/* client certificate info */
#if LIBGNUTLS_VERSION_NUMBER < 0x020400
- rinfo = gnutls_x509_crt_print (cert_temp,
+ rinfo = gnutls_x509_crt_print (server->tls_cert,
GNUTLS_X509_CRT_ONELINE,
&cinfo);
#else
- rinfo = gnutls_x509_crt_print (cert_temp,
+ rinfo = gnutls_x509_crt_print (server->tls_cert,
GNUTLS_CRT_PRINT_ONELINE,
&cinfo);
#endif
@@ -2723,7 +2723,7 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
gnutls_free (cinfo.data);
}
#endif
- memcpy(answer, &tls_struct, sizeof (gnutls_retr_st));
+ memcpy (answer, &tls_struct, sizeof (gnutls_retr_st));
free (cert_str);
}
else