diff -r 087db73b115d -r 295cd5bf4c41 libpurple/protocols/oscar/family_oservice.c --- a/libpurple/protocols/oscar/family_oservice.c Sat Jun 15 14:28:31 2013 +0530 +++ b/libpurple/protocols/oscar/family_oservice.c Sat Jun 15 20:21:51 2013 +0530 @@ -25,7 +25,7 @@ #include "oscar.h" -#include "cipher.h" +#include "ciphers/md5.h" /* * Each time we make a FLAP connection to an oscar server the server gives @@ -972,18 +972,18 @@ byte_stream_putraw(&bs, buf, 0x10); } else if (buf && (len > 0)) { /* use input buffer */ - PurpleCipherContext *context; + PurpleCipher *cipher; guchar digest[16]; - context = purple_cipher_context_new_by_name("md5", NULL); - purple_cipher_context_append(context, buf, len); - purple_cipher_context_digest(context, digest, sizeof(digest)); - purple_cipher_context_destroy(context); + cipher = purple_md5_cipher_new(); + purple_cipher_append(cipher, buf, len); + purple_cipher_digest(cipher, digest, sizeof(digest)); + g_object_unref(cipher); byte_stream_putraw(&bs, digest, 0x10); } else if (len == 0) { /* no length, just hash NULL (buf is optional) */ - PurpleCipherContext *context; + PurpleCipher *cipher; guchar digest[16]; guint8 nil = '\0'; @@ -991,10 +991,10 @@ * I'm not sure if we really need the empty append with the * new MD5 functions, so I'll leave it in, just in case. */ - context = purple_cipher_context_new_by_name("md5", NULL); - purple_cipher_context_append(context, &nil, 0); - purple_cipher_context_digest(context, digest, sizeof(digest)); - purple_cipher_context_destroy(context); + cipher = purple_md5_cipher_new(); + purple_cipher_append(cipher, &nil, 0); + purple_cipher_digest(cipher, digest, sizeof(digest)); + g_object_unref(cipher); byte_stream_putraw(&bs, digest, 0x10);