Commit bdb18828 authored by TingPing's avatar TingPing

Disable challangeauth without openssl

parent a903f16c
......@@ -1151,7 +1151,6 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
case WORDL('N','O','T','I'):
{
int id = FALSE; /* identified */
char *response;
text = word_eol[4];
if (*text == ':')
......@@ -1159,9 +1158,10 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
text++;
}
#ifdef USE_OPENSSL
if (!strncmp (text, "CHALLENGE ", 10)) /* QuakeNet CHALLENGE upon our request */
{
response = challengeauth_response (((ircnet *)serv->network)->user ? ((ircnet *)serv->network)->user : prefs.hex_irc_user_name, serv->password, word[5]);
char *response = challengeauth_response (((ircnet *)serv->network)->user ? ((ircnet *)serv->network)->user : prefs.hex_irc_user_name, serv->password, word[5]);
tcp_sendf (serv, "PRIVMSG %s :CHALLENGEAUTH %s %s %s\r\n",
CHALLENGEAUTH_NICK,
......@@ -1172,6 +1172,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
g_free (response);
return; /* omit the CHALLENGE <hash> ALGOS message */
}
#endif
if (serv->have_idmsg)
{
......
......@@ -2210,6 +2210,7 @@ find_font (const char *fontname)
}
#endif
#ifdef USE_OPENSSL
static char *
str_sha256hash (char *string)
{
......@@ -2285,3 +2286,4 @@ challengeauth_response (char *username, char *password, char *challenge)
return (char *) digest;
}
#endif
......@@ -120,11 +120,15 @@ static int login_types_conf[] =
{
LOGIN_DEFAULT, /* default entry - we don't use this but it makes indexing consistent with login_types[] so it's nice */
LOGIN_SASL,
#ifdef USE_OPENSSL
LOGIN_SASLEXTERNAL,
#endif
LOGIN_PASS,
LOGIN_MSG_NICKSERV,
LOGIN_NICKSERV,
#ifdef USE_OPENSSL
LOGIN_CHALLENGEAUTH,
#endif
LOGIN_CUSTOM
#if 0
LOGIN_NS,
......@@ -137,11 +141,15 @@ static const char *login_types[]=
{
"Default",
"SASL (username + password)",
#ifdef USE_OPENSSL
"SASL EXTERNAL (cert)",
#endif
"Server Password (/PASS password)",
"NickServ (/MSG NickServ + password)",
"NickServ (/NICKSERV + password)",
#ifdef USE_OPENSSL
"Challenge Auth (username + password)",
#endif
"Custom... (connect commands)",
#if 0
"NickServ (/NS + password)",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment