From 8e2b0deb94ea52b49404d5b9277061101bd03cff Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Fri, 28 Nov 2008 18:32:54 +0100 Subject: Do idna_to_ascii when building own response. --- util-src/Makefile | 4 ++-- util/sasl.lua | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/util-src/Makefile b/util-src/Makefile index a4901c95..035ec286 100644 --- a/util-src/Makefile +++ b/util-src/Makefile @@ -1,13 +1,13 @@ -LUA_INCLUDE=/usr/include/lua5.1 +LUA_INCLUDE=/usr/include/lua51 LUA_LIB=lua5.1 IDN_LIB=idn OPENSSL_LIB=ssl - all: encodings.so hashes.so + install: encodings.so hashes.so strip *.so diff --git a/util/sasl.lua b/util/sasl.lua index 001f40fb..f10fb934 100644 --- a/util/sasl.lua +++ b/util/sasl.lua @@ -11,6 +11,7 @@ local math = require "math" local type = type local error = error local print = print +local idna_ascii = require "util.encodings".stringprep.saslprep.to_ascii module "sasl" @@ -130,7 +131,7 @@ local function new_digest_md5(realm, password_handler) 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 @@ local function new_digest_md5(realm, password_handler) if response_value == response["response"] then -- calculate rspauth - A2 = ":"..protocol.."/"..domain + A2 = ":"..protocol.."/"..idna_ascii(domain) HA1 = md5(A1, true) HA2 = md5(A2, true) -- cgit v1.2.3 From 0df2b3f0c51f75dd9106671362bdfae7a8a44afd Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Fri, 28 Nov 2008 18:36:04 +0100 Subject: To use free you should include stdlib.h rather than malloc.h according to man page of free() and various C reference websites. --- util-src/encodings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-src/encodings.c b/util-src/encodings.c index ac24ebcf..13706a89 100644 --- a/util-src/encodings.c +++ b/util-src/encodings.c @@ -7,7 +7,7 @@ #define _CRT_SECURE_NO_DEPRECATE #include -#include +#include #include "lua.h" #include "lauxlib.h" -- cgit v1.2.3 From a718775bd40db918564a31e90f4c17a98a4cecfc Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Fri, 28 Nov 2008 19:24:08 +0100 Subject: Use unsigned int instead of uint because uint is already in use on OS X. --- util-src/encodings.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/util-src/encodings.c b/util-src/encodings.c index 13706a89..5fe2c805 100644 --- a/util-src/encodings.c +++ b/util-src/encodings.c @@ -14,12 +14,10 @@ /***************** 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; -- cgit v1.2.3 From e20fe5e4675cb489a24664b8d465e6c445077ed9 Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Sat, 29 Nov 2008 12:17:21 +0100 Subject: Apply IDNA to ASCII on hostnames. --- util/sasl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/sasl.lua b/util/sasl.lua index f5ef04b8..f1d01aed 100644 --- a/util/sasl.lua +++ b/util/sasl.lua @@ -11,7 +11,7 @@ local math = require "math" local type = type local error = error local print = print -local idna_ascii = require "util.encodings".stringprep.saslprep.to_ascii +local idna_ascii = require "util.encodings".idna.to_ascii module "sasl" -- cgit v1.2.3