[Gaim-commits] CVS: gaim/plugins ciphertest.c,NONE,1.1 signals-test.c,1.18,1.19

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14398/plugins

Modified Files:
	signals-test.c 
Added Files:
	ciphertest.c 
Log Message:
the cipher api that grim has been working on for ages is finally done!! big
congrats and thanks to him!!

lots of modified files in this commit. it builds here.

moved the md5 files to src/protocols/oscar so that it continues to depend
on nothing in gaim.  everything else uses the new centralized cipher api.
I'm not sure if src/md5.* needs to be removed or not, so I left it there.
someone let me know or do it directly.

someone check if these need to be added to potfiles.in

and let there be much rejoicing!


--- NEW FILE: ciphertest.c ---
/*
 * A plugin to test the ciphers that ship with gaim
 *
 * Copyright (C) 2004, Gary Kramlich <amc...@us...>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 */

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#ifndef GAIM_PLUGINS
#define GAIM_PLUGINS
#endif

#include "internal.h"

#include <glib.h>
#include <string.h>

#include "cipher.h"
#include "debug.h"
#include "plugin.h"
#include "version.h"

struct test {
	const guint8 *question;
	const guint8 *answer;
};

/**************************************************************************
 * MD5 Stuff
 **************************************************************************/
struct test md5_tests[8] = {
	{							"",	"d41d8cd98f00b204e9800998ecf8427e"},
	{						   "a",	"0cc175b9c0f1b6a831c399e269772661"},
	{						 "abc",	"900150983cd24fb0d6963f7d28e17f72"},
	{			  "message digest",	"f96b697d7cb7938d525a2f31aaf161d0"},
	{ "abcdefghijklmnopqrstuvwxyz",	"c3fcd3d76192e4007dfb496cca67e13b"},
	{ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
	  "abcdefghijklmnopqrstuvwxyz"
					  "0123456789",	"d174ab98d277d9f5a5611c2c9f419d9f"},
	{"123456789012345678901234567"
	 "890123456789012345678901234"
	  "56789012345678901234567890",	"57edf4a22be3c955ac49da2e2107b67a"},
	{						  NULL, NULL							  }
};

static void
cipher_test_md5() {
	GaimCipher *cipher;
	GaimCipherContext *context;
	gchar digest[32];
	gint i = 0;

	cipher = gaim_ciphers_find_cipher("md5");
	if(!cipher) {
		gaim_debug_info("cipher-test",
						"could not find md5 cipher, not testing\n");
		return;
	}

	gaim_debug_info("cipher-test", "Running md5 tests\n");

	context = gaim_cipher_context_new(cipher, NULL);

	while(md5_tests[i].answer) {
		gaim_debug_info("cipher-test", "Test %02d:\n", i);
		gaim_debug_info("cipher-test", "Testing '%s'\n", md5_tests[i].question);

		gaim_cipher_context_append(context, md5_tests[i].question,
								   strlen(md5_tests[i].question));

		gaim_cipher_context_digest_to_str(context, NULL, digest);

		gaim_debug_info("cipher-test", "\tGot:    %s\n", digest);
		gaim_debug_info("cipher-test", "\tWanted: %s\n", md5_tests[i].answer);

		gaim_cipher_context_reset(context, NULL);
		i++;
	}

	gaim_cipher_context_destroy(context);

	gaim_debug_info("cipher-test", "md5 tests completed\n\n");
}

/**************************************************************************
 * SHA-1 stuff
 **************************************************************************/
struct test sha1_tests[5] = {
	{"a", "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8"},
	{"abc", "a9993e364706816aba3e25717850c26c9cd0d89d"} ,
	{"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", "84983e441c3bd26ebaae4aa1f95129e5e54670f1"} ,
    {NULL, "34aa973cd4c4daa4f61eeb2bdbad27316534016f"},
	{NULL, NULL}
};

static void
cipher_test_sha1() {
	GaimCipher *cipher;
	GaimCipherContext *context;
	gchar digest[40];
	gint i = 0;

	cipher = gaim_ciphers_find_cipher("sha1");
	if(!cipher) {
		gaim_debug_info("cipher-test",
						"could not find sha1 cipher, not testing\n");
		return;
	}

	gaim_debug_info("cipher-test", "Running sha1 tests\n");

	context = gaim_cipher_context_new(cipher, NULL);

	while(sha1_tests[i].answer) {
		gaim_debug_info("cipher-test", "Test %02d:\n", i);
		gaim_debug_info("cipher-test", "Testing '%s'\n",
						(sha1_tests[i].question != NULL) ?
						sha1_tests[i].question : "'a'x1000, 1000 times");

		if(sha1_tests[i].question) {
			gaim_cipher_context_append(context, sha1_tests[i].question,
									   strlen(sha1_tests[i].question));
		} else {
			gint j;
			guint8 buff[1000];

			memset(buff, 'a', 1000);

			for(j = 0; j < 1000; j++)
				gaim_cipher_context_append(context, buff, 1000);
		}

		gaim_cipher_context_digest_to_str(context, NULL, digest);

		gaim_debug_info("cipher-test", "\tGot:    %s\n", digest);
		gaim_debug_info("cipher-test", "\tWanted: %s\n", sha1_tests[i].answer);

		gaim_cipher_context_reset(context, NULL);
		i++;
	}

	gaim_cipher_context_destroy(context);

	gaim_debug_info("cipher-test", "sha1 tests completed\n\n");
}
/**************************************************************************
 * Plugin stuff
 **************************************************************************/
static gboolean
plugin_load(GaimPlugin *plugin) {
	cipher_test_md5();
	cipher_test_sha1();

	return TRUE;
}

static GaimPluginInfo info =
{
	GAIM_PLUGIN_MAGIC,
	GAIM_MAJOR_VERSION,
	GAIM_MINOR_VERSION,
	GAIM_PLUGIN_STANDARD,								/**< type           */
	NULL,												/**< ui_requirement */
	0,													/**< flags          */
	NULL,												/**< dependencies   */
	GAIM_PRIORITY_DEFAULT,								/**< priority       */

	"core-cipher-test",									/**< id             */
	N_("Cipher Test"),									/**< name           */
	VERSION,											/**< version        */
														/**  summary        */
	N_("Tests the ciphers that ship with gaim."),
														/**  description    */
	N_("Tests the ciphers that ship with gaim."),
	"Gary Kramlich <amc...@us...>",			/**< author         */
	GAIM_WEBSITE,										/**< homepage       */

	plugin_load,										/**< load           */
	NULL,												/**< unload         */
	NULL,												/**< destroy        */

	NULL,												/**< ui_info        */
	NULL,												/**< extra_info     */
	NULL,
	NULL
};

static void
init_plugin(GaimPlugin *plugin) {
}

GAIM_INIT_PLUGIN(ciper_test, init_plugin, info)

Index: signals-test.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/signals-test.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -p -r1.18 -r1.19
--- signals-test.c	16 Oct 2004 15:07:20 -0000	1.18
+++ signals-test.c	11 Mar 2005 13:05:23 -0000	1.19
@@ -23,6 +23,7 @@
 #include <stdio.h>
 
 #include "internal.h"
+#include "cipher.h"
 #include "connection.h"
 #include "conversation.h"
 #include "core.h"
@@ -439,6 +440,21 @@ chat_topic_changed_cb(GaimConversation *
 					(who) ? who : "unknown");
 }
 /**************************************************************************
+ * Ciphers signal callbacks
+ **************************************************************************/
+static void
+cipher_added_cb(GaimCipher *cipher, void *data) {
+	gaim_debug_misc("signals test", "cipher %s added\n",
+					gaim_cipher_get_name(cipher));
+}
+
+static void
+cipher_removed_cb(GaimCipher *cipher, void *data) {
+	gaim_debug_misc("signals test", "cipher %s removed\n",
+					gaim_cipher_get_name(cipher));
+}
+
+/**************************************************************************
  * Core signal callbacks
  **************************************************************************/
 static void
@@ -458,6 +474,7 @@ plugin_load(GaimPlugin *plugin)
 	void *conn_handle = gaim_connections_get_handle();
 	void *conv_handle = gaim_conversations_get_handle();
 	void *accounts_handle = gaim_accounts_get_handle();
+	void *ciphers_handle = gaim_ciphers_get_handle();
 
 	/* Accounts subsystem signals */
 	gaim_signal_connect(accounts_handle, "account-connecting",
@@ -563,6 +580,12 @@ plugin_load(GaimPlugin *plugin)
 	gaim_signal_connect(conv_handle, "chat-topic-changed",
 						plugin, GAIM_CALLBACK(chat_topic_changed_cb), NULL);
 
+	/* Ciphers signals */
+	gaim_signal_connect(ciphers_handle, "cipher-added",
+						plugin, GAIM_CALLBACK(cipher_added_cb), NULL);
+	gaim_signal_connect(ciphers_handle, "cipher-removed",
+						plugin, GAIM_CALLBACK(cipher_removed_cb), NULL);
+
 	/* Core signals */
 	gaim_signal_connect(core_handle, "quitting",
 						plugin, GAIM_CALLBACK(quitting_cb), NULL);