diff src/protocols/oscar/oscar.c @ 11404:677a3862260f

[gaim-migrate @ 13639] Stop using separate md5 stuff in oscar and use Gaim's cipher API instead. This reduces the need for G_MODULE_BIND_LOCAL committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/oscar.c	Thu Sep 01 02:46:16 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Sep 01 03:30:18 2005 +0000
@@ -30,6 +30,7 @@
 #include "account.h"
 #include "accountopt.h"
 #include "buddyicon.h"
+#include "cipher.h"
 #include "conversation.h"
 #include "core.h"
 #include "debug.h"
@@ -45,7 +46,6 @@
 #include "version.h"
 
 #include "aim.h"
-#include "md5.h"
 
 #define OSCAR_STATUS_ID_INVISIBLE	"invisible"
 #define OSCAR_STATUS_ID_OFFLINE		"offline"
@@ -7610,7 +7610,6 @@
 	fu8_t flags = 0, length = 0;
 	guchar *md5 = NULL;
 
-
 	va_start(ap, fr);
 	type = va_arg(ap, int);
 
@@ -8168,17 +8167,23 @@
 	} else if (!g_stat(iconfile, &st)) {
 		guchar *buf = g_malloc(st.st_size);
 		file = g_fopen(iconfile, "rb");
-		if (file) {
-			md5_state_t *state;
+		if (file)
+		{
+			GaimCipher *cipher;
+			GaimCipherContext *context;
 			guchar md5[16];
+			int len;
+
 			/* XXX - Use g_file_get_contents()? */
-			int len = fread(buf, 1, st.st_size, file);
+			len = fread(buf, 1, st.st_size, file);
 			fclose(file);
-			state = g_malloc(sizeof(md5_state_t));
-			md5_init(state);
-			md5_append(state, buf, len);
-			md5_finish(state, md5);
-			g_free(state);
+
+			cipher = gaim_ciphers_find_cipher("md5");
+			context = gaim_cipher_context_new(cipher, NULL);
+			gaim_cipher_context_append(context, buf, len);
+			gaim_cipher_context_digest(context, 16, md5, NULL);
+			gaim_cipher_context_destroy(context);
+
 			aim_ssi_seticon(sess, md5, 16);
 		} else
 			gaim_debug_error("oscar",