projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove yet anoter round of str_* functions, replaced with their inlineable
[apps/madmutt.git]
/
imap
/
auth_cram.c
diff --git
a/imap/auth_cram.c
b/imap/auth_cram.c
index
e4ea149
..
ba2f42e
100644
(file)
--- a/
imap/auth_cram.c
+++ b/
imap/auth_cram.c
@@
-17,11
+17,11
@@
#include "imap_private.h"
#include "auth.h"
#include "imap_private.h"
#include "auth.h"
-#include "md5.h"
#define MD5_BLOCK_LEN 64
#define MD5_DIGEST_LEN 16
#include <lib-lib/macros.h>
#define MD5_BLOCK_LEN 64
#define MD5_DIGEST_LEN 16
#include <lib-lib/macros.h>
+#include <lib-hash/hash.h>
#include "lib/debug.h"
/* forward declarations */
#include "lib/debug.h"
/* forward declarations */
@@
-102,7
+102,7
@@
imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA * idata, const char *method)
mutt_to_base64 ((unsigned char *) ibuf, (unsigned char *) obuf,
m_strlen(obuf), sizeof (ibuf) - 2);
mutt_to_base64 ((unsigned char *) ibuf, (unsigned char *) obuf,
m_strlen(obuf), sizeof (ibuf) - 2);
-
str_cat (ibuf, sizeof
(ibuf), "\r\n");
+
m_strcat(ibuf, sizeof
(ibuf), "\r\n");
mutt_socket_write (idata->conn, ibuf);
do
mutt_socket_write (idata->conn, ibuf);
do
@@
-149,8
+149,8
@@
static void hmac_md5 (const char *password, char *challenge,
else
strfcpy ((char *) secret, password, sizeof (secret));
else
strfcpy ((char *) secret, password, sizeof (secret));
-
memset (ipad, 0, sizeof (ipad)
);
-
memset (opad, 0, sizeof (opad)
);
+
p_clear(ipad, 1
);
+
p_clear(opad, 1
);
memcpy (ipad, secret, secret_len);
memcpy (opad, secret, secret_len);
memcpy (ipad, secret, secret_len);
memcpy (opad, secret, secret_len);