Mercurial > ~mikael > mcabber > hg
diff mcabber/mcabber/xmpp.c @ 2197:189abf03ef24
Fix fingerprint management
(Reported by Sven Gaerner in issue #134)
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 11 Oct 2015 17:17:35 +0200 |
parents | 40ddaebeb81e |
children | 1591518a33b9 |
line wrap: on
line diff
--- a/mcabber/mcabber/xmpp.c Wed Oct 07 21:58:38 2015 +0200 +++ b/mcabber/mcabber/xmpp.c Sun Oct 11 17:17:35 2015 +0200 @@ -714,19 +714,19 @@ "Certificate hostname does not match expected hostname!"); break; case LM_SSL_STATUS_CERT_FINGERPRINT_MISMATCH: { - char fpr[49]; - fingerprint_to_hex((const unsigned char*)lm_ssl_get_fingerprint(ssl), - fpr); - scr_LogPrint(LPRINT_LOGNORM, - "Certificate fingerprint does not match expected fingerprint!"); - scr_LogPrint(LPRINT_LOGNORM, "Remote fingerprint: %s", fpr); + char fpr[49] = {0}; + fingerprint_to_hex((const unsigned char*)lm_ssl_get_fingerprint(ssl), + fpr); + scr_LogPrint(LPRINT_LOGNORM, + "Certificate fingerprint does not match expected fingerprint!"); + scr_LogPrint(LPRINT_LOGNORM, "Remote fingerprint: %s", fpr); - scr_LogPrint(LPRINT_LOGNORM, "Expected fingerprint: %s", - settings_opt_get("ssl_fingerprint")); + scr_LogPrint(LPRINT_LOGNORM, "Expected fingerprint: %s", + settings_opt_get("ssl_fingerprint")); - return LM_SSL_RESPONSE_STOP; + return LM_SSL_RESPONSE_STOP; + } break; - } case LM_SSL_STATUS_GENERIC_ERROR: scr_LogPrint(LPRINT_LOGNORM, "Generic SSL error!"); break; @@ -1732,14 +1732,14 @@ { const char *userjid, *password, *resource, *servername, *ssl_fpr; char *dynresource = NULL; - char fpr[16]; + char fpr[17] = {0}; const char *proxy_host; const char *resource_prefix = PACKAGE_NAME; char *fjid; int ssl, tls; LmSSL *lssl; unsigned int port; - unsigned int ping; + unsigned int ping = 40; LmMessageHandler *handler; GError *error = NULL; @@ -1765,7 +1765,6 @@ g_log_set_handler("LM", LM_LOG_LEVEL_ALL, lm_debug_handler, NULL); - ping = 40; if (settings_opt_get("pinginterval")) ping = (unsigned int) settings_opt_get_int("pinginterval"); lm_connection_set_keep_alive_rate(lconnection, ping);