psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

+

This commit is contained in:
psyc://psyced.org/~lynX 2011-07-26 07:58:06 +02:00
parent 09aaafd679
commit f9b8f4261c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
world/net/person.c
View File

@ -768,12 +768,15 @@ case "sha1":
try, sha1(salt + v("password")))); try, sha1(salt + v("password"))));
rc = try == sha1(salt + v("password")); rc = try == sha1(salt + v("password"));
ARETURN(rc) ARETURN(rc)
# ifdef TLS_HASH_SHA1
case "HMAC-SHA1": case "HMAC-SHA1":
case "hmac-sha1": case "hmac-sha1":
ARETURN(try == hmac(TLS_HASH_SHA1, v("password"), salt)) ARETURN(try == hmac(TLS_HASH_SHA1, v("password"), salt))
#ifdef AUTH_HMAC_SECRET # ifdef AUTH_HMAC_SECRET
case "hmac-sha1-shared": case "hmac-sha1-shared":
ARETURN(try == hmac(TLS_HASH_SHA1, AUTH_HMAC_SECRET, salt + MYNICK)) ARETURN(try == hmac(TLS_HASH_SHA1, AUTH_HMAC_SECRET, salt + MYNICK))
# endif
# endif
#else #else
# echo Driver is missing SHA1 support (needed for jabber) # echo Driver is missing SHA1 support (needed for jabber)
#endif #endif

4
world/net/psyc/parse.i
View File

@ -981,8 +981,8 @@ protected int deliver(mixed ip, string host, string mc, string buffer, mapping c
cvars["_INTERNAL_nick_target"] = u[UNick]; cvars["_INTERNAL_nick_target"] = u[UNick];
#endif #endif
P3(("DEBUG: is_localhost is %O for %O of %O\n", P3(("DEBUG: is_localhost is %O for %O of %O\n",
is_localhost(u[UHost])), u[UHost], u) is_localhost(u[UHost]), u[UHost], u))
unless (is_localhost((u[UHost])) { unless (is_localhost(u[UHost])) {
if (trustworthy > 7) { if (trustworthy > 7) {
P1(("RELAYING permitted for %O to %O (%O)\n", P1(("RELAYING permitted for %O to %O (%O)\n",
source, t, ME)) source, t, ME))