nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

winpgnt: command-line option to add keys encrypted.

Browse Source 
I couldn't quite decide whether to name the option 'encrypted' or
'no-decrypt', so I've supported both.
This commit is contained in:
Simon Tatham 2021-04-02 11:07:42 +01:00
parent 04390ff4a7
commit af6adb5c4b
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
windows/winpgnt.c
View File

@ -389,7 +389,7 @@ void keylist_update(void)
} }
} }
static void win_add_keyfile(Filename *filename) static void win_add_keyfile(Filename *filename, bool encrypted)
{ {
char *err; char *err;
int ret; int ret;
@ -399,7 +399,7 @@ static void win_add_keyfile(Filename *filename)
* _new_ passphrase; pageant_add_keyfile will take care of trying * _new_ passphrase; pageant_add_keyfile will take care of trying
* all the passphrases we've already stored.) * all the passphrases we've already stored.)
*/ */
ret = pageant_add_keyfile(filename, NULL, &err, false); ret = pageant_add_keyfile(filename, NULL, &err, encrypted);
if (ret == PAGEANT_ACTION_OK) { if (ret == PAGEANT_ACTION_OK) {
goto done; goto done;
} else if (ret == PAGEANT_ACTION_FAILURE) { } else if (ret == PAGEANT_ACTION_FAILURE) {
@ -448,31 +448,10 @@ static void win_add_keyfile(Filename *filename)
return; return;
} }
static void win_add_keyfile_encrypted(Filename *filename)
{
char *err;
int ret;
ret = pageant_add_keyfile(filename, NULL, &err, true);
if (ret == PAGEANT_ACTION_OK) {
goto done;
} else if (ret == PAGEANT_ACTION_FAILURE) {
goto error;
}
error:
message_box(traywindow, err, APPNAME, MB_OK | MB_ICONERROR,
HELPCTXID(errors_cantloadkey));
done:
sfree(err);
return;
}
/* /*
* Prompt for a key file to add, and add it. * Prompt for a key file to add, and add it.
*/ */
static void prompt_add_keyfile(void) static void prompt_add_keyfile(bool encrypted)
{ {
OPENFILENAME of; OPENFILENAME of;
char *filelist = snewn(8192, char); char *filelist = snewn(8192, char);
@ -493,7 +472,7 @@ static void prompt_add_keyfile(void)
if(strlen(filelist) > of.nFileOffset) { if(strlen(filelist) > of.nFileOffset) {
/* Only one filename returned? */ /* Only one filename returned? */
Filename *fn = filename_from_str(filelist); Filename *fn = filename_from_str(filelist);
win_add_keyfile(fn); win_add_keyfile(fn, encrypted);
filename_free(fn); filename_free(fn);
} else { } else {
/* we are returned a bunch of strings, end to /* we are returned a bunch of strings, end to
@ -506,7 +485,7 @@ static void prompt_add_keyfile(void)
while (*filewalker != '\0') { while (*filewalker != '\0') {
char *filename = dupcat(dir, "\\", filewalker); char *filename = dupcat(dir, "\\", filewalker);
Filename *fn = filename_from_str(filename); Filename *fn = filename_from_str(filename);
win_add_keyfile(fn); win_add_keyfile(fn, encrypted);
filename_free(fn); filename_free(fn);
sfree(filename); sfree(filename);
filewalker += strlen(filewalker) + 1; filewalker += strlen(filewalker) + 1;
@ -596,7 +575,7 @@ static INT_PTR CALLBACK KeyListProc(HWND hwnd, UINT msg,
SetForegroundWindow(modal_passphrase_hwnd); SetForegroundWindow(modal_passphrase_hwnd);
break; break;
} }
prompt_add_keyfile(); prompt_add_keyfile(false);
} }
return 0; return 0;
case 102: /* remove key */ case 102: /* remove key */
@ -1173,7 +1152,7 @@ static LRESULT CALLBACK TrayWndProc(HWND hwnd, UINT message,
SetForegroundWindow(modal_passphrase_hwnd); SetForegroundWindow(modal_passphrase_hwnd);
break; break;
} }
prompt_add_keyfile(); prompt_add_keyfile(false);
break; break;
case IDM_ABOUT: case IDM_ABOUT:
if (!aboutbox) { if (!aboutbox) {
@ -1408,6 +1387,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
*/ */
split_into_argv(cmdline, &argc, &argv, &argstart); split_into_argv(cmdline, &argc, &argv, &argstart);
bool doing_opts = true; bool doing_opts = true;
bool add_keys_encrypted = false;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
char *p = argv[i]; char *p = argv[i];
if (*p == '-' && doing_opts) { if (*p == '-' && doing_opts) {
@ -1421,6 +1401,15 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
} else if (!strcmp(p, "-restrict-putty-acl") || } else if (!strcmp(p, "-restrict-putty-acl") ||
!strcmp(p, "-restrict_putty_acl")) { !strcmp(p, "-restrict_putty_acl")) {
restrict_putty_acl = true; restrict_putty_acl = true;
} else if (!strcmp(p, "--no-decrypt") ||
!strcmp(p, "-no-decrypt") ||
!strcmp(p, "--no_decrypt") ||
!strcmp(p, "-no_decrypt") ||
!strcmp(p, "--nodecrypt") ||
!strcmp(p, "-nodecrypt") ||
!strcmp(p, "--encrypted") ||
!strcmp(p, "-encrypted")) {
add_keys_encrypted = true;
} else if (!strcmp(p, "-c")) { } else if (!strcmp(p, "-c")) {
/* /*
* If we see `-c', then the rest of the * If we see `-c', then the rest of the
@ -1443,7 +1432,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
} }
} else { } else {
Filename *fn = filename_from_str(p); Filename *fn = filename_from_str(p);
win_add_keyfile(fn); win_add_keyfile(fn, add_keys_encrypted);
filename_free(fn); filename_free(fn);
added_keys = true; added_keys = true;
} }