tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/04/09 15:12:23

Browse Source 
[ssh-add.c]
     passphrase caching: ssh-add tries last passphrase, clears passphrase if
     not successful and after last try.
     based on discussions with espie@, jakob@, ... and code from jakob@ and
     wolfgang@wsrcc.com
This commit is contained in:
Ben Lindstrom 2001-04-10 02:45:32 +00:00
parent 8ffeacfb2d
commit ee61794620
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -9,6 +9,12 @@
- stevesk@cvs.openbsd.org 2001/04/09 00:42:05 - stevesk@cvs.openbsd.org 2001/04/09 00:42:05
[sftp.1] [sftp.1]
spelling spelling
- markus@cvs.openbsd.org 2001/04/09 15:12:23
[ssh-add.c]
passphrase caching: ssh-add tries last passphrase, clears passphrase if
not successful and after last try.
based on discussions with espie@, jakob@, ... and code from jakob@ and
wolfgang@wsrcc.com
20010409 20010409
- (stevesk) use setresgid() for setegid() if needed - (stevesk) use setresgid() for setegid() if needed
@ -4978,4 +4984,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1090 2001/04/10 02:43:57 mouring Exp $ $Id: ChangeLog,v 1.1091 2001/04/10 02:45:32 mouring Exp $

25
ssh-add.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-add.c,v 1.32 2001/04/08 13:03:00 markus Exp $"); RCSID("$OpenBSD: ssh-add.c,v 1.33 2001/04/09 15:12:23 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
@ -55,6 +55,18 @@ extern char *__progname;
char *__progname; char *__progname;
#endif #endif
/* we keep a cache of one passphrases */
static char *pass = NULL;
void
clear_pass(void)
{
if (pass) {
memset(pass, 0, strlen(pass));
xfree(pass);
pass = NULL;
}
}
void void
delete_file(AuthenticationConnection *ac, const char *filename) delete_file(AuthenticationConnection *ac, const char *filename)
{ {
@ -136,7 +148,7 @@ add_file(AuthenticationConnection *ac, const char *filename)
{ {
struct stat st; struct stat st;
Key *private; Key *private;
char *comment = NULL, *askpass = NULL, *pass; char *comment = NULL, *askpass = NULL;
char buf[1024], msg[1024]; char buf[1024], msg[1024];
int interactive = isatty(STDIN_FILENO); int interactive = isatty(STDIN_FILENO);
@ -155,7 +167,12 @@ add_file(AuthenticationConnection *ac, const char *filename)
private = key_load_private(filename, "", &comment); private = key_load_private(filename, "", &comment);
if (comment == NULL) if (comment == NULL)
comment = xstrdup(filename); comment = xstrdup(filename);
/* try last */
if (private == NULL && pass != NULL)
private = key_load_private(filename, pass, NULL);
if (private == NULL) { if (private == NULL) {
/* clear passphrase since it did not work */
clear_pass();
printf("Need passphrase for %.200s\n", filename); printf("Need passphrase for %.200s\n", filename);
if (!interactive && askpass == NULL) { if (!interactive && askpass == NULL) {
xfree(comment); xfree(comment);
@ -175,10 +192,9 @@ add_file(AuthenticationConnection *ac, const char *filename)
return; return;
} }
private = key_load_private(filename, pass, &comment); private = key_load_private(filename, pass, &comment);
memset(pass, 0, strlen(pass));
xfree(pass);
if (private != NULL) if (private != NULL)
break; break;
clear_pass();
strlcpy(msg, "Bad passphrase, try again", sizeof msg); strlcpy(msg, "Bad passphrase, try again", sizeof msg);
} }
} }
@ -280,6 +296,7 @@ main(int argc, char **argv)
else else
add_file(ac, buf); add_file(ac, buf);
} }
clear_pass();
ssh_close_authentication_connection(ac); ssh_close_authentication_connection(ac);
exit(0); exit(0);
} }