Mercurial > pidgin.yaz
comparison src/protocols/jabber/si.c @ 11183:8dca96cbcd64
[gaim-migrate @ 13295]
I changed the cipher API to use guchar instead of guint8
This seems to be what gtk/glib uses for random bits of data
I don't know what got into me
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 03 Aug 2005 02:57:00 +0000 |
parents | 999555fbbbd9 |
children | f9c5480ad0ce |
comparison
equal
deleted
inserted
replaced
11182:5389d7d497ce | 11183:8dca96cbcd64 |
---|---|
155 gaim_proxy_info_set_port(jsx->gpi, streamhost->port); | 155 gaim_proxy_info_set_port(jsx->gpi, streamhost->port); |
156 | 156 |
157 dstaddr = g_strdup_printf("%s%s%s@%s/%s", jsx->stream_id, xfer->who, jsx->js->user->node, | 157 dstaddr = g_strdup_printf("%s%s%s@%s/%s", jsx->stream_id, xfer->who, jsx->js->user->node, |
158 jsx->js->user->domain, jsx->js->user->resource); | 158 jsx->js->user->domain, jsx->js->user->resource); |
159 | 159 |
160 gaim_cipher_digest_region("sha1", (guint8 *)dstaddr, strlen(dstaddr), | 160 gaim_cipher_digest_region("sha1", (guchar *)dstaddr, strlen(dstaddr), |
161 sizeof(hashval), hashval, NULL); | 161 sizeof(hashval), hashval, NULL); |
162 g_free(dstaddr); | 162 g_free(dstaddr); |
163 dstaddr = g_malloc(41); | 163 dstaddr = g_malloc(41); |
164 p = dstaddr; | 164 p = dstaddr; |
165 for(i=0; i<20; i++, p+=2) | 165 for(i=0; i<20; i++, p+=2) |
275 | 275 |
276 dstaddr = g_strdup_printf("%s%s@%s/%s%s", jsx->stream_id, | 276 dstaddr = g_strdup_printf("%s%s@%s/%s%s", jsx->stream_id, |
277 jsx->js->user->node, jsx->js->user->domain, | 277 jsx->js->user->node, jsx->js->user->domain, |
278 jsx->js->user->resource, xfer->who); | 278 jsx->js->user->resource, xfer->who); |
279 | 279 |
280 gaim_cipher_digest_region("sha1", (guint8 *)dstaddr, strlen(dstaddr), | 280 gaim_cipher_digest_region("sha1", (guchar *)dstaddr, strlen(dstaddr), |
281 sizeof(hashval), hashval, NULL); | 281 sizeof(hashval), hashval, NULL); |
282 g_free(dstaddr); | 282 g_free(dstaddr); |
283 dstaddr = g_malloc(41); | 283 dstaddr = g_malloc(41); |
284 p = dstaddr; | 284 p = dstaddr; |
285 for(i=0; i<20; i++, p+=2) | 285 for(i=0; i<20; i++, p+=2) |