Utilities/dep-build-scripts/libpurple_jabber_cert_against_jid_hostname.diff

   1 #
   2 # old_revision [20e2add42a314b4914e798757eb2a69ac3b491d0]
   3 #
   4 # patch "libpurple/protocols/jabber/jabber.c"
   5 #  from [37a356263832da85c1ce5dac41c9c1204cb8f407]
   6 #    to [27f982381ff26d8e01a10a7d068536a9f5c95ce9]
   7 #
   8 # patch "libpurple/protocols/jabber/jabber.h"
   9 #  from [9f3858e49283499a451c4f78dff6a1d782c20467]
  10 #    to [b1a7f0f55653701e2ef512f726ab89371b8aa9b3]
  11 #
  12 ============================================================
  13 --- libpurple/protocols/jabber/jabber.c 37a356263832da85c1ce5dac41c9c1204cb8f407
  14 +++ libpurple/protocols/jabber/jabber.c 27f982381ff26d8e01a10a7d068536a9f5c95ce9
  15 @@ -536,7 +536,7 @@ static void tls_init(JabberStream *js)
  16         purple_input_remove(js->gc->inpa);
  17         js->gc->inpa = 0;
  18         js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd,
  19 -                       jabber_login_callback_ssl, jabber_ssl_connect_failure, js->serverFQDN, js->gc);
  20 +                       jabber_login_callback_ssl, jabber_ssl_connect_failure, js->certificate_CN, js->gc);
  21  }
  22
  23  static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port)
  24 @@ -591,7 +591,8 @@ jabber_login(PurpleAccount *account)
  25         js->next_id = g_random_int();
  26         js->write_buffer = purple_circ_buffer_new(512);
  27         js->old_length = -1;
  28 -
  29 +       js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user->domain);
  30 +
  31         if(!js->user) {
  32                 purple_connection_error_reason (gc,
  33                         PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
  34 @@ -628,7 +629,7 @@ jabber_login(PurpleAccount *account)
  35         if(purple_account_get_bool(js->gc->account, "old_ssl", FALSE)) {
  36                 if(purple_ssl_is_supported()) {
  37                         js->gsc = purple_ssl_connect(js->gc->account,
  38 -                                       connect_server[0] ? connect_server : js->user->domain,
  39 +                                       js->certificate_CN,
  40                                         purple_account_get_int(account, "port", 5223), jabber_login_callback_ssl,
  41                                         jabber_ssl_connect_failure, js->gc);
  42                 } else {
  43 @@ -1103,6 +1104,7 @@ void jabber_register_account(PurpleAccou
  44                 my_jb->subscription |= JABBER_SUB_BOTH;
  45
  46         server = connect_server[0] ? connect_server : js->user->domain;
  47 +       js->certificate_CN = g_strdup(server);
  48
  49         jabber_stream_set_state(js, JABBER_STREAM_CONNECTING);
  50
  51 @@ -1279,6 +1281,7 @@ void jabber_close(PurpleConnection *gc)
  52                 js->commands = g_list_delete_link(js->commands, js->commands);
  53         }
  54         g_free(js->server_name);
  55 +       g_free(js->certificate_CN);
  56         g_free(js->gmail_last_time);
  57         g_free(js->gmail_last_tid);
  58         g_free(js->old_msg);
  59 ============================================================
  60 --- libpurple/protocols/jabber/jabber.h 9f3858e49283499a451c4f78dff6a1d782c20467
  61 +++ libpurple/protocols/jabber/jabber.h b1a7f0f55653701e2ef512f726ab89371b8aa9b3
  62 @@ -191,6 +191,8 @@ struct _JabberStream
  63         char *old_uri;
  64         int old_length;
  65         char *old_track;
  66 +
  67 +       char *certificate_CN;
  68  };
  69
  70  typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *shortname, const gchar *namespace);