nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-16 03:53:01 -05:00
Code Issues Projects Releases Wiki Activity

Add a second passphrase prompt to protect against typos

Browse Source 
[originally from svn r717]
This commit is contained in:
Simon Tatham 2000-10-20 09:31:16 +00:00
parent 0210709520
commit 76638e62be
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
puttygen.c
View File

@ -22,7 +22,6 @@
/* /*
* TODO: * TODO:
* - have some means of verifying passphrase changes against typos
* - prompt before overwriting an existing file * - prompt before overwriting an existing file
* - check the return value from saversakey() * - check the return value from saversakey()
* - test the generated keys for actual working-RSA-key-hood * - test the generated keys for actual working-RSA-key-hood
@ -302,7 +301,8 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
IDC_PKSTATIC, IDC_KEYDISPLAY, IDC_PKSTATIC, IDC_KEYDISPLAY,
IDC_FPSTATIC, IDC_FINGERPRINT, IDC_FPSTATIC, IDC_FINGERPRINT,
IDC_COMMENTSTATIC, IDC_COMMENTEDIT, IDC_COMMENTSTATIC, IDC_COMMENTEDIT,
IDC_PASSPHRASESTATIC, IDC_PASSPHRASEEDIT, IDC_PASSPHRASE1STATIC, IDC_PASSPHRASE1EDIT,
IDC_PASSPHRASE2STATIC, IDC_PASSPHRASE2EDIT,
IDC_BOX_ACTIONS, IDC_BOXT_ACTIONS, IDC_BOX_ACTIONS, IDC_BOXT_ACTIONS,
IDC_GENSTATIC, IDC_GENERATE, IDC_GENSTATIC, IDC_GENERATE,
IDC_LOADSTATIC, IDC_LOAD, IDC_LOADSTATIC, IDC_LOAD,
@ -315,7 +315,8 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
IDC_PKSTATIC, IDC_KEYDISPLAY, IDC_PKSTATIC, IDC_KEYDISPLAY,
IDC_FPSTATIC, IDC_FINGERPRINT, IDC_FPSTATIC, IDC_FINGERPRINT,
IDC_COMMENTSTATIC, IDC_COMMENTEDIT, IDC_COMMENTSTATIC, IDC_COMMENTEDIT,
IDC_PASSPHRASESTATIC, IDC_PASSPHRASEEDIT, 0 }; IDC_PASSPHRASE1STATIC, IDC_PASSPHRASE1EDIT,
IDC_PASSPHRASE2STATIC, IDC_PASSPHRASE2EDIT, 0 };
static const char generating_msg[] = static const char generating_msg[] =
"Please wait while a key is generated..."; "Please wait while a key is generated...";
static const char entropy_msg[] = static const char entropy_msg[] =
@ -331,6 +332,8 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
{ {
struct ctlpos cp, cp2; struct ctlpos cp, cp2;
/* Accelerators used: acglops */
ctlposinit(&cp, hwnd, 10, 10, 10); ctlposinit(&cp, hwnd, 10, 10, 10);
bartitle(&cp, "Public and private key generation for PuTTY", bartitle(&cp, "Public and private key generation for PuTTY",
IDC_TITLE); IDC_TITLE);
@ -351,8 +354,10 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
SendDlgItemMessage(hwnd, IDC_FINGERPRINT, EM_SETREADONLY, 1, 0); SendDlgItemMessage(hwnd, IDC_FINGERPRINT, EM_SETREADONLY, 1, 0);
staticedit(&cp, "Key &comment:", IDC_COMMENTSTATIC, staticedit(&cp, "Key &comment:", IDC_COMMENTSTATIC,
IDC_COMMENTEDIT, 70); IDC_COMMENTEDIT, 70);
staticpassedit(&cp, "Key p&assphrase:", IDC_PASSPHRASESTATIC, staticpassedit(&cp, "Key p&assphrase:", IDC_PASSPHRASE1STATIC,
IDC_PASSPHRASEEDIT, 70); IDC_PASSPHRASE1EDIT, 70);
staticpassedit(&cp, "C&onfirm passphrase:", IDC_PASSPHRASE2STATIC,
IDC_PASSPHRASE2EDIT, 70);
endbox(&cp); endbox(&cp);
beginbox(&cp, "Actions", beginbox(&cp, "Actions",
IDC_BOX_ACTIONS, IDC_BOXT_ACTIONS); IDC_BOX_ACTIONS, IDC_BOXT_ACTIONS);
@ -480,8 +485,18 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
if (state->key_exists) { if (state->key_exists) {
char filename[FILENAME_MAX]; char filename[FILENAME_MAX];
char passphrase[PASSPHRASE_MAXLEN]; char passphrase[PASSPHRASE_MAXLEN];
GetDlgItemText(hwnd, IDC_PASSPHRASEEDIT, char passphrase2[PASSPHRASE_MAXLEN];
passphrase, sizeof(passphrase)-1); GetDlgItemText(hwnd, IDC_PASSPHRASE1EDIT,
passphrase, sizeof(passphrase));
GetDlgItemText(hwnd, IDC_PASSPHRASE2EDIT,
passphrase2, sizeof(passphrase2));
if (strcmp(passphrase, passphrase2)) {
MessageBox(hwnd,
"The two passphrases given do not match.",
"PuTTYgen Error",
MB_OK | MB_ICONERROR);
break;
}
if (!*passphrase) { if (!*passphrase) {
int ret; int ret;
ret = MessageBox(hwnd, ret = MessageBox(hwnd,
@ -551,7 +566,9 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
*/ */
{ {
char buf[128]; char buf[128];
SetDlgItemText(hwnd, IDC_PASSPHRASEEDIT, SetDlgItemText(hwnd, IDC_PASSPHRASE1EDIT,
passphrase);
SetDlgItemText(hwnd, IDC_PASSPHRASE2EDIT,
passphrase); passphrase);
SetDlgItemText(hwnd, IDC_COMMENTEDIT, SetDlgItemText(hwnd, IDC_COMMENTEDIT,
state->key.comment); state->key.comment);
@ -619,7 +636,8 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
* because we will warn (Are You Sure?) before allowing * because we will warn (Are You Sure?) before allowing
* the user to save an unprotected private key. * the user to save an unprotected private key.
*/ */
SetDlgItemText(hwnd, IDC_PASSPHRASEEDIT, ""); SetDlgItemText(hwnd, IDC_PASSPHRASE1EDIT, "");
SetDlgItemText(hwnd, IDC_PASSPHRASE2EDIT, "");
/* /*
* Set the comment. * Set the comment.
*/ */