X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fauth_cram.c;h=7e00d6c9cfb1703e004ad1d6ce028d49c495d0fe;hp=14772b03e09edb42f72bf8711cc021c32830ad59;hb=1ee89902de184a640c171ae3285bff6882a791bd;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1 diff --git a/imap/auth_cram.c b/imap/auth_cram.c index 14772b0..7e00d6c 100644 --- a/imap/auth_cram.c +++ b/imap/auth_cram.c @@ -9,9 +9,7 @@ /* IMAP login/authentication code */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "mutt.h" #include "imap_private.h" @@ -20,16 +18,14 @@ #define MD5_BLOCK_LEN 64 #define MD5_DIGEST_LEN 16 -#include #include -#include "lib/debug.h" /* forward declarations */ static void hmac_md5 (const char *password, char *challenge, unsigned char *response); /* imap_auth_cram_md5: AUTH=CRAM-MD5 support. */ -imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method) +imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method __attribute__ ((unused))) { char ibuf[LONG_STRING * 2], obuf[LONG_STRING]; unsigned char hmac_response[MD5_DIGEST_LEN]; @@ -60,17 +56,14 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method) while (rc == IMAP_CMD_CONTINUE); if (rc != IMAP_CMD_RESPOND) { - debug_print (1, ("Invalid response from server: %s\n", ibuf)); goto bail; } if ((len = mutt_from_base64 (obuf, idata->cmd.buf + 2)) == -1) { - debug_print (1, ("Error decoding base64 response.\n")); goto bail; } obuf[len] = '\0'; - debug_print (2, ("CRAM challenge: %s\n", obuf)); /* The client makes note of the data and then responds with a string * consisting of the user name, a space, and a 'digest'. The latter is @@ -94,7 +87,6 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method) hmac_response[9], hmac_response[10], hmac_response[11], hmac_response[12], hmac_response[13], hmac_response[14], hmac_response[15]); - debug_print (2, ("CRAM response: %s\n", obuf)); /* XXX - ibuf must be long enough to store the base64 encoding of obuf, * plus the additional debris @@ -110,7 +102,6 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method) while (rc == IMAP_CMD_CONTINUE); if (rc != IMAP_CMD_OK) { - debug_print (1, ("Error receiving server response.\n")); goto bail; }