Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/msn/object.c	Sun Jun 16 03:46:10 2013 +0530
+++ b/libpurple/protocols/msn/object.c	Sun Jun 16 05:59:31 2013 +0530
@@ -26,7 +26,7 @@
 #include "object.h"
 #include "debug.h"
 /* Sha1 stuff */
-#include "ciphers/sha1.h"
+#include "ciphers/sha1hash.h"
 /* Base64 stuff */
 #include "util.h"
 
@@ -130,7 +130,7 @@
 {
 	MsnObject *msnobj;
 
-	PurpleCipher *cipher;
+	PurpleHash *hash;
 	char *buf;
 	gconstpointer data;
 	size_t size;
@@ -157,9 +157,9 @@
 	/* Compute the SHA1D field. */
 	memset(digest, 0, sizeof(digest));
 
-	cipher = purple_sha1_cipher_new();
-	purple_cipher_append(cipher, data, size);
-	purple_cipher_digest(cipher, digest, sizeof(digest));
+	hash = purple_sha1_hash_new();
+	purple_hash_append(hash, data, size);
+	purple_hash_digest(hash, 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_reset(cipher);
-	purple_cipher_append(cipher, (const guchar *)buf, strlen(buf));
-	purple_cipher_digest(cipher, digest, sizeof(digest));
-	g_object_unref(cipher);
+	purple_hash_reset(hash);
+	purple_hash_append(hash, (const guchar *)buf, strlen(buf));
+	purple_hash_digest(hash, digest, sizeof(digest));
+	g_object_unref(hash);
 	g_free(buf);
 
 	base64 = purple_base64_encode(digest, sizeof(digest));