From 8be6b8df76e78b0b6ba11a3a91f8efc4f063a78a Mon Sep 17 00:00:00 2001 From: Badlop Date: Fri, 27 Feb 2009 15:57:35 +0000 Subject: [PATCH] Merge fix from trunk r1190 * src/cyrsasl_digest.erl: Unquote backslash in DIGEST-MD5 quoted strings (EJAB-304) SVN Revision: 1927 --- ChangeLog | 3 +++ src/cyrsasl_digest.erl | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7a88a343..f2648c46c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-02-27 Badlop + * src/cyrsasl_digest.erl: Unquote backslash in DIGEST-MD5 quoted + strings (EJAB-304) + * src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk and recent Openfire (thanks to Philipp Hancke)(EJAB-877) diff --git a/src/cyrsasl_digest.erl b/src/cyrsasl_digest.erl index 1e40e1437..0d27dbb68 100644 --- a/src/cyrsasl_digest.erl +++ b/src/cyrsasl_digest.erl @@ -101,15 +101,17 @@ parse1([], [], T) -> parse1([], _S, _T) -> bad. -parse2([$" | Cs], Key, Val, Ts) -> +parse2([$\" | Cs], Key, Val, Ts) -> parse3(Cs, Key, Val, Ts); parse2([C | Cs], Key, Val, Ts) -> parse4(Cs, Key, [C | Val], Ts); parse2([], _, _, _) -> bad. -parse3([$" | Cs], Key, Val, Ts) -> +parse3([$\" | Cs], Key, Val, Ts) -> parse4(Cs, Key, Val, Ts); +parse3([$\\, C | Cs], Key, Val, Ts) -> + parse3(Cs, Key, [C | Val], Ts); parse3([C | Cs], Key, Val, Ts) -> parse3(Cs, Key, [C | Val], Ts); parse3([], _, _, _) -> -- 2.50.1