annotate src/protocols/simple/ntlm.c @ 11353:0f03b5492130

[gaim-migrate @ 13572] ntlm support for sip committer: Tailor Script <tailor@pidgin.im>
author Thomas Butter <tbutter>
date Sat, 27 Aug 2005 09:25:15 +0000
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11353
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
1 /**
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
2 * @file ntlm.c
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
3 *
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
4 * gaim
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
5 *
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
6 * Copyright (C) 2005 Thomas Butter <butter@uni-mannheim.de>
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
7 *
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
8 * hashing done according to description of NTLM on
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
9 * http://www.innovation.ch/java/ntlm.html
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
10 *
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
11 * This program is free software; you can redistribute it and/or modify
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
12 * it under the terms of the GNU General Public License as published by
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
13 * the Free Software Foundation; either version 2 of the License, or
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
14 * (at your option) any later version.
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
15 *
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
16 * This program is distributed in the hope that it will be useful,
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
19 * GNU General Public License for more details.
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
20 *
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
21 * You should have received a copy of the GNU General Public License
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
22 * along with this program; if not, write to the Free Software
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
24 */
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
25
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
26 #include "util.h"
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
27 #include "ntlm.h"
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
28 #include "cipher.h"
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
29 #include <string.h>
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
30
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
31 gchar *ntlm_type1_message(gchar *hostname, gchar *domain) {
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
32 char *msg = g_malloc0(sizeof(struct type1_message) + strlen(hostname) + strlen(domain));
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
33 struct type1_message *tmsg = (struct type1_message*)msg;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
34 tmsg->protocol[0] = 'N';
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
35 tmsg->protocol[1] = 'T';
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
36 tmsg->protocol[2] = 'L';
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
37 tmsg->protocol[3] = 'M';
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
38 tmsg->protocol[4] = 'S';
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
39 tmsg->protocol[5] = 'S';
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
40 tmsg->protocol[6] = 'P';
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
41 tmsg->protocol[7] = '\0';
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
42 tmsg->type= 0x01;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
43 tmsg->flags = 0xb203;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
44 tmsg->dom_len1 = tmsg->dom_len2 = strlen(domain);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
45 tmsg->dom_off = 32+strlen(hostname);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
46 tmsg->host_len1 = tmsg->host_len2 = strlen(hostname);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
47 tmsg->host_off= 32;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
48 memcpy(msg+sizeof(struct type1_message),hostname,strlen(hostname));
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
49 memcpy(msg+sizeof(struct type1_message)+strlen(hostname),domain,strlen(domain));
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
50
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
51 return gaim_base64_encode(msg, sizeof(struct type1_message) + strlen(hostname) + strlen(domain));
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
52 }
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
53
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
54 gchar *ntlm_get_nonce(gchar *type2) {
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
55 int retlen;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
56 static gchar nonce[8];
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
57 struct type2_message *tmsg = (struct type2_message*)gaim_base64_decode(type2, &retlen);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
58 memcpy(nonce, tmsg->nonce, 8);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
59 g_free(tmsg);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
60 return nonce;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
61 }
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
62
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
63 static void setup_des_key(unsigned char key_56[], char *key)
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
64 {
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
65 key[0] = key_56[0];
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
66 key[1] = ((key_56[0] << 7) & 0xFF) | (key_56[1] >> 1);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
67 key[2] = ((key_56[1] << 6) & 0xFF) | (key_56[2] >> 2);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
68 key[3] = ((key_56[2] << 5) & 0xFF) | (key_56[3] >> 3);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
69 key[4] = ((key_56[3] << 4) & 0xFF) | (key_56[4] >> 4);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
70 key[5] = ((key_56[4] << 3) & 0xFF) | (key_56[5] >> 5);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
71 key[6] = ((key_56[5] << 2) & 0xFF) | (key_56[6] >> 6);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
72 key[7] = (key_56[6] << 1) & 0xFF;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
73 }
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
74
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
75 /*
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
76 * helper function for gaim cipher.c
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
77 */
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
78 static void des_ecb_encrypt(char *plaintext, char *result, char *key) {
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
79 GaimCipher *cipher;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
80 GaimCipherContext *context;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
81 int outlen;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
82
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
83 cipher = gaim_ciphers_find_cipher("des");
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
84 context = gaim_cipher_context_new(cipher, NULL);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
85 gaim_cipher_context_set_key(context, key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
86 gaim_cipher_context_encrypt(context, plaintext, 8, result, &outlen);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
87 gaim_cipher_context_destroy(context);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
88 }
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
89
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
90 /*
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
91 * takes a 21 byte array and treats it as 3 56-bit DES keys. The
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
92 * 8 byte plaintext is encrypted with each key and the resulting 24
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
93 * bytes are stored in the results array.
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
94 */
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
95 static void calc_resp(unsigned char *keys, unsigned char *plaintext, unsigned char *results)
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
96 {
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
97 gchar key[8];
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
98 setup_des_key(keys, key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
99 des_ecb_encrypt(plaintext, results, key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
100
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
101 setup_des_key(keys+7, key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
102 des_ecb_encrypt(plaintext, (results+8), key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
103
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
104 setup_des_key(keys+14, key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
105 des_ecb_encrypt(plaintext, (results+16), key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
106 }
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
107
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
108 gchar *ntlm_type3_message(gchar *username, gchar *passw, gchar *hostname, gchar *domain, gchar *nonce) {
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
109 char lm_pw[14];
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
110 unsigned char lm_hpw[21];
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
111 gchar key[8];
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
112 int len = strlen(passw);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
113 unsigned char lm_resp[24], nt_resp[24];
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
114 unsigned char magic[] = { 0x4B, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25 };
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
115 unsigned char nt_hpw[21];
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
116 int lennt;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
117 char nt_pw[128];
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
118 GaimCipher *cipher;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
119 GaimCipherContext *context;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
120 int idx = 0;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
121
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
122 if (len > 14) len = 14;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
123
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
124 for (idx=0; idx<len; idx++)
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
125 lm_pw[idx] = g_ascii_toupper(passw[idx]);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
126 for (; idx<14; idx++)
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
127 lm_pw[idx] = 0;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
128
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
129 setup_des_key(lm_pw, key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
130 des_ecb_encrypt(magic, lm_hpw, key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
131
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
132 setup_des_key(lm_pw+7, key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
133 des_ecb_encrypt(magic, lm_hpw+8, key);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
134
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
135 memset(lm_hpw+16, 0, 5);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
136
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
137
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
138 lennt = strlen(passw);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
139 for (idx=0; idx<lennt; idx++)
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
140 {
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
141 nt_pw[2*idx] = passw[idx];
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
142 nt_pw[2*idx+1] = 0;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
143 }
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
144
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
145 cipher = gaim_ciphers_find_cipher("md4");
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
146 context = gaim_cipher_context_new(cipher, NULL);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
147 gaim_cipher_context_append(context, nt_pw, 2*lennt);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
148 gaim_cipher_context_digest(context, 21, nt_hpw, NULL);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
149 gaim_cipher_context_destroy(context);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
150
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
151 memset(nt_hpw+16, 0, 5);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
152
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
153
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
154 calc_resp(lm_hpw, nonce, lm_resp);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
155 calc_resp(nt_hpw, nonce, nt_resp);
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
156 return NULL;
0f03b5492130 [gaim-migrate @ 13572]
Thomas Butter <tbutter>
parents:
diff changeset
157 }