diff -r 087db73b115d -r 295cd5bf4c41 libpurple/protocols/msn/object.c --- a/libpurple/protocols/msn/object.c Sat Jun 15 14:28:31 2013 +0530 +++ b/libpurple/protocols/msn/object.c Sat Jun 15 20:21:51 2013 +0530 @@ -26,7 +26,7 @@ #include "object.h" #include "debug.h" /* Sha1 stuff */ -#include "cipher.h" +#include "ciphers/sha1.h" /* Base64 stuff */ #include "util.h" @@ -130,7 +130,7 @@ { MsnObject *msnobj; - PurpleCipherContext *ctx; + PurpleCipher *cipher; char *buf; gconstpointer data; size_t size; @@ -157,9 +157,9 @@ /* Compute the SHA1D field. */ memset(digest, 0, sizeof(digest)); - ctx = purple_cipher_context_new_by_name("sha1", NULL); - purple_cipher_context_append(ctx, data, size); - purple_cipher_context_digest(ctx, digest, sizeof(digest)); + cipher = purple_sha1_cipher_new(); + purple_cipher_append(cipher, data, size); + purple_cipher_digest(cipher, digest, sizeof(digest)); base64 = purple_base64_encode(digest, sizeof(digest)); msn_object_set_sha1d(msnobj, base64); @@ -179,10 +179,10 @@ memset(digest, 0, sizeof(digest)); - purple_cipher_context_reset(ctx, NULL); - purple_cipher_context_append(ctx, (const guchar *)buf, strlen(buf)); - purple_cipher_context_digest(ctx, digest, sizeof(digest)); - purple_cipher_context_destroy(ctx); + purple_cipher_reset(cipher); + purple_cipher_append(cipher, (const guchar *)buf, strlen(buf)); + purple_cipher_digest(cipher, digest, sizeof(digest)); + g_object_unref(cipher); g_free(buf); base64 = purple_base64_encode(digest, sizeof(digest));