summary refs log tree commit diff stats
path: root/src/common/hexchat.h
diff options
context:
space:
mode:
authorPatrick Griffis <tingping@tingping.se>2016-01-29 17:41:08 -0500
committerPatrick Griffis <tingping@tingping.se>2016-01-29 17:41:08 -0500
commit4362085847f359ed13df6f8f488a06eb52ecd767 (patch)
treef03818cefe6c641c6567f36ecd7c0a2196830f4d /src/common/hexchat.h
parent6b62c4738d4b1f5cb1bc70bf58f6a078630e6ef5 (diff)
Remove DH-AES/DH-BLOWFISH mechanisms and misc cleanup
- AES and Blowfish mechanisms are deemed insecure and servers
  have removed support for them
- Remove attempts to retry since we only support one mech
- Handle SASL 3.2's new syntax for supported mechs
Diffstat (limited to 'src/common/hexchat.h')
-rw-r--r--src/common/hexchat.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index a29ea1d8..51c9b9aa 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -422,9 +422,7 @@ typedef struct session
 
 /* SASL Mechanisms */
 #define MECH_PLAIN 0
-#define MECH_BLOWFISH 1
-#define MECH_AES 2
-#define MECH_EXTERNAL 3
+#define MECH_EXTERNAL 1
 
 typedef struct server
 {
@@ -546,7 +544,6 @@ typedef struct server
 	unsigned int skip_next_whois:1;	/* hide whois output */
 	unsigned int inside_whois:1;
 	unsigned int doing_dns:1;			/* /dns has been done */
-	unsigned int retry_sasl:1;		/* retrying another sasl mech */
 	unsigned int end_of_motd:1;		/* end of motd reached (logged in) */
 	unsigned int sent_quit:1;			/* sent a QUIT already? */
 	unsigned int use_listargs:1;		/* undernet and dalnet need /list >0,<10000 */
@@ -570,7 +567,6 @@ typedef struct server
 	unsigned int have_cert:1;	/* have loaded a cert */
 	unsigned int use_who:1;			/* whether to use WHO command to get dcc_ip */
 	unsigned int sasl_mech;			/* mechanism for sasl auth */
-	unsigned int sent_saslauth:1;	/* have sent AUTHENICATE yet */
 	unsigned int sent_capend:1;	/* have sent CAP END yet */
 	unsigned int waiting_on_cap:1;	/* waiting on another line of CAP LS */
 #ifdef USE_OPENSSL