snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmbiff: use size_t for password-lengths.

Browse source 
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
This commit is contained in:
Jeremy Sowden 2019-06-28 16:11:22 +01:00 committed by Carlos R. Mafra
parent 897886a68c
commit 5c213e9e77
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wmbiff/wmbiff/Client.h
View file

@ -88,7 +88,7 @@ typedef struct _mbox_t {
/* using the msglst feature, fetch the headers /* using the msglst feature, fetch the headers
to have them on hand */ to have them on hand */
unsigned int wantCacheHeaders:1; unsigned int wantCacheHeaders:1;
unsigned char password_len; /* memfrob may shorten passwords */ size_t password_len; /* memfrob may shorten passwords */
} pop_imap; } pop_imap;
} u; } u;

4
wmbiff/wmbiff/Imap4Client.c
View file

@ -579,8 +579,8 @@ int imap4Create( /*@notnull@ */ Pop3 pc, const char *const str)
free(unaliased_str); free(unaliased_str);
IMAP_DM(pc, DEBUG_INFO, "userName= '%s'\n", PCU.userName); IMAP_DM(pc, DEBUG_INFO, "userName= '%s'\n", PCU.userName);
IMAP_DM(pc, DEBUG_INFO, "password is %d characters long\n", IMAP_DM(pc, DEBUG_INFO, "password is %zu characters long\n",
(int) PCU.password_len); PCU.password_len);
IMAP_DM(pc, DEBUG_INFO, "serverName= '%s'\n", PCU.serverName); IMAP_DM(pc, DEBUG_INFO, "serverName= '%s'\n", PCU.serverName);
IMAP_DM(pc, DEBUG_INFO, "serverPath= '%s'\n", pc->path); IMAP_DM(pc, DEBUG_INFO, "serverPath= '%s'\n", pc->path);
IMAP_DM(pc, DEBUG_INFO, "serverPort= '%d'\n", PCU.serverPort); IMAP_DM(pc, DEBUG_INFO, "serverPort= '%d'\n", PCU.serverPort);

15
wmbiff/wmbiff/passwordMgr.c
View file

@ -51,7 +51,7 @@ typedef struct password_binding_struct {
char user[BUF_SMALL]; char user[BUF_SMALL];
char server[BUF_BIG]; char server[BUF_BIG];
char password[BUF_SMALL]; /* may be frobnicated */ char password[BUF_SMALL]; /* may be frobnicated */
unsigned char password_len; /* frobnicated *'s are nulls */ size_t password_len; /* frobnicated *'s are nulls */
} *password_binding; } *password_binding;
static password_binding pass_list = NULL; static password_binding pass_list = NULL;
@ -113,8 +113,7 @@ static void
get_password_from_keychain(Pop3 pc, const char *username, get_password_from_keychain(Pop3 pc, const char *username,
const char *servername, const char *servername,
/*@out@ */ char *password, /*@out@ */ char *password,
/*@out@ */ /*@out@ */ size_t *password_len)
unsigned char *password_len)
{ {
SecKeychainRef kc; SecKeychainRef kc;
OSStatus rc; OSStatus rc;
@ -145,7 +144,7 @@ get_password_from_keychain(Pop3 pc, const char *username,
*password_len = pwdlen; *password_len = pwdlen;
} else { } else {
DM(pc, DEBUG_ERROR, DM(pc, DEBUG_ERROR,
"passmgr: warning: your password appears longer (%lu) than expected (%d)\n", "passmgr: warning: your password appears longer (%zu) than expected (%zu)\n",
strlen(secpwd), *password_len - 1); strlen(secpwd), *password_len - 1);
} }
rc = SecKeychainItemFreeContent(NULL, secpwd); rc = SecKeychainItemFreeContent(NULL, secpwd);
@ -159,7 +158,7 @@ get_password_from_command(Pop3 pc, const char *username,
const char *servername, const char *servername,
/*@out@ */ char *password, /*@out@ */ char *password,
/*@out@ */ /*@out@ */
unsigned char *password_len) size_t *password_len)
{ {
password[*password_len - 1] = '\0'; password[*password_len - 1] = '\0';
password[0] = '\0'; password[0] = '\0';
@ -195,8 +194,8 @@ get_password_from_command(Pop3 pc, const char *username,
strncpy(password, password_ptr, *password_len); strncpy(password, password_ptr, *password_len);
if (password[*password_len - 1] != '\0') { if (password[*password_len - 1] != '\0') {
DM(pc, DEBUG_ERROR, DM(pc, DEBUG_ERROR,
"passmgr: warning: your password appears longer (%lu) than expected (%d)\n", "passmgr: warning: your password appears longer (%zu) than expected (%zu)\n",
(unsigned long) strlen(password_ptr), *password_len - 1); strlen(password_ptr), *password_len - 1);
} }
free(password_ptr); free(password_ptr);
password[*password_len - 1] = '\0'; password[*password_len - 1] = '\0';
@ -230,7 +229,7 @@ char *passwordFor(const char *username,
if (bFlushCache == 0) { if (bFlushCache == 0) {
char *ret = strdup(p->password); char *ret = strdup(p->password);
#ifdef HAVE_MEMFROB #ifdef HAVE_MEMFROB
unsigned short ret_len = p->password_len; size_t ret_len = p->password_len;
DEFROB(ret); DEFROB(ret);
#endif #endif
return (ret); return (ret);