pidgin/pidgin

aim: Switch to new libpurple/finch distid/devids provided by AOL
release-2.x.y
2017-02-22, dx
31ecbdda7ff3
Parents 9f4a1085a774
Children e11ea6f07c5bc0d8d2d1497a
aim: Switch to new libpurple/finch distid/devids provided by AOL

The pidgin ids were already handled by a previous commit.

https://pidgin.im/pipermail/support/2017-January/029820.html
4 files changed, 21 insertions(+), 35 deletions(-)
  • +5 -10
    finch/finch.c
  • +4 -14
    libpurple/protocols/oscar/clientlogin.c
  • +1 -11
    libpurple/protocols/oscar/kerberos.c
  • +11 -0
    libpurple/protocols/oscar/oscarcommon.h
    • --- a/finch/finch.c Sat Feb 18 17:47:37 2017 +0000
    +++ b/finch/finch.c Wed Feb 22 12:50:51 2017 -0300
    @@ -70,16 +70,11 @@
    g_hash_table_insert(ui_info, "client_type", "console");
    /*
    - * This is the client key for "Finch." It is owned by the AIM
    - * account "markdoliner." Please don't use this key for other
    - * applications. You can either not specify a client key, in
    - * which case the default "libpurple" key will be used, or you
    - * can try to register your own at the AIM or ICQ web sites
    - * (although this functionality was removed at some point, it's
    - * possible it has been re-added). AOL's old key management
    - * page is http://developer.aim.com/manageKeys.jsp
    + * This is the client key for "Finch." Please don't use this
    + * key for other applications. You can not specify a client
    + * key, in which case the default "libpurple" key will be used
    */
    - g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma19sqWV9ymU6UYc");
    + g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma18nmEklXMR7Cj_");
    /*
    * This is the client key for "Pidgin." It is owned by the AIM
    @@ -102,7 +97,7 @@
    * don't use this for other applications. You can just not
    * specify a distid and libpurple will use a default.
    */
    - g_hash_table_insert(ui_info, "prpl-aim-distid", GINT_TO_POINTER(1552));
    + g_hash_table_insert(ui_info, "prpl-aim-distid", GINT_TO_POINTER(1718));
    g_hash_table_insert(ui_info, "prpl-icq-distid", GINT_TO_POINTER(1552));
    }
    --- a/libpurple/protocols/oscar/clientlogin.c Sat Feb 18 17:47:37 2017 +0000
    +++ b/libpurple/protocols/oscar/clientlogin.c Wed Feb 22 12:50:51 2017 -0300
    @@ -73,21 +73,11 @@
    return start_oscar_session_urls[od->icq ? 1 : 0];
    }
    -/*
    - * Using clientLogin requires a developer ID. This key is for libpurple.
    - * It is the default key for all libpurple-based clients. AOL encourages
    - * UIs (especially ones with lots of users) to override this with their
    - * own key. This key is owned by the AIM account "markdoliner"
    - *
    - * Keys can be managed at http://developer.aim.com/manageKeys.jsp
    - */
    -#define DEFAULT_CLIENT_KEY "ma15d7JTxbmVG-RP"
    -
    static const char *get_client_key(OscarData *od)
    {
    return oscar_get_ui_info_string(
    od->icq ? "prpl-icq-clientkey" : "prpl-aim-clientkey",
    - DEFAULT_CLIENT_KEY);
    + od->icq ? ICQ_DEFAULT_CLIENT_KEY : AIM_DEFAULT_CLIENT_KEY);
    }
    static gchar *generate_error_message(xmlnode *resp, const char *url)
    @@ -362,8 +352,7 @@
    const gchar *encryption_type = purple_account_get_string(account, "encryption", OSCAR_DEFAULT_ENCRYPTION);
    /*
    - * Construct the GET parameters. 0x00000611 is the distid given to
    - * us by AOL for use as the default libpurple distid.
    + * Construct the GET parameters.
    */
    query_string = g_strdup_printf("a=%s"
    "&distId=%d"
    @@ -372,7 +361,8 @@
    "&ts=%" PURPLE_TIME_T_MODIFIER
    "&useTLS=%d",
    purple_url_encode(token),
    - oscar_get_ui_info_int(od->icq ? "prpl-icq-distid" : "prpl-aim-distid", 0x00000611),
    + oscar_get_ui_info_int(od->icq ? "prpl-icq-distid" : "prpl-aim-distid",
    + od->icq ? ICQ_DEFAULT_DIST_ID : AIM_DEFAULT_DIST_ID),
    get_client_key(od),
    hosttime,
    strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0 ? 1 : 0);
    --- a/libpurple/protocols/oscar/kerberos.c Sat Feb 18 17:47:37 2017 +0000
    +++ b/libpurple/protocols/oscar/kerberos.c Wed Feb 22 12:50:51 2017 -0300
    @@ -98,21 +98,11 @@
    return url;
    }
    -/*
    - * Using kerberos auth requires a developer ID. This key is for libpurple.
    - * It is the default key for all libpurple-based clients. AOL encourages
    - * UIs (especially ones with lots of users) to override this with their
    - * own key. This key is owned by the AIM account "markdoliner"
    - *
    - * Keys can be managed at http://developer.aim.com/manageKeys.jsp
    - */
    -#define DEFAULT_CLIENT_KEY "ma15d7JTxbmVG-RP"
    -
    static const char *get_client_key(OscarData *od)
    {
    return oscar_get_ui_info_string(
    od->icq ? "prpl-icq-clientkey" : "prpl-aim-clientkey",
    - DEFAULT_CLIENT_KEY);
    + od->icq ? ICQ_DEFAULT_CLIENT_KEY : AIM_DEFAULT_CLIENT_KEY);
    }
    static void
    --- a/libpurple/protocols/oscar/oscarcommon.h Sat Feb 18 17:47:37 2017 +0000
    +++ b/libpurple/protocols/oscar/oscarcommon.h Wed Feb 22 12:50:51 2017 -0300
    @@ -41,6 +41,17 @@
    #define AIM_DEFAULT_KDC_SERVER "kdc.uas.aol.com"
    #define AIM_DEFAULT_KDC_PORT 443
    +/*
    + * Using clientLogin requires a developer ID. This key is for libpurple.
    + * It is the default key for all libpurple-based clients. AOL encourages
    + * UIs (especially ones with lots of users) to override this with their
    + * own key.
    + */
    +#define ICQ_DEFAULT_DIST_ID 1553
    +#define ICQ_DEFAULT_CLIENT_KEY "ma15d7JTxbmVG-RP"
    +#define AIM_DEFAULT_DIST_ID 1717
    +#define AIM_DEFAULT_CLIENT_KEY "ma19CwYN9i9Mw5nY"
    +
    #define OSCAR_DEFAULT_LOGIN_PORT 5190
    #define OSCAR_OPPORTUNISTIC_ENCRYPTION "opportunistic_encryption"