*/
mutt_to_base64 ((unsigned char *) ibuf, (unsigned char *) obuf,
- str_len (obuf), sizeof (ibuf) - 2);
+ m_strlen(obuf), sizeof (ibuf) - 2);
str_cat (ibuf, sizeof (ibuf), "\r\n");
mutt_socket_write (idata->conn, ibuf);
unsigned int secret_len, chal_len;
int i;
- secret_len = str_len (password);
- chal_len = str_len (challenge);
+ secret_len = m_strlen(password);
+ chal_len = m_strlen(challenge);
/* passwords longer than MD5_BLOCK_LEN bytes are substituted with their MD5
* digests */
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);