diff options
| author | Patrick Griffis <tingping@tingping.se> | 2016-01-29 17:41:08 -0500 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2016-01-29 17:41:08 -0500 |
| commit | 4362085847f359ed13df6f8f488a06eb52ecd767 (patch) | |
| tree | f03818cefe6c641c6567f36ecd7c0a2196830f4d /src/common/proto-irc.c | |
| parent | 6b62c4738d4b1f5cb1bc70bf58f6a078630e6ef5 (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/proto-irc.c')
| -rw-r--r-- | src/common/proto-irc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c index 180a3e43..a565dbb6 100644 --- a/src/common/proto-irc.c +++ b/src/common/proto-irc.c @@ -946,10 +946,9 @@ process_numeric (session * sess, int n, word_eol[6]+1, word[1], word[2], NULL, 0, tags_data->timestamp); break; - case 903: /* successful SASL auth */ case 904: /* failed SASL auth */ - if (inbound_sasl_error (serv)) - break; /* might retry */ + inbound_sasl_error (serv); + case 903: /* successful SASL auth */ case 905: /* failed SASL auth */ case 906: /* aborted */ case 907: /* attempting to re-auth after a successful auth */ @@ -963,7 +962,7 @@ process_numeric (session * sess, int n, } break; case 908: /* Supported SASL Mechs */ - inbound_sasl_supportedmechs (serv, word[4]); + /* ignored for now, SASL 3.2 is a better solution and we only do PLAIN atm */ break; default: |