Software / code / prosody
Changeset
486:34c84134585d
Automated merge.
| author | Tobias Markmann <tm@ayena.de> |
|---|---|
| date | Sat, 29 Nov 2008 20:30:35 +0100 |
| parents | 470:2f9d42fdeffa (current diff) 476:4744735a0a5e (diff) |
| children | 487:86e77b6ba579 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/util-src/encodings.c Sat Nov 29 03:49:46 2008 +0000 +++ b/util-src/encodings.c Sat Nov 29 20:30:35 2008 +0100 @@ -7,19 +7,17 @@ #define _CRT_SECURE_NO_DEPRECATE #include <string.h> -#include <malloc.h> +#include <stdlib.h> #include "lua.h" #include "lauxlib.h" /***************** BASE64 *****************/ -#define uint unsigned int - static const char code[]= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static void base64_encode(luaL_Buffer *b, uint c1, uint c2, uint c3, int n) +static void base64_encode(luaL_Buffer *b, unsigned int c1, unsigned int c2, unsigned int c3, int n) { unsigned long tuple=c3+256UL*(c2+256UL*c1); int i;
--- a/util/sasl.lua Sat Nov 29 03:49:46 2008 +0000 +++ b/util/sasl.lua Sat Nov 29 20:30:35 2008 +0100 @@ -11,6 +11,7 @@ local type = type local error = error local print = print +local idna_ascii = require "util.encodings".idna.to_ascii module "sasl" @@ -130,7 +131,7 @@ elseif Y == false then return "failure", "account-disabled" end local A1 = Y..":"..response["nonce"]..":"..response["cnonce"]--:authzid - local A2 = "AUTHENTICATE:"..protocol.."/"..domain + local A2 = "AUTHENTICATE:"..protocol.."/"..idna_ascii(domain) local HA1 = md5(A1, true) local HA2 = md5(A2, true) @@ -140,7 +141,7 @@ if response_value == response["response"] then -- calculate rspauth - A2 = ":"..protocol.."/"..domain + A2 = ":"..protocol.."/"..idna_ascii(domain) HA1 = md5(A1, true) HA2 = md5(A2, true)
