pidgin/ljfisher-ssl-client-auth

propagate from branch 'im.pidgin.pidgin' (head 45883bf3facb2c404189a366868eb301717a2d68)
mxit
2011-08-13, Andrew Victor
e0c386103244
Parents 45883bf3facb7ff73532d1e7
Children 42c550421b10
propagate from branch 'im.pidgin.pidgin' (head 45883bf3facb2c404189a366868eb301717a2d68)
to branch 'im.pidgin.pidgin.mxit' (head 7ff73532d1e736b6cb38a593f2adc364d93f75a4)
14 files changed, 194 insertions(+), 114 deletions(-)
  • +0 -7
    libpurple/protocols/mxit/actions.c
  • +65 -0
    libpurple/protocols/mxit/cipher.c
  • +2 -0
    libpurple/protocols/mxit/cipher.h
  • +15 -10
    libpurple/protocols/mxit/formcmds.c
  • +60 -54
    libpurple/protocols/mxit/markup.c
  • +1 -1
    libpurple/protocols/mxit/markup.h
  • +6 -2
    libpurple/protocols/mxit/multimx.c
  • +11 -16
    libpurple/protocols/mxit/mxit.c
  • +0 -3
    libpurple/protocols/mxit/profile.c
  • +0 -1
    libpurple/protocols/mxit/profile.h
  • +24 -13
    libpurple/protocols/mxit/protocol.c
  • +5 -2
    libpurple/protocols/mxit/protocol.h
  • +4 -4
    libpurple/protocols/mxit/roster.h
  • +1 -1
    libpurple/protocols/mxit/voicevideo.c
    • --- a/libpurple/protocols/mxit/actions.c Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/actions.c Sat Aug 13 22:11:50 2011 +0000
    @@ -84,13 +84,6 @@
    g_string_append( attributes, attrib );
    acount++;
    - /* force hidden if disabled */
    - if ( profile->hidden == FALSE ) {
    - g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_HIDENUMBER, CP_PROFILE_TYPE_BOOL, "1" );
    - g_string_append( attributes, attrib );
    - acount++;
    - }
    -
    /* update birthday */
    g_strlcpy( profile->birthday, bday, sizeof( profile->birthday ) );
    g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_BIRTHDATE, CP_PROFILE_TYPE_UTF8, profile->birthday );
    --- a/libpurple/protocols/mxit/cipher.c Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/cipher.c Sat Aug 13 22:11:50 2011 +0000
    @@ -34,6 +34,7 @@
    /* password encryption */
    #define INITIAL_KEY "6170383452343567"
    #define SECRET_HEADER "<mxit/>"
    +#define ENCRYPT_HEADER "<mxitencrypted ver=\"5.2\"/>"
    /*------------------------------------------------------------------------
    @@ -106,3 +107,67 @@
    return base64;
    }
    +
    +/*------------------------------------------------------------------------
    + * Decrypt a transport-layer encryptede message.
    + *
    + * @param session The MXit session object
    + * @param message The encrypted message data.
    + * @return The decrypted message. Must be g_free'd when no longer needed.
    + */
    +char* mxit_decrypt_message( struct MXitSession* session, char* message )
    +{
    + gsize raw_len;
    + guchar* raw_message;
    + char key[64];
    + int pwdlen = strlen( session->acc->password );
    + char exkey[512];
    + int i;
    + GString* decoded = NULL;
    +
    + /* remove optional header: <mxitencrypted ver="5.2"/> */
    + if ( strncmp( message, ENCRYPT_HEADER, strlen( ENCRYPT_HEADER ) ) == 0 )
    + message += strlen( ENCRYPT_HEADER );
    +
    + /* base64 decode the message */
    + raw_message = purple_base64_decode( message, &raw_len );
    +
    + /* build the key - Client key, appended with last 8 characters of the PIN. (no padding) */
    + memset( key, 0x00, sizeof( key ) );
    + memcpy( key, session->clientkey, strlen( session->clientkey ) );
    + if ( pwdlen <= 8 )
    + strcat( key, session->acc->password );
    + else
    + strncat( key, session->acc->password + ( pwdlen - 8 ), 8 );
    + ExpandKey( (unsigned char*) key, (unsigned char*) exkey );
    +
    + /* decode each block */
    + decoded = g_string_sized_new( raw_len );
    + for ( i = 0; i < raw_len; i += 16 ) {
    + char block[16];
    +
    + Decrypt( (unsigned char*) raw_message + i, (unsigned char*) exkey, (unsigned char*) block );
    + g_string_append_len( decoded, block, 16 );
    + }
    + g_free( raw_message );
    +
    + purple_debug_info( MXIT_PLUGIN_ID, "decrypted: '%s'\n", decoded->str );
    +
    + /* check that the decrypted message starts with header: <mxit/> */
    + if ( strncmp( decoded->str, SECRET_HEADER, strlen( SECRET_HEADER ) != 0 ) ) {
    + g_string_free( decoded, TRUE );
    + return NULL; /* message could not be decoded */
    + }
    +
    + /* remove ISO10126 padding */
    + {
    + /* last byte indicates the number of padding bytes */
    + unsigned int padding = decoded->str[decoded->len - 1];
    + g_string_truncate( decoded, decoded->len - padding );
    + }
    +
    + /* remove encryption header */
    + g_string_erase( decoded, 0, strlen( SECRET_HEADER ) );
    +
    + return g_string_free( decoded, FALSE );
    +}
    --- a/libpurple/protocols/mxit/cipher.h Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/cipher.h Sat Aug 13 22:11:50 2011 +0000
    @@ -32,5 +32,7 @@
    char* mxit_encrypt_password( struct MXitSession* session );
    +char* mxit_decrypt_message( struct MXitSession* session, char* message );
    +
    #endif /* _MXIT_CIPHER_H_ */
    --- a/libpurple/protocols/mxit/formcmds.c Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/formcmds.c Sat Aug 13 22:11:50 2011 +0000
    @@ -253,8 +253,8 @@
    /*------------------------------------------------------------------------
    * Process a Reply MXit command.
    - * [::op=cmd|type=reply|replymsg=back|selmsg=b) Back|id=12345:]
    - * [::op=cmd|nm=rep|type=reply|replymsg=back|selmsg=b) Back|id=12345:]
    + * [::op=cmd|type=reply|replymsg=back|selmsg=b) Back|displaymsg=Processing|id=12345:]
    + * [::op=cmd|nm=rep|type=reply|replymsg=back|selmsg=b) Back|displaymsg=Processing|id=12345:]
    *
    * @param mx The received message data object
    * @param hash The MXit command <key,value> map
    @@ -265,22 +265,26 @@
    char* selmsg;
    char* nm;
    - selmsg = g_hash_table_lookup(hash, "selmsg"); /* find the selection message */
    - replymsg = g_hash_table_lookup(hash, "replymsg"); /* find the reply message */
    + selmsg = g_hash_table_lookup(hash, "selmsg"); /* selection message */
    + replymsg = g_hash_table_lookup(hash, "replymsg"); /* reply message */
    nm = g_hash_table_lookup(hash, "nm"); /* name parameter */
    - if ((selmsg) && (replymsg) && (nm)) {
    +
    + if ((selmsg == NULL) || (replymsg == NULL))
    + return; /* these parameters are required */
    +
    + if (nm) { /* indicates response must be a structured response */
    gchar* seltext = g_markup_escape_text(purple_url_decode(selmsg), -1);
    - gchar* replycmd = g_strdup_printf("::type=reply|nm=%s|res=%s|err=0:", nm, replymsg);
    + gchar* replycmd = g_strdup_printf("type=reply|nm=%s|res=%s|err=0", nm, replymsg);
    - mxit_add_html_link( mx, replycmd, seltext );
    + mxit_add_html_link( mx, replycmd, TRUE, seltext );
    g_free(seltext);
    g_free(replycmd);
    }
    - else if ((selmsg) && (replymsg)) {
    + else {
    gchar* seltext = g_markup_escape_text(purple_url_decode(selmsg), -1);
    - mxit_add_html_link( mx, purple_url_decode(replymsg), seltext );
    + mxit_add_html_link( mx, purple_url_decode(replymsg), FALSE, seltext );
    g_free(seltext);
    }
    @@ -317,6 +321,7 @@
    /*------------------------------------------------------------------------
    * Process an inline image MXit command.
    + * [::op=img|dat=ASDF23408asdflkj2309flkjsadf%3d%3d|algn=1|w=120|h=12|t=100|replymsg=text:]
    *
    * @param mx The received message data object
    * @param hash The MXit command <key,value> map
    @@ -372,7 +377,7 @@
    reply = g_hash_table_lookup(hash, "replymsg");
    if (reply) {
    g_string_append_printf(msg, "\n");
    - mxit_add_html_link(mx, reply, _( "click here" ));
    + mxit_add_html_link(mx, reply, FALSE, _( "click here" ));
    }
    }
    --- a/libpurple/protocols/mxit/markup.c Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/markup.c Sat Aug 13 22:11:50 2011 +0000
    @@ -124,10 +124,11 @@
    * Adds a link to a message
    *
    * @param mx The Markup message object
    - * @param linkname This is the what will be returned when the link gets clicked
    - * @param displayname This is the name for the link which will be displayed in the UI
    + * @param replydata This is the what will be returned when the link gets clicked
    + * @param isStructured Indicates that the reply is a structured reply
    + * @param displaytext This is the text for the link which will be displayed in the UI
    */
    -void mxit_add_html_link( struct RXMsgData* mx, const char* linkname, const char* displayname )
    +void mxit_add_html_link( struct RXMsgData* mx, const char* replydata, gboolean isStructured, const char* displaytext )
    {
    #ifdef MXIT_LINK_CLICK
    char retstr[256];
    @@ -135,15 +136,24 @@
    char link[256];
    int len;
    - len = g_snprintf( retstr, sizeof( retstr ), "%s|%s|%s|%s|%s", MXIT_LINK_KEY, purple_account_get_username( mx->session->acc ),
    - purple_account_get_protocol_id( mx->session->acc ), mx->from, linkname );
    + /*
    + * The link content is encoded as follows:
    + * MXIT_LINK_KEY | ACCOUNT_USER | ACCOUNT_PROTO | REPLY_TO | REPLY_FORMAT | REPLY_DATA
    + */
    + len = g_snprintf( retstr, sizeof( retstr ), "%s|%s|%s|%s|%i|%s",
    + MXIT_LINK_KEY,
    + purple_account_get_username( mx->session->acc ),
    + purple_account_get_protocol_id( mx->session->acc ),
    + mx->from,
    + isStructured ? 1 : 0,
    + replydata );
    retstr64 = purple_base64_encode( (const unsigned char*) retstr, len );
    g_snprintf( link, sizeof( link ), "%s%s", MXIT_LINK_PREFIX, retstr64 );
    g_free( retstr64 );
    - g_string_append_printf( mx->msg, "<a href=\"%s\">%s</a>", link, displayname );
    + g_string_append_printf( mx->msg, "<a href=\"%s\">%s</a>", link, displaytext );
    #else
    - g_string_append_printf( mx->msg, "<b>%s</b>", linkname );
    + g_string_append_printf( mx->msg, "<b>%s</b>", replydata );
    #endif
    }
    @@ -735,6 +745,7 @@
    gboolean tag_bold = FALSE;
    gboolean tag_under = FALSE;
    gboolean tag_italic = FALSE;
    + int font_size = 0;
    #ifdef MXIT_DEBUG_MARKUP
    purple_debug_info( MXIT_PLUGIN_ID, "Markup RX (original): '%s'\n", message );
    @@ -823,7 +834,7 @@
    if ( ch ) {
    /* end found */
    *ch = '\0';
    - mxit_add_html_link( mx, &message[i + 1], &message[i + 1] );
    + mxit_add_html_link( mx, &message[i + 1], FALSE, &message[i + 1] );
    *ch = '$';
    i += ( ch - &message[i + 1] ) + 1;
    }
    @@ -862,59 +873,54 @@
    }
    break;
    case '.' :
    - if ( !( msgflags & CP_MSG_EMOTICON ) ) {
    - g_string_append_c( mx->msg, message[i] );
    - break;
    - }
    - else if ( i + 1 >= len ) {
    + if ( i + 1 >= len ) {
    /* message too short */
    g_string_append_c( mx->msg, '.' );
    break;
    }
    - switch ( message[i+1] ) {
    - case '+' :
    - /* increment text size */
    - g_string_append( mx->msg, "<font size=\"+1\">" );
    - i++;
    - break;
    - case '-' :
    - /* decrement text size */
    - g_string_append( mx->msg, "<font size=\"-1\">" );
    - i++;
    - break;
    - case '{' :
    - /* custom emoticon */
    - if ( i + 2 >= len ) {
    - /* message too short */
    - g_string_append_c( mx->msg, '.' );
    - break;
    - }
    + if ( ( msgflags & CP_MSG_EMOTICON ) && ( message[i+1] == '{' ) ) {
    + /* custom emoticon */
    + if ( i + 2 >= len ) {
    + /* message too short */
    + g_string_append_c( mx->msg, '.' );
    + break;
    + }
    +
    + parse_emoticon_str( &message[i+2], tmpstr1 );
    + if ( tmpstr1[0] != '\0' ) {
    + mx->got_img = TRUE;
    +
    + if ( g_hash_table_lookup( mx->session->iimages, tmpstr1 ) ) {
    + /* emoticon found in the cache, so we do not have to request it from the WAPsite */
    + }
    + else {
    + /* request emoticon from the WAPsite */
    + mx->img_count++;
    + emoticon_request( mx, tmpstr1 );
    + }
    - parse_emoticon_str( &message[i+2], tmpstr1 );
    - if ( tmpstr1[0] != '\0' ) {
    - mx->got_img = TRUE;
    + g_string_append_printf( mx->msg, MXIT_II_TAG"%s>", tmpstr1 );
    + i += strlen( tmpstr1 ) + 2;
    + }
    + else
    + g_string_append_c( mx->msg, '.' );
    + }
    + else if ( ( msgflags & CP_MSG_MARKUP ) && ( message[i+1] == '+' ) ) {
    + /* increment text size */
    + font_size++;
    + g_string_append_printf( mx->msg, "<font size=\"%+i\">", font_size );
    + i++;
    + }
    + else if ( ( msgflags & CP_MSG_MARKUP ) && ( message[i+1] == '-' ) ) {
    + /* decrement text size */
    + font_size--;
    + g_string_append_printf( mx->msg, "<font size=\"%+i\">", font_size );
    + i++;
    + }
    + else
    + g_string_append_c( mx->msg, '.' );
    - if ( g_hash_table_lookup( mx->session->iimages, tmpstr1 ) ) {
    - /* emoticon found in the cache, so we do not have to request it from the WAPsite */
    - }
    - else {
    - /* request emoticon from the WAPsite */
    - mx->img_count++;
    - emoticon_request( mx, tmpstr1 );
    - }
    -
    - g_string_append_printf( mx->msg, MXIT_II_TAG"%s>", tmpstr1 );
    - i += strlen( tmpstr1 ) + 2;
    - }
    - else
    - g_string_append_c( mx->msg, '.' );
    -
    - break;
    - default :
    - g_string_append_c( mx->msg, '.' );
    - break;
    - }
    break;
    case '\\' :
    if ( i + 1 >= len ) {
    --- a/libpurple/protocols/mxit/markup.h Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/markup.h Sat Aug 13 22:11:50 2011 +0000
    @@ -31,7 +31,7 @@
    void mxit_parse_markup( struct RXMsgData* mx, char* message, int len, short msgtype, int msgflags );
    char* mxit_convert_markup_tx( const char* message, int* msgtype );
    -void mxit_add_html_link( struct RXMsgData* mx, const char* linkname, const char* displayname );
    +void mxit_add_html_link( struct RXMsgData* mx, const char* replydata, gboolean isStructured, const char* displaytext );
    void mxit_show_message( struct RXMsgData* mx );
    void mxit_free_emoticon_cache( struct MXitSession* session );
    --- a/libpurple/protocols/mxit/multimx.c Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/multimx.c Sat Aug 13 22:11:50 2011 +0000
    @@ -277,7 +277,11 @@
    GHashTable *components;
    struct multimx* multimx = NULL;
    - purple_debug_info(MXIT_PLUGIN_ID, "Groupchat invite to '%s' by '%s'\n", contact->alias, creator);
    + purple_debug_info(MXIT_PLUGIN_ID, "Groupchat invite to '%s' (roomid='%s') by '%s'\n", contact->alias, contact->username, creator);
    +
    + /* Check if the room already exists (ie, already joined or invite pending) */
    + if (find_room_by_username(session, contact->username) != NULL)
    + return;
    /* Create a new room */
    multimx = room_create(session, contact->username, contact->alias, STATE_INVITED);
    @@ -307,7 +311,7 @@
    multimx = find_room_by_username(session, contact->username);
    if (multimx == NULL) {
    multimx = room_create(session, contact->username, contact->alias, TRUE);
    - }
    + }
    else if (multimx->state == STATE_INVITED) {
    /* After successfully accepting an invitation */
    multimx->state = STATE_JOINED;
    --- a/libpurple/protocols/mxit/mxit.c Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/mxit.c Sat Aug 13 22:11:50 2011 +0000
    @@ -75,10 +75,10 @@
    link = (gchar*) purple_base64_decode( link64 + strlen( MXIT_LINK_PREFIX ), &len );
    purple_debug_info( MXIT_PLUGIN_ID, "Clicked Link: '%s'\n", link );
    - parts = g_strsplit( link, "|", 5 );
    + parts = g_strsplit( link, "|", 6 );
    /* check if this is a valid mxit link */
    - if ( ( !parts ) || ( !parts[0] ) || ( !parts[1] ) || ( !parts[2] ) || ( !parts[3] ) || ( !parts[4] ) ) {
    + if ( ( !parts ) || ( !parts[0] ) || ( !parts[1] ) || ( !parts[2] ) || ( !parts[3] ) || ( !parts[4] ) || ( !parts[5] ) ) {
    /* this is not for us */
    goto skip;
    }
    @@ -96,10 +96,10 @@
    goto skip;
    /* determine if it's a command-response to send */
    - is_command = g_str_has_prefix( parts[4], "::type=reply|" );
    + is_command = ( atoi( parts[4] ) == 1 );
    /* send click message back to MXit */
    - mxit_send_message( con->proto_data, parts[3], parts[4], FALSE, is_command );
    + mxit_send_message( con->proto_data, parts[3], parts[5], FALSE, is_command );
    g_free( link );
    link = NULL;
    @@ -309,19 +309,18 @@
    */
    char* mxit_status_text( PurpleBuddy* buddy )
    {
    + char* text = NULL;
    struct contact* contact = purple_buddy_get_protocol_data(buddy);
    if ( !contact )
    return NULL;
    - if ( contact->statusMsg ) {
    - /* status message */
    - return g_strdup( contact-> statusMsg );
    - }
    - else {
    - /* mood */
    - return g_strdup( mxit_convert_mood_to_name( contact->mood ) );
    - }
    + if ( contact->statusMsg ) /* status message */
    + text = g_strdup( contact-> statusMsg );
    + else if ( contact->mood != MXIT_MOOD_NONE ) /* mood */
    + text = g_strdup( mxit_convert_mood_to_name( contact->mood ) );
    +
    + return text;
    }
    @@ -358,10 +357,6 @@
    /* rejection message */
    if ( ( contact->subtype == MXIT_SUBTYPE_REJECTED ) && ( contact->msg != NULL ) )
    purple_notify_user_info_add_pair( info, _( "Rejection Message" ), contact->msg );
    -
    - /* hidden number */
    - if ( contact->flags & MXIT_CFLAG_HIDDEN )
    - purple_notify_user_info_add_pair( info, _( "Hidden Number" ), _( "Yes" ) );
    }
    --- a/libpurple/protocols/mxit/profile.c Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/profile.c Sat Aug 13 22:11:50 2011 +0000
    @@ -215,9 +215,6 @@
    /* subscription type */
    purple_notify_user_info_add_pair( info, _( "Subscription" ), mxit_convert_subtype_to_name( contact->subtype ) );
    -
    - /* hidden number */
    - purple_notify_user_info_add_pair( info, _( "Hidden Number" ), ( contact->flags & MXIT_CFLAG_HIDDEN ) ? _( "Yes" ) : _( "No" ) );
    }
    else {
    /* this is an invite */
    --- a/libpurple/protocols/mxit/profile.h Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/profile.h Sat Aug 13 22:11:50 2011 +0000
    @@ -50,7 +50,6 @@
    int flags; /* user's profile flags */
    gint64 lastonline; /* user's last-online timestamp */
    - gboolean hidden; /* set if the user's mxitid should remain hidden */
    };
    struct MXitSession;
    --- a/libpurple/protocols/mxit/protocol.c Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/protocol.c Sat Aug 13 22:11:50 2011 +0000
    @@ -1448,7 +1448,7 @@
    PurpleStatus* status;
    int presence;
    const char* statusmsg;
    - const char* profilelist[] = { CP_PROFILE_BIRTHDATE, CP_PROFILE_GENDER, CP_PROFILE_HIDENUMBER, CP_PROFILE_FULLNAME,
    + const char* profilelist[] = { CP_PROFILE_BIRTHDATE, CP_PROFILE_GENDER, CP_PROFILE_FULLNAME,
    CP_PROFILE_TITLE, CP_PROFILE_FIRSTNAME, CP_PROFILE_LASTNAME, CP_PROFILE_EMAIL,
    CP_PROFILE_MOBILENR, CP_PROFILE_WHEREAMI, CP_PROFILE_ABOUTME, CP_PROFILE_FLAGS };
    @@ -1516,6 +1516,7 @@
    {
    struct RXMsgData* mx = NULL;
    char* message = NULL;
    + char* sender = NULL;
    int msglen = 0;
    int msgflags = 0;
    int msgtype = 0;
    @@ -1529,10 +1530,11 @@
    msglen = strlen( message );
    /* strip off dummy domain */
    - mxit_strip_domain( records[0]->fields[0]->data );
    + sender = records[0]->fields[0]->data;
    + mxit_strip_domain( sender );
    #ifdef DEBUG_PROTOCOL
    - purple_debug_info( MXIT_PLUGIN_ID, "Message received from '%s'\n", records[0]->fields[0]->data );
    + purple_debug_info( MXIT_PLUGIN_ID, "Message received from '%s'\n", sender );
    #endif
    /* decode message flags (if any) */
    @@ -1540,33 +1542,42 @@
    msgflags = atoi( records[0]->fields[4]->data );
    msgtype = atoi( records[0]->fields[2]->data );
    - if ( msgflags & CP_MSG_ENCRYPTED ) {
    - /* this is an encrypted message. we do not currently support those so ignore it */
    + if ( msgflags & CP_MSG_PWD_ENCRYPTED ) {
    + /* this is a password encrypted message. we do not currently support those so ignore it */
    PurpleBuddy* buddy;
    const char* name;
    char msg[128];
    - buddy = purple_find_buddy( session->acc, records[0]->fields[0]->data );
    + buddy = purple_find_buddy( session->acc, sender );
    if ( buddy )
    name = purple_buddy_get_alias( buddy );
    else
    - name = records[0]->fields[0]->data;
    + name = sender;
    g_snprintf( msg, sizeof( msg ), _( "%s sent you an encrypted message, but it is not supported on this client." ), name );
    mxit_popup( PURPLE_NOTIFY_MSG_WARNING, _( "Message Error" ), msg );
    return;
    }
    + else if ( msgflags & CP_MSG_TL_ENCRYPTED ) {
    + /* this is a transport-layer encrypted message. */
    + message = mxit_decrypt_message( session, message );
    + if ( !message ) {
    + /* could not be decrypted */
    + serv_got_im( session->con, sender, _( "An encrypted message was received which could not be decrypted." ), PURPLE_MESSAGE_ERROR, time( NULL ) );
    + return;
    + }
    + }
    if ( msgflags & CP_MSG_NOTIFY_DELIVERY ) {
    /* delivery notification is requested */
    if ( records[0]->fcount >= 4 )
    - mxit_send_msgevent( session, records[0]->fields[0]->data, records[0]->fields[3]->data, CP_MSGEVENT_DELIVERED );
    + mxit_send_msgevent( session, sender, records[0]->fields[3]->data, CP_MSGEVENT_DELIVERED );
    }
    /* create and initialise new markup struct */
    mx = g_new0( struct RXMsgData, 1 );
    mx->msg = g_string_sized_new( msglen );
    mx->session = session;
    - mx->from = g_strdup( records[0]->fields[0]->data );
    + mx->from = g_strdup( sender );
    mx->timestamp = atoi( records[0]->fields[1]->data );
    mx->got_img = FALSE;
    mx->chatid = -1;
    @@ -1597,6 +1608,10 @@
    * so the image received callback function will eventually display
    * the message. */
    }
    +
    + /* cleanup */
    + if ( msgflags & CP_MSG_TL_ENCRYPTED )
    + g_free( message );
    }
    @@ -1810,10 +1825,6 @@
    /* gender */
    profile->male = ( fvalue[0] == '1' );
    }
    - else if ( strcmp( CP_PROFILE_HIDENUMBER, fname ) == 0 ) {
    - /* hide number */
    - profile->hidden = ( fvalue[0] == '1' );
    - }
    else if ( strcmp( CP_PROFILE_FULLNAME, fname ) == 0 ) {
    /* nickname */
    g_strlcpy( profile->nickname, fvalue, sizeof( profile->nickname ) );
    --- a/libpurple/protocols/mxit/protocol.h Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/protocol.h Sat Aug 13 22:11:50 2011 +0000
    @@ -155,7 +155,10 @@
    /* message flags */
    #define CP_MSG_NOTIFY_DELIVERY 0x0002 /* request delivery notification */
    #define CP_MSG_NOTIFY_READ 0x0004 /* request read notification */
    -#define CP_MSG_ENCRYPTED 0x0010 /* message is encrypted */
    +#define CP_MSG_PWD_ENCRYPTED 0x0010 /* message is password encrypted */
    +#define CP_MSG_TL_ENCRYPTED 0x0020 /* message is transport encrypted */
    +#define CP_MSG_RPLY_PWD_ENCRYPT 0x0040 /* reply should be password encrypted */
    +#define CP_MSG_RPLY_TL_ENCRYPT 0x0080 /* reply should be transport encrypted */
    #define CP_MSG_MARKUP 0x0200 /* message may contain markup */
    #define CP_MSG_EMOTICON 0x0400 /* message may contain custom emoticons */
    @@ -179,7 +182,7 @@
    /* extended profile attribute fields */
    #define CP_PROFILE_BIRTHDATE "birthdate" /* Birthdate (String - ISO 8601 format) */
    #define CP_PROFILE_GENDER "gender" /* Gender (Boolean - 0=female, 1=male) */
    -#define CP_PROFILE_HIDENUMBER "hidenumber" /* Hide Number (Boolean - 0=false, 1=true) */
    +// #define CP_PROFILE_HIDENUMBER "hidenumber" /* Hide Number (Boolean - 0=false, 1=true) (DEPRECATED) */
    #define CP_PROFILE_FULLNAME "fullname" /* Fullname (UTF8 String) */
    #define CP_PROFILE_STATUS "statusmsg" /* Status Message (UTF8 String) */
    #define CP_PROFILE_PREVSTATUS "prevstatusmsgs" /* Previous Status Messages (UTF8 String) */
    --- a/libpurple/protocols/mxit/roster.h Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/roster.h Sat Aug 13 22:11:50 2011 +0000
    @@ -74,7 +74,7 @@
    /* MXit contact flags */
    -#define MXIT_CFLAG_HIDDEN 0x02
    +//#define MXIT_CFLAG_HIDDEN 0x02 /* (DEPRECATED) */
    #define MXIT_CFLAG_GATEWAY 0x04
    #define MXIT_CFLAG_FOCUS_SEND_BLANK 0x20000
    @@ -96,7 +96,7 @@
    /* client protocol constants */
    #define MXIT_CP_MAX_JID_LEN 64
    #define MXIT_CP_MAX_GROUP_LEN 32
    -#define MXIT_CP_MAX_ALIAS_LEN 48
    +#define MXIT_CP_MAX_ALIAS_LEN 100
    #define MXIT_DEFAULT_GROUP "MXit"
    @@ -106,8 +106,8 @@
    */
    struct contact {
    char username[MXIT_CP_MAX_JID_LEN+1]; /* unique contact name (with domain) */
    - char alias[MXIT_CP_MAX_GROUP_LEN+1]; /* contact alias (what will be seen) */
    - char groupname[MXIT_CP_MAX_ALIAS_LEN+1]; /* contact group name */
    + char alias[MXIT_CP_MAX_ALIAS_LEN+1]; /* contact alias (what will be seen) */
    + char groupname[MXIT_CP_MAX_GROUP_LEN+1]; /* contact group name */
    short type; /* contact type */
    short mood; /* contact current mood */
    --- a/libpurple/protocols/mxit/voicevideo.c Sat Aug 13 21:57:35 2011 +0000
    +++ b/libpurple/protocols/mxit/voicevideo.c Sat Aug 13 22:11:50 2011 +0000
    @@ -95,7 +95,7 @@
    /* and only when they're online */
    if (contact->presence == MXIT_PRESENCE_OFFLINE)
    - return MXIT_PRESENCE_OFFLINE;
    + return PURPLE_MEDIA_CAPS_NONE;
    /* they support voice-only */
    if (contact->capabilities & MXIT_PFLAG_VOICE)