diff libpurple/tests/test_jabber_scram.c @ 28707:c1d41b7484ff

jabber: Complete (though untested) SCRAM implementation. Client proof calculations function properly, but parsing is untested.

--- a/libpurple/tests/test_jabber_scram.c	Sun Nov 08 18:39:30 2009 +0000
+++ b/libpurple/tests/test_jabber_scram.c	Mon Nov 09 03:42:26 2009 +0000
@@ -4,14 +4,14 @@
 #include "../util.h"
 #include "../protocols/jabber/auth_scram.h"
 
+static JabberSaslMech *scram_sha1_mech = NULL;
+
 #define assert_pbkdf2_equal(password, salt, count, expected) { \
 	GString *p = g_string_new(password); \
 	GString *s = g_string_new(salt); \
-	GString *result = jabber_auth_scram_hi("sha1", p, s, count); \
+	guchar *result = jabber_scram_hi("sha1", p, s, count); \
 	fail_if(result == NULL, "Hi() returned NULL"); \
-	fail_if(result->len != 20, "Hi() returned with unexpected length %u", result->len); \
-	fail_if(0 != memcmp(result->str, expected, 20), "Hi() returned invalid result"); \
-	g_string_free(result, TRUE); \
+	fail_if(0 != memcmp(result, expected, 20), "Hi() returned invalid result"); \
 	g_string_free(s, TRUE); \
 	g_string_free(p, TRUE); \
 }
@@ -19,9 +19,7 @@
 START_TEST(test_pbkdf2)
 {
 	assert_pbkdf2_equal("password", "salt", 1, "\x0c\x60\xc8\x0f\x96\x1f\x0e\x71\xf3\xa9\xb5\x24\xaf\x60\x12\x06\x2f\xe0\x37\xa6");
-	
 	assert_pbkdf2_equal("password", "salt", 2, "\xea\x6c\x01\x4d\xc7\x2d\x6f\x8c\xcd\x1e\xd9\x2a\xce\x1d\x41\xf0\xd8\xde\x89\x57");
-
 	assert_pbkdf2_equal("password", "salt", 4096, "\x4b\x00\x79\x01\xb7\x65\x48\x9a\xbe\xad\x49\xd9\x26\xf7\x21\xd0\x65\xa4\x29\xc1");
 
 #if 0
@@ -31,6 +29,40 @@
 }
 END_TEST
 
+START_TEST(test_proofs)
+{
+	JabberScramData *data = g_new0(JabberScramData, 1);
+	gboolean ret;
+	GString *salt;
+	const char *client_proof;
+/*	const char *server_signature; */
+
+	data->hash = "sha1";
+	data->auth_message = g_string_new("n=[e-mail],r=8jLxB5515dhFxBil5A0xSXMH,"
+			"r=8jLxB5515dhFxBil5A0xSXMHabc,s=c2FsdA==,i=1,"
+			"c=biws,r=8jLxB5515dhFxBil5A0xSXMHabc");
+	client_proof = "\x48\x61\x30\xa5\x61\x0b\xae\xb9\xe4\x11\xa8\xfd\xa5\xcd\x34\x1d\x8a\x3c\x28\x17";
+
+	salt = g_string_new("salt");
+	ret = jabber_scram_calc_proofs(data, "password", salt, 1);
+	fail_if(ret == FALSE, "Failed to calculate SCRAM proofs!");
+
+	fail_unless(0 == memcmp(client_proof, data->client_proof->str, 20));
+	g_string_free(salt, TRUE);
+	g_string_free(data->auth_message, TRUE);
+	g_free(data);
+}
+END_TEST
+
+#if 0
+START_TEST(test_mech)
+{
+	scram_sha1_mech = jabber_scram_get_sha1();
+
+}
+END_TEST
+#endif
+
 Suite *
 jabber_scram_suite(void)
 {
@@ -40,5 +72,9 @@
 	tcase_add_test(tc, test_pbkdf2);
 	suite_add_tcase(s, tc);
 
+	tc = tcase_create("SCRAM Proofs");
+	tcase_add_test(tc, test_proofs);
+	suite_add_tcase(s, tc);
+
 	return s;
 }