Tue, 10 Sep 2013 13:06:10 +0200
Request API refactoring: introduce PurpleRequestCommonParameters and switch purple_request_input to it
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
1 | /* |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
2 | * purple - Jabber Protocol Plugin |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
3 | * |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
4 | * Purple is the legal property of its developers, whose names are too numerous |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
5 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
6 | * source distribution. |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
7 | * |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
8 | * This program is free software; you can redistribute it and/or modify |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
9 | * it under the terms of the GNU General Public License as published by |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
10 | * the Free Software Foundation; either version 2 of the License, or |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
11 | * (at your option) any later version. |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
12 | * |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
13 | * This program is distributed in the hope that it will be useful, |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
16 | * GNU General Public License for more details. |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
17 | * |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
18 | * You should have received a copy of the GNU General Public License |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
19 | * along with this program; if not, write to the Free Software |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
21 | * |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
22 | */ |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
23 | #include "internal.h" |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
24 | |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
25 | #include "auth.h" |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
26 | #include "auth_scram.h" |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
27 | |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
28 | #include "cipher.h" |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
29 | #include "debug.h" |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
30 | |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
31 | static const JabberScramHash hashes[] = { |
|
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
32 | { "-SHA-1", "sha1", 20 }, |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
33 | }; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
34 | |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
35 | static const JabberScramHash *mech_to_hash(const char *mech) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
36 | { |
|
34304
faf0414a8b51
Fix most of libpurple warnings about -Wsign-compare
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33909
diff
changeset
|
37 | gsize i; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
38 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
39 | g_return_val_if_fail(mech != NULL && *mech != '\0', NULL); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
40 | |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
41 | for (i = 0; i < G_N_ELEMENTS(hashes); ++i) { |
|
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
42 | if (strstr(mech, hashes[i].mech_substr)) |
|
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
43 | return &(hashes[i]); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
44 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
45 | |
|
28927
24ee4d53dc68
jabber: Interop with Prosody (via Tobias' code). Hooray!
Paul Aurich <darkrain42@pidgin.im>
parents:
28926
diff
changeset
|
46 | purple_debug_error("jabber", "Unknown SCRAM mechanism %s\n", mech); |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
47 | g_return_val_if_reached(NULL); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
48 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
49 | |
|
30135
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
50 | static const struct { |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
51 | const char *error; |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
52 | const char *meaning; |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
53 | } server_errors[] = { |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
54 | { "invalid-encoding", |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
55 | N_("Invalid Encoding")}, |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
56 | { "extensions-not-supported", |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
57 | N_("Unsupported Extension") }, |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
58 | { "channel-bindings-dont-match", |
|
30136
e1a1f438f19e
jabber: This is waaaaay more verbose, but has a hope of being approachable.
Paul Aurich <darkrain42@pidgin.im>
parents:
30135
diff
changeset
|
59 | N_("Unexpected response from the server. This may indicate a possible MITM attack") }, |
|
30135
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
60 | { "server-does-support-channel-binding", |
|
30136
e1a1f438f19e
jabber: This is waaaaay more verbose, but has a hope of being approachable.
Paul Aurich <darkrain42@pidgin.im>
parents:
30135
diff
changeset
|
61 | N_("The server does support channel binding, but did not appear to advertise it. This indicates a likely MITM attack") }, |
|
30135
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
62 | { "channel-binding-not-supported", |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
63 | N_("Server does not support channel binding") }, |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
64 | { "unsupported-channel-binding-type", |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
65 | N_("Unsupported channel binding method") }, |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
66 | { "unknown-user", |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
67 | N_("User not found") }, |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
68 | { "invalid-username-encoding", |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
69 | N_("Invalid Username Encoding") }, |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
70 | { "no-resources", |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
71 | N_("Resource Constraint") }, |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
72 | { "other-error", |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
73 | N_("Unknown Error") } |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
74 | }; |
|
aba7ec117798
jabber: Check in some new strings under the freeze radar (no code yet).
Paul Aurich <darkrain42@pidgin.im>
parents:
30036
diff
changeset
|
75 | |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
76 | guchar *jabber_scram_hi(const JabberScramHash *hash, const GString *str, |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
77 | GString *salt, guint iterations) |
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
78 | { |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
79 | PurpleCipherContext *context; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
80 | guchar *result; |
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
81 | guint i; |
|
28864
5b3810bb7f1a
How is it that there's no programmatic way to get the output size of the hash functions without resorting to a hardcoded table? Or did I miss something?
Paul Aurich <darkrain42@pidgin.im>
parents:
28863
diff
changeset
|
82 | guchar *prev, *tmp; |
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
83 | |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
84 | g_return_val_if_fail(hash != NULL, NULL); |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
85 | g_return_val_if_fail(str != NULL && str->len > 0, NULL); |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
86 | g_return_val_if_fail(salt != NULL && salt->len > 0, NULL); |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
87 | g_return_val_if_fail(iterations > 0, NULL); |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
88 | |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
89 | prev = g_new0(guint8, hash->size); |
|
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
90 | tmp = g_new0(guint8, hash->size); |
|
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
91 | result = g_new0(guint8, hash->size); |
|
28864
5b3810bb7f1a
How is it that there's no programmatic way to get the output size of the hash functions without resorting to a hardcoded table? Or did I miss something?
Paul Aurich <darkrain42@pidgin.im>
parents:
28863
diff
changeset
|
92 | |
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
93 | context = purple_cipher_context_new_by_name("hmac", NULL); |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
94 | |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
95 | /* Append INT(1), a four-octet encoding of the integer 1, most significant |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
96 | * octet first. */ |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
97 | g_string_append_len(salt, "\0\0\0\1", 4); |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
98 | |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
99 | /* Compute U0 */ |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
100 | purple_cipher_context_set_option(context, "hash", (gpointer)hash->name); |
|
33908
78b42fd69e02
ciphers cleanup: passing keys with length by default
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33689
diff
changeset
|
101 | purple_cipher_context_set_key(context, (guchar *)str->str, str->len); |
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
102 | purple_cipher_context_append(context, (guchar *)salt->str, salt->len); |
|
33909
773899cbd05a
ciphers cleanup: salt and digest lengths
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33908
diff
changeset
|
103 | purple_cipher_context_digest(context, result, hash->size); |
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
104 | |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
105 | memcpy(prev, result, hash->size); |
|
28863
b4e8c372e06b
Fix the Hi() function and actually 'mtn add' the test file.
Paul Aurich <darkrain42@pidgin.im>
parents:
28862
diff
changeset
|
106 | |
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
107 | /* Compute U1...Ui */ |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
108 | for (i = 1; i < iterations; ++i) { |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
109 | guint j; |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
110 | purple_cipher_context_set_option(context, "hash", (gpointer)hash->name); |
|
33908
78b42fd69e02
ciphers cleanup: passing keys with length by default
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33689
diff
changeset
|
111 | purple_cipher_context_set_key(context, (guchar *)str->str, str->len); |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
112 | purple_cipher_context_append(context, prev, hash->size); |
|
33909
773899cbd05a
ciphers cleanup: salt and digest lengths
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33908
diff
changeset
|
113 | purple_cipher_context_digest(context, tmp, hash->size); |
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
114 | |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
115 | for (j = 0; j < hash->size; ++j) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
116 | result[j] ^= tmp[j]; |
|
28863
b4e8c372e06b
Fix the Hi() function and actually 'mtn add' the test file.
Paul Aurich <darkrain42@pidgin.im>
parents:
28862
diff
changeset
|
117 | |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
118 | memcpy(prev, tmp, hash->size); |
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
119 | } |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
120 | |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
121 | purple_cipher_context_destroy(context); |
|
28865
554be021cd4c
Clean up the two temporary buffers.
Paul Aurich <darkrain42@pidgin.im>
parents:
28864
diff
changeset
|
122 | g_free(tmp); |
|
554be021cd4c
Clean up the two temporary buffers.
Paul Aurich <darkrain42@pidgin.im>
parents:
28864
diff
changeset
|
123 | g_free(prev); |
|
28862
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
124 | return result; |
|
8a37b7df0850
jabber: Add the Hi() function (PBKDF2).
Paul Aurich <darkrain42@pidgin.im>
parents:
diff
changeset
|
125 | } |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
126 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
127 | /* |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
128 | * Helper functions for doing the SCRAM calculations. The first argument |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
129 | * is the hash algorithm. All buffers must be of the appropriate size |
|
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
130 | * according to the JabberScramHash. |
|
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
131 | * |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
132 | * "str" is a NULL-terminated string for hmac(). |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
133 | * |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
134 | * Needless to say, these are fragile. |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
135 | */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
136 | static void |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
137 | hmac(const JabberScramHash *hash, guchar *out, const guchar *key, const gchar *str) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
138 | { |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
139 | PurpleCipherContext *context; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
140 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
141 | context = purple_cipher_context_new_by_name("hmac", NULL); |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
142 | purple_cipher_context_set_option(context, "hash", (gpointer)hash->name); |
|
33908
78b42fd69e02
ciphers cleanup: passing keys with length by default
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33689
diff
changeset
|
143 | purple_cipher_context_set_key(context, key, hash->size); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
144 | purple_cipher_context_append(context, (guchar *)str, strlen(str)); |
|
33909
773899cbd05a
ciphers cleanup: salt and digest lengths
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33908
diff
changeset
|
145 | purple_cipher_context_digest(context, out, hash->size); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
146 | purple_cipher_context_destroy(context); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
147 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
148 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
149 | static void |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
150 | hash(const JabberScramHash *hash, guchar *out, const guchar *data) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
151 | { |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
152 | PurpleCipherContext *context; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
153 | |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
154 | context = purple_cipher_context_new_by_name(hash->name, NULL); |
|
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
155 | purple_cipher_context_append(context, data, hash->size); |
|
33909
773899cbd05a
ciphers cleanup: salt and digest lengths
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33908
diff
changeset
|
156 | purple_cipher_context_digest(context, out, hash->size); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
157 | purple_cipher_context_destroy(context); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
158 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
159 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
160 | gboolean |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
161 | jabber_scram_calc_proofs(JabberScramData *data, GString *salt, guint iterations) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
162 | { |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
163 | guint hash_len = data->hash->size; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
164 | guint i; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
165 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
166 | GString *pass = g_string_new(data->password); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
167 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
168 | guchar *salted_password; |
|
29088
6f36294367f4
jabber: Ugh, make this C89-compliant. Bah.
Paul Aurich <darkrain42@pidgin.im>
parents:
29084
diff
changeset
|
169 | guchar *client_key, *stored_key, *client_signature, *server_key; |
|
6f36294367f4
jabber: Ugh, make this C89-compliant. Bah.
Paul Aurich <darkrain42@pidgin.im>
parents:
29084
diff
changeset
|
170 | |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
171 | data->client_proof = g_string_sized_new(hash_len); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
172 | data->client_proof->len = hash_len; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
173 | data->server_signature = g_string_sized_new(hash_len); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
174 | data->server_signature->len = hash_len; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
175 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
176 | salted_password = jabber_scram_hi(data->hash, pass, salt, iterations); |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
177 | |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
178 | memset(pass->str, 0, pass->allocated_len); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
179 | g_string_free(pass, TRUE); |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
180 | |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
181 | if (!salted_password) |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
182 | return FALSE; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
183 | |
|
33689
7b2708ac0e9c
Fix a leak in Jabber auth.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31460
diff
changeset
|
184 | client_key = g_new0(guchar, hash_len); |
|
7b2708ac0e9c
Fix a leak in Jabber auth.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31460
diff
changeset
|
185 | stored_key = g_new0(guchar, hash_len); |
|
7b2708ac0e9c
Fix a leak in Jabber auth.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31460
diff
changeset
|
186 | client_signature = g_new0(guchar, hash_len); |
|
7b2708ac0e9c
Fix a leak in Jabber auth.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31460
diff
changeset
|
187 | server_key = g_new0(guchar, hash_len); |
|
7b2708ac0e9c
Fix a leak in Jabber auth.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31460
diff
changeset
|
188 | |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
189 | /* client_key = HMAC(salted_password, "Client Key") */ |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
190 | hmac(data->hash, client_key, salted_password, "Client Key"); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
191 | /* server_key = HMAC(salted_password, "Server Key") */ |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
192 | hmac(data->hash, server_key, salted_password, "Server Key"); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
193 | g_free(salted_password); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
194 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
195 | /* stored_key = HASH(client_key) */ |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
196 | hash(data->hash, stored_key, client_key); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
197 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
198 | /* client_signature = HMAC(stored_key, auth_message) */ |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
199 | hmac(data->hash, client_signature, stored_key, data->auth_message->str); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
200 | /* server_signature = HMAC(server_key, auth_message) */ |
|
29081
ce668db953aa
jabber: Clean up the SCRAM code a little.
Paul Aurich <darkrain42@pidgin.im>
parents:
29080
diff
changeset
|
201 | hmac(data->hash, (guchar *)data->server_signature->str, server_key, data->auth_message->str); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
202 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
203 | /* client_proof = client_key XOR client_signature */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
204 | for (i = 0; i < hash_len; ++i) |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
205 | data->client_proof->str[i] = client_key[i] ^ client_signature[i]; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
206 | |
|
29088
6f36294367f4
jabber: Ugh, make this C89-compliant. Bah.
Paul Aurich <darkrain42@pidgin.im>
parents:
29084
diff
changeset
|
207 | g_free(server_key); |
|
6f36294367f4
jabber: Ugh, make this C89-compliant. Bah.
Paul Aurich <darkrain42@pidgin.im>
parents:
29084
diff
changeset
|
208 | g_free(client_signature); |
|
6f36294367f4
jabber: Ugh, make this C89-compliant. Bah.
Paul Aurich <darkrain42@pidgin.im>
parents:
29084
diff
changeset
|
209 | g_free(stored_key); |
|
6f36294367f4
jabber: Ugh, make this C89-compliant. Bah.
Paul Aurich <darkrain42@pidgin.im>
parents:
29084
diff
changeset
|
210 | g_free(client_key); |
|
6f36294367f4
jabber: Ugh, make this C89-compliant. Bah.
Paul Aurich <darkrain42@pidgin.im>
parents:
29084
diff
changeset
|
211 | |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
212 | return TRUE; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
213 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
214 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
215 | static gboolean |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
216 | parse_server_step1(JabberScramData *data, const char *challenge, |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
217 | gchar **out_nonce, GString **out_salt, guint *out_iterations) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
218 | { |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
219 | char **tokens; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
220 | char *token, *decoded, *tmp; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
221 | gsize len; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
222 | char *nonce = NULL; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
223 | GString *salt = NULL; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
224 | guint iterations; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
225 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
226 | tokens = g_strsplit(challenge, ",", -1); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
227 | if (tokens == NULL) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
228 | return FALSE; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
229 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
230 | token = tokens[0]; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
231 | if (token[0] != 'r' || token[1] != '=') |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
232 | goto err; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
233 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
234 | /* Ensure that the first cnonce_len bytes of the nonce are the original |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
235 | * cnonce we sent to the server. |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
236 | */ |
|
28926
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
237 | if (0 != strncmp(data->cnonce, token + 2, strlen(data->cnonce))) |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
238 | goto err; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
239 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
240 | nonce = g_strdup(token + 2); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
241 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
242 | /* The Salt, base64-encoded */ |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
243 | token = tokens[1]; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
244 | if (token[0] != 's' || token[1] != '=') |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
245 | goto err; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
246 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
247 | decoded = (gchar *)purple_base64_decode(token + 2, &len); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
248 | if (!decoded || *decoded == '\0') { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
249 | g_free(decoded); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
250 | goto err; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
251 | } |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
252 | salt = g_string_new_len(decoded, len); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
253 | g_free(decoded); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
254 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
255 | /* The iteration count */ |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
256 | token = tokens[2]; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
257 | if (token[0] != 'i' || token[1] != '=' || token[2] == '\0') |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
258 | goto err; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
259 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
260 | /* Validate the string */ |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
261 | for (tmp = token + 2; *tmp; ++tmp) |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
262 | if (!g_ascii_isdigit(*tmp)) |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
263 | goto err; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
264 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
265 | iterations = strtoul(token + 2, NULL, 10); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
266 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
267 | g_strfreev(tokens); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
268 | *out_nonce = nonce; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
269 | *out_salt = salt; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
270 | *out_iterations = iterations; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
271 | return TRUE; |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
272 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
273 | err: |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
274 | g_free(nonce); |
|
28926
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
275 | if (salt) |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
276 | g_string_free(salt, TRUE); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
277 | g_strfreev(tokens); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
278 | return FALSE; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
279 | } |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
280 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
281 | static gboolean |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
282 | parse_server_step2(JabberScramData *data, const char *challenge, gchar **out_verifier) |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
283 | { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
284 | char **tokens; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
285 | char *token; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
286 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
287 | tokens = g_strsplit(challenge, ",", -1); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
288 | if (tokens == NULL) |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
289 | return FALSE; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
290 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
291 | token = tokens[0]; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
292 | if (token[0] != 'v' || token[1] != '=' || token[2] == '\0') { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
293 | g_strfreev(tokens); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
294 | return FALSE; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
295 | } |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
296 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
297 | *out_verifier = g_strdup(token + 2); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
298 | g_strfreev(tokens); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
299 | return TRUE; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
300 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
301 | |
|
28926
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
302 | gboolean |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
303 | jabber_scram_feed_parser(JabberScramData *data, gchar *in, gchar **out) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
304 | { |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
305 | gboolean ret; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
306 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
307 | g_return_val_if_fail(data != NULL, FALSE); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
308 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
309 | g_string_append_c(data->auth_message, ','); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
310 | g_string_append(data->auth_message, in); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
311 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
312 | if (data->step == 1) { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
313 | gchar *nonce, *proof; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
314 | GString *salt; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
315 | guint iterations; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
316 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
317 | ret = parse_server_step1(data, in, &nonce, &salt, &iterations); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
318 | if (!ret) |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
319 | return FALSE; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
320 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
321 | g_string_append_c(data->auth_message, ','); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
322 | |
|
28926
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
323 | /* "biws" is the base64 encoding of "n,,". I promise. */ |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
324 | g_string_append_printf(data->auth_message, "c=%s,r=%s", "biws", nonce); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
325 | #ifdef CHANNEL_BINDING |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
326 | #error fix this |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
327 | #endif |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
328 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
329 | ret = jabber_scram_calc_proofs(data, salt, iterations); |
| 30036 | 330 | |
| 331 | g_string_free(salt, TRUE); | |
| 332 | salt = NULL; | |
| 333 | if (!ret) { | |
| 334 | g_free(nonce); | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
335 | return FALSE; |
| 30036 | 336 | } |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
337 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
338 | proof = purple_base64_encode((guchar *)data->client_proof->str, data->client_proof->len); |
|
28926
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
339 | *out = g_strdup_printf("c=%s,r=%s,p=%s", "biws", nonce, proof); |
| 30036 | 340 | g_free(nonce); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
341 | g_free(proof); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
342 | } else if (data->step == 2) { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
343 | gchar *server_sig, *enc_server_sig; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
344 | gsize len; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
345 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
346 | ret = parse_server_step2(data, in, &enc_server_sig); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
347 | if (!ret) |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
348 | return FALSE; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
349 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
350 | server_sig = (gchar *)purple_base64_decode(enc_server_sig, &len); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
351 | g_free(enc_server_sig); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
352 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
353 | if (server_sig == NULL || len != data->server_signature->len) { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
354 | g_free(server_sig); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
355 | return FALSE; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
356 | } |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
357 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
358 | if (0 != memcmp(server_sig, data->server_signature->str, len)) { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
359 | g_free(server_sig); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
360 | return FALSE; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
361 | } |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
362 | g_free(server_sig); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
363 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
364 | *out = NULL; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
365 | } else { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
366 | purple_debug_error("jabber", "SCRAM: There is no step %d\n", data->step); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
367 | return FALSE; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
368 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
369 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
370 | return TRUE; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
371 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
372 | |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
373 | static gchar *escape_username(const gchar *in) |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
374 | { |
|
29080
ad5cd77354db
jabber: Should have looked for this function earlier.
Paul Aurich <darkrain42@pidgin.im>
parents:
29027
diff
changeset
|
375 | gchar *tmp, *tmp2; |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
376 | |
|
29080
ad5cd77354db
jabber: Should have looked for this function earlier.
Paul Aurich <darkrain42@pidgin.im>
parents:
29027
diff
changeset
|
377 | tmp = purple_strreplace(in, "=", "=3D"); |
|
31460
e9358ca4e626
jabber: Oops. Clearly the wrong escape sequence here for ','.
Paul Aurich <darkrain42@pidgin.im>
parents:
30306
diff
changeset
|
378 | tmp2 = purple_strreplace(tmp, ",", "=2C"); |
|
29080
ad5cd77354db
jabber: Should have looked for this function earlier.
Paul Aurich <darkrain42@pidgin.im>
parents:
29027
diff
changeset
|
379 | g_free(tmp); |
|
ad5cd77354db
jabber: Should have looked for this function earlier.
Paul Aurich <darkrain42@pidgin.im>
parents:
29027
diff
changeset
|
380 | return tmp2; |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
381 | } |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
382 | |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
383 | static JabberSaslState |
|
29090
b351fcdeede7
jabber: Fix that leak I mentioned (and fix a mistake where error/response weren't NULL-initialized)
Paul Aurich <darkrain42@pidgin.im>
parents:
29088
diff
changeset
|
384 | scram_start(JabberStream *js, xmlnode *mechanisms, xmlnode **out, char **error) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
385 | { |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
386 | xmlnode *reply; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
387 | JabberScramData *data; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
388 | guint64 cnonce; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
389 | #ifdef CHANNEL_BINDING |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
390 | gboolean binding_supported = TRUE; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
391 | #endif |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
392 | gchar *dec_out, *enc_out; |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
393 | gchar *prepped_node, *tmp; |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
394 | gchar *prepped_pass; |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
395 | |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
396 | prepped_node = jabber_saslprep(js->user->node); |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
397 | if (!prepped_node) { |
|
29090
b351fcdeede7
jabber: Fix that leak I mentioned (and fix a mistake where error/response weren't NULL-initialized)
Paul Aurich <darkrain42@pidgin.im>
parents:
29088
diff
changeset
|
398 | *error = g_strdup(_("Unable to canonicalize username")); |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
399 | return JABBER_SASL_STATE_FAIL; |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
400 | } |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
401 | |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
402 | tmp = escape_username(prepped_node); |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
403 | g_free(prepped_node); |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
404 | prepped_node = tmp; |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
405 | |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
406 | prepped_pass = jabber_saslprep(purple_connection_get_password(js->gc)); |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
407 | if (!prepped_pass) { |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
408 | g_free(prepped_node); |
|
29090
b351fcdeede7
jabber: Fix that leak I mentioned (and fix a mistake where error/response weren't NULL-initialized)
Paul Aurich <darkrain42@pidgin.im>
parents:
29088
diff
changeset
|
409 | *error = g_strdup(_("Unable to canonicalize password")); |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
410 | return JABBER_SASL_STATE_FAIL; |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
411 | } |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
412 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
413 | data = js->auth_mech_data = g_new0(JabberScramData, 1); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
414 | data->hash = mech_to_hash(js->auth_mech->name); |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
415 | data->password = prepped_pass; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
416 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
417 | #ifdef CHANNEL_BINDING |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
418 | if (strstr(js->auth_mech_name, "-PLUS")) |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
419 | data->channel_binding = TRUE; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
420 | #endif |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
421 | cnonce = ((guint64)g_random_int() << 32) | g_random_int(); |
|
28927
24ee4d53dc68
jabber: Interop with Prosody (via Tobias' code). Hooray!
Paul Aurich <darkrain42@pidgin.im>
parents:
28926
diff
changeset
|
422 | data->cnonce = purple_base64_encode((guchar *)&cnonce, sizeof(cnonce)); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
423 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
424 | data->auth_message = g_string_new(NULL); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
425 | g_string_printf(data->auth_message, "n=%s,r=%s", |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
426 | prepped_node, data->cnonce); |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
427 | g_free(prepped_node); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
428 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
429 | data->step = 1; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
430 | |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
431 | reply = xmlnode_new("auth"); |
|
29008
1f288722b5cd
jabber: Use NS_XMPP_SASL
Paul Aurich <darkrain42@pidgin.im>
parents:
28927
diff
changeset
|
432 | xmlnode_set_namespace(reply, NS_XMPP_SASL); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
433 | xmlnode_set_attrib(reply, "mechanism", js->auth_mech->name); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
434 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
435 | /* TODO: Channel binding */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
436 | dec_out = g_strdup_printf("%c,,%s", 'n', data->auth_message->str); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
437 | enc_out = purple_base64_encode((guchar *)dec_out, strlen(dec_out)); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
438 | purple_debug_misc("jabber", "initial SCRAM message '%s'\n", dec_out); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
439 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
440 | xmlnode_insert_data(reply, enc_out, -1); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
441 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
442 | g_free(enc_out); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
443 | g_free(dec_out); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
444 | |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
445 | *out = reply; |
|
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
446 | return JABBER_SASL_STATE_CONTINUE; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
447 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
448 | |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
449 | static JabberSaslState |
|
29090
b351fcdeede7
jabber: Fix that leak I mentioned (and fix a mistake where error/response weren't NULL-initialized)
Paul Aurich <darkrain42@pidgin.im>
parents:
29088
diff
changeset
|
450 | scram_handle_challenge(JabberStream *js, xmlnode *challenge, xmlnode **out, char **error) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
451 | { |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
452 | JabberScramData *data = js->auth_mech_data; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
453 | xmlnode *reply; |
| 30036 | 454 | gchar *enc_in, *dec_in = NULL; |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
455 | gchar *enc_out = NULL, *dec_out = NULL; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
456 | gsize len; |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
457 | JabberSaslState state = JABBER_SASL_STATE_FAIL; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
458 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
459 | enc_in = xmlnode_get_data(challenge); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
460 | if (!enc_in || *enc_in == '\0') { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
461 | reply = xmlnode_new("abort"); |
|
29008
1f288722b5cd
jabber: Use NS_XMPP_SASL
Paul Aurich <darkrain42@pidgin.im>
parents:
28927
diff
changeset
|
462 | xmlnode_set_namespace(reply, NS_XMPP_SASL); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
463 | data->step = -1; |
|
29090
b351fcdeede7
jabber: Fix that leak I mentioned (and fix a mistake where error/response weren't NULL-initialized)
Paul Aurich <darkrain42@pidgin.im>
parents:
29088
diff
changeset
|
464 | *error = g_strdup(_("Invalid challenge from server")); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
465 | goto out; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
466 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
467 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
468 | dec_in = (gchar *)purple_base64_decode(enc_in, &len); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
469 | if (!dec_in || len != strlen(dec_in)) { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
470 | /* Danger afoot; SCRAM shouldn't contain NUL bytes */ |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
471 | reply = xmlnode_new("abort"); |
|
29008
1f288722b5cd
jabber: Use NS_XMPP_SASL
Paul Aurich <darkrain42@pidgin.im>
parents:
28927
diff
changeset
|
472 | xmlnode_set_namespace(reply, NS_XMPP_SASL); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
473 | data->step = -1; |
|
29090
b351fcdeede7
jabber: Fix that leak I mentioned (and fix a mistake where error/response weren't NULL-initialized)
Paul Aurich <darkrain42@pidgin.im>
parents:
29088
diff
changeset
|
474 | *error = g_strdup(_("Malicious challenge from server")); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
475 | goto out; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
476 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
477 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
478 | purple_debug_misc("jabber", "decoded challenge: %s\n", dec_in); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
479 | |
|
28926
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
480 | if (!jabber_scram_feed_parser(data, dec_in, &dec_out)) { |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
481 | reply = xmlnode_new("abort"); |
|
29008
1f288722b5cd
jabber: Use NS_XMPP_SASL
Paul Aurich <darkrain42@pidgin.im>
parents:
28927
diff
changeset
|
482 | xmlnode_set_namespace(reply, NS_XMPP_SASL); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
483 | data->step = -1; |
|
29090
b351fcdeede7
jabber: Fix that leak I mentioned (and fix a mistake where error/response weren't NULL-initialized)
Paul Aurich <darkrain42@pidgin.im>
parents:
29088
diff
changeset
|
484 | *error = g_strdup(_("Invalid challenge from server")); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
485 | goto out; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
486 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
487 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
488 | data->step += 1; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
489 | |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
490 | reply = xmlnode_new("response"); |
|
29008
1f288722b5cd
jabber: Use NS_XMPP_SASL
Paul Aurich <darkrain42@pidgin.im>
parents:
28927
diff
changeset
|
491 | xmlnode_set_namespace(reply, NS_XMPP_SASL); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
492 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
493 | purple_debug_misc("jabber", "decoded response: %s\n", dec_out ? dec_out : "(null)"); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
494 | if (dec_out) { |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
495 | enc_out = purple_base64_encode((guchar *)dec_out, strlen(dec_out)); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
496 | xmlnode_insert_data(reply, enc_out, -1); |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
497 | } |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
498 | |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
499 | state = JABBER_SASL_STATE_CONTINUE; |
|
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
500 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
501 | out: |
| 30036 | 502 | g_free(enc_in); |
| 503 | g_free(dec_in); | |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
504 | g_free(enc_out); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
505 | g_free(dec_out); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
506 | |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
507 | *out = reply; |
|
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
508 | return state; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
509 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
510 | |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
511 | static JabberSaslState |
|
29090
b351fcdeede7
jabber: Fix that leak I mentioned (and fix a mistake where error/response weren't NULL-initialized)
Paul Aurich <darkrain42@pidgin.im>
parents:
29088
diff
changeset
|
512 | scram_handle_success(JabberStream *js, xmlnode *packet, char **error) |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
513 | { |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
514 | JabberScramData *data = js->auth_mech_data; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
515 | char *enc_in, *dec_in; |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
516 | char *dec_out = NULL; |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
517 | gsize len; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
518 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
519 | enc_in = xmlnode_get_data(packet); |
|
30306
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
520 | if (data->step != 3 && (!enc_in || *enc_in == '\0')) { |
|
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
521 | *error = g_strdup(_("Invalid challenge from server")); |
|
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
522 | g_free(enc_in); |
|
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
523 | return JABBER_SASL_STATE_FAIL; |
|
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
524 | } |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
525 | |
|
30306
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
526 | if (data->step == 3) { |
|
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
527 | /* |
|
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
528 | * If the server took the slow approach (sending the verifier |
|
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
529 | * as a challenge/response pair), we get here. |
|
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
530 | */ |
|
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
531 | g_free(enc_in); |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
532 | return JABBER_SASL_STATE_OK; |
|
30306
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
533 | } |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
534 | |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
535 | if (data->step != 2) { |
|
29090
b351fcdeede7
jabber: Fix that leak I mentioned (and fix a mistake where error/response weren't NULL-initialized)
Paul Aurich <darkrain42@pidgin.im>
parents:
29088
diff
changeset
|
536 | *error = g_strdup(_("Unexpected response from server")); |
|
30306
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
537 | g_free(enc_in); |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
538 | return JABBER_SASL_STATE_FAIL; |
|
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
539 | } |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
540 | |
|
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
541 | dec_in = (gchar *)purple_base64_decode(enc_in, &len); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
542 | g_free(enc_in); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
543 | if (!dec_in || len != strlen(dec_in)) { |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
544 | /* Danger afoot; SCRAM shouldn't contain NUL bytes */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
545 | g_free(dec_in); |
|
30306
e7dea71588a5
jabber: Fix a case where a broken server would hang the connection.
Paul Aurich <darkrain42@pidgin.im>
parents:
30136
diff
changeset
|
546 | *error = g_strdup(_("Malicious challenge from server")); |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
547 | return JABBER_SASL_STATE_FAIL; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
548 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
549 | |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
550 | purple_debug_misc("jabber", "decoded success: %s\n", dec_in); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
551 | |
|
28926
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
552 | if (!jabber_scram_feed_parser(data, dec_in, &dec_out) || dec_out != NULL) { |
| 30036 | 553 | g_free(dec_in); |
|
28868
7415cb6c4587
jabber: Handle the case where the server success-with-data is sent as a challenge/response pair.
Paul Aurich <darkrain42@pidgin.im>
parents:
28866
diff
changeset
|
554 | g_free(dec_out); |
|
29090
b351fcdeede7
jabber: Fix that leak I mentioned (and fix a mistake where error/response weren't NULL-initialized)
Paul Aurich <darkrain42@pidgin.im>
parents:
29088
diff
changeset
|
555 | *error = g_strdup(_("Invalid challenge from server")); |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
556 | return JABBER_SASL_STATE_FAIL; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
557 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
558 | |
| 30036 | 559 | g_free(dec_in); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
560 | /* Hooray */ |
|
29084
3a821d391ac0
Let's try a more complex set of return states / values for auth mechs.
Paul Aurich <darkrain42@pidgin.im>
parents:
29081
diff
changeset
|
561 | return JABBER_SASL_STATE_OK; |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
562 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
563 | |
|
28926
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
564 | void jabber_scram_data_destroy(JabberScramData *data) |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
565 | { |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
566 | g_free(data->cnonce); |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
567 | if (data->auth_message) |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
568 | g_string_free(data->auth_message, TRUE); |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
569 | if (data->client_proof) |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
570 | g_string_free(data->client_proof, TRUE); |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
571 | if (data->server_signature) |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
572 | g_string_free(data->server_signature, TRUE); |
|
29027
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
573 | if (data->password) { |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
574 | memset(data->password, 0, strlen(data->password)); |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
575 | g_free(data->password); |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
576 | } |
|
6af29b140195
jabber: Add SASLprep and the username substitution called for in draft-ietf-sasl-scram-10 5.1.
Paul Aurich <darkrain42@pidgin.im>
parents:
29008
diff
changeset
|
577 | |
|
28926
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
578 | g_free(data); |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
579 | } |
|
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
580 | |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
581 | static void scram_dispose(JabberStream *js) |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
582 | { |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
583 | if (js->auth_mech_data) { |
|
28926
a737800d1445
jabber: Fix up the remaining issues and add a test case that interoperates with gsasl. Woot.
Paul Aurich <darkrain42@pidgin.im>
parents:
28868
diff
changeset
|
584 | jabber_scram_data_destroy(js->auth_mech_data); |
|
28866
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
585 | js->auth_mech_data = NULL; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
586 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
587 | } |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
588 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
589 | static JabberSaslMech scram_sha1_mech = { |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
590 | 50, /* priority */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
591 | "SCRAM-SHA-1", /* name */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
592 | scram_start, |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
593 | scram_handle_challenge, |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
594 | scram_handle_success, |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
595 | NULL, /* handle_failure */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
596 | scram_dispose |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
597 | }; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
598 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
599 | #ifdef CHANNEL_BINDING |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
600 | /* With channel binding */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
601 | static JabberSaslMech scram_sha1_plus_mech = { |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
602 | scram_sha1_mech.priority + 1, /* priority */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
603 | "SCRAM-SHA-1-PLUS", /* name */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
604 | scram_start, |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
605 | scram_handle_challenge, |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
606 | scram_handle_success, |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
607 | NULL, /* handle_failure */ |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
608 | scram_dispose |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
609 | }; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
610 | #endif |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
611 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
612 | JabberSaslMech **jabber_auth_get_scram_mechs(gint *count) |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
613 | { |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
614 | static JabberSaslMech *mechs[] = { |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
615 | &scram_sha1_mech, |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
616 | #ifdef CHANNEL_BINDING |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
617 | &scram_sha1_plus_mech, |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
618 | #endif |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
619 | }; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
620 | |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
621 | *count = G_N_ELEMENTS(mechs); |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
622 | return mechs; |
|
e3d867ce000b
jabber: Complete (though untested) SCRAM implementation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28865
diff
changeset
|
623 | } |