lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-12 15:41:16 +03:00
Code Activity

Getpass: Fix password clearing

Browse Source
This commit is contained in:
Aris Adamantiadis
2011-01-26 13:22:29 +01:00
parent 1e827a8e81
commit 5d87ca94a8
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/getpass.c
View File

@@ -50,7 +50,7 @@ static int ssh_gets(const char *prompt, char *buf, size_t len, int verify) {
if (tmp == NULL) {
return 0;
}
ZERO_STRUCT(tmp);
memset(tmp,'\0',len);
/* read the password */
while (!ok) {
@@ -74,16 +74,16 @@ static int ssh_gets(const char *prompt, char *buf, size_t len, int verify) {
if (verify) {
char *key_string;
key_string = (char *) malloc(len);
key_string = malloc(len);
if (key_string == NULL) {
break;
}
ZERO_STRUCT(key_string);
memset(key_string, '\0', len);
fprintf(stdout, "\nVerifying, please re-enter. %s", prompt);
fflush(stdout);
if (! fgets(key_string, len, stdin)) {
ZERO_STRUCT(key_string);
memset(key_string, '\0', len);
SAFE_FREE(key_string);
clearerr(stdin);
continue;
@@ -94,18 +94,17 @@ static int ssh_gets(const char *prompt, char *buf, size_t len, int verify) {
fprintf(stdout, "\n");
if (strcmp(buf, key_string)) {
printf("\n\07\07Mismatch - try again\n");
ZERO_STRUCT(key_string);
memset(key_string, '\0', len);
SAFE_FREE(key_string);
fflush(stdout);
continue;
}
ZERO_STRUCT(key_string);
memset(key_string, '\0', len);
SAFE_FREE(key_string);
}
ok = 1;
}
ZERO_STRUCT(tmp);
memset(tmp, '\0', len);
free(tmp);
return ok;
@@ -147,7 +146,7 @@ int ssh_getpass(const char *prompt,
SetConsoleMode(h, mode);
if (!ok) {
ZERO_STRUCT(buf);
memset (buf, '\0', len);
return -1;
}
@@ -260,8 +259,8 @@ int ssh_getpass(const char *prompt,
}
if (!ok) {
ZERO_STRUCT(buf);
return -1;
memset (buf, '\0', len);
return -1;
}
/* force termination */