#include <windows.h>
#include <aclapi.h>
-#include <stdio.h> /* FIXME */
-#include "putty.h" /* FIXME */
+#include <stdio.h>
#include "ssh.h"
#include "tree234.h"
#define IDM_CLOSE 0x0010
#define IDM_VIEWKEYS 0x0020
+#define IDM_ABOUT 0x0030
#define APPNAME "Pageant"
#define SSH_AGENTC_ADD_RSA_IDENTITY 7
#define SSH_AGENTC_REMOVE_RSA_IDENTITY 8
+extern char ver[];
+
HINSTANCE instance;
HWND hwnd;
HWND keylist;
+HWND aboutbox;
HMENU systray_menu;
tree234 *rsakeys;
};
/*
+ * Dialog-box function for the Licence box.
+ */
+static int CALLBACK LicenceProc (HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam) {
+ switch (msg) {
+ case WM_INITDIALOG:
+ return 1;
+ case WM_COMMAND:
+ switch (LOWORD(wParam)) {
+ case IDOK:
+ EndDialog(hwnd, 1);
+ return 0;
+ }
+ return 0;
+ case WM_CLOSE:
+ EndDialog(hwnd, 1);
+ return 0;
+ }
+ return 0;
+}
+
+/*
+ * Dialog-box function for the About box.
+ */
+static int CALLBACK AboutProc (HWND hwnd, UINT msg,
+ WPARAM wParam, LPARAM lParam) {
+ switch (msg) {
+ case WM_INITDIALOG:
+ SetDlgItemText (hwnd, 100, ver);
+ return 1;
+ case WM_COMMAND:
+ switch (LOWORD(wParam)) {
+ case IDOK:
+ aboutbox = NULL;
+ DestroyWindow (hwnd);
+ return 0;
+ case 101:
+ EnableWindow(hwnd, 0);
+ DialogBox (instance, MAKEINTRESOURCE(214), NULL, LicenceProc);
+ EnableWindow(hwnd, 1);
+ SetActiveWindow(hwnd);
+ return 0;
+ }
+ return 0;
+ case WM_CLOSE:
+ aboutbox = NULL;
+ DestroyWindow (hwnd);
+ return 0;
+ }
+ return 0;
+}
+
+/*
* Dialog-box function for the passphrase box.
*/
static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
if (keylist) {
SendDlgItemMessage(keylist, 100, LB_RESETCONTENT, 0, 0);
for (key = first234(rsakeys, &e); key; key = next234(&e)) {
+ char listentry[512], *p;
+ /*
+ * Replace two spaces in the fingerprint with tabs, for
+ * nice alignment in the box.
+ */
+ rsa_fingerprint(listentry, sizeof(listentry), key);
+ p = strchr(listentry, ' '); if (p) *p = '\t';
+ p = strchr(listentry, ' '); if (p) *p = '\t';
SendDlgItemMessage (keylist, 100, LB_ADDSTRING,
- 0, (LPARAM) key->comment);
+ 0, (LPARAM)listentry);
}
SendDlgItemMessage (keylist, 100, LB_SETCURSEL, (WPARAM) -1, 0);
}
} while (ret == -1);
if (comment) free(comment);
if (ret == 0) {
- MessageBox(NULL, "Couldn't load public key.", APPNAME,
+ MessageBox(NULL, "Couldn't load private key.", APPNAME,
MB_OK | MB_ICONERROR);
free(key);
return;
ret[4] = SSH_AGENT_SUCCESS;
} else {
freersakey(key);
+ free(key);
}
}
break;
switch (msg) {
case WM_INITDIALOG:
- for (key = first234(rsakeys, &e); key; key = next234(&e)) {
- SendDlgItemMessage (hwnd, 100, LB_ADDSTRING,
- 0, (LPARAM) key->comment);
- }
+ keylist = hwnd;
+ {
+ static int tabs[2] = {25, 175};
+ SendDlgItemMessage (hwnd, 100, LB_SETTABSTOPS, 2,
+ (LPARAM) tabs);
+ }
+ keylist_update();
return 0;
case WM_COMMAND:
switch (LOWORD(wParam)) {
of.nMaxFile = sizeof(filename);
of.lpstrFileTitle = NULL;
of.lpstrInitialDir = NULL;
- of.lpstrTitle = "Select Public Key File";
+ of.lpstrTitle = "Select Private Key File";
of.Flags = 0;
if (GetOpenFileName(&of)) {
add_keyfile(filename);
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED) {
int n = SendDlgItemMessage (hwnd, 100, LB_GETCURSEL, 0, 0);
- if (n == LB_ERR || n == 0) {
+ if (n == LB_ERR) {
MessageBeep(0);
break;
}
break;
del234(rsakeys, key);
freersakey(key); free(key);
- SendDlgItemMessage(hwnd, 100, LB_RESETCONTENT, 0, 0);
- for (key = first234(rsakeys, &e); key; key = next234(&e)) {
- SendDlgItemMessage (hwnd, 100, LB_ADDSTRING,
- 0, (LPARAM) key->comment);
- }
- SendDlgItemMessage (hwnd, 100, LB_SETCURSEL, (WPARAM) -1, 0);
+ keylist_update();
}
return 0;
}
SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
}
break;
+ case IDM_ABOUT:
+ if (!aboutbox) {
+ aboutbox = CreateDialog (instance, MAKEINTRESOURCE(213),
+ NULL, AboutProc);
+ ShowWindow (aboutbox, SW_SHOWNORMAL);
+ /*
+ * Sometimes the window comes up minimised / hidden
+ * for no obvious reason. Prevent this.
+ */
+ SetForegroundWindow(aboutbox);
+ SetWindowPos (aboutbox, HWND_TOP, 0, 0, 0, 0,
+ SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
+ }
+ break;
}
break;
case WM_DESTROY:
DestroyIcon(hicon);
systray_menu = CreatePopupMenu();
+ /* accelerators used: vxa */
AppendMenu (systray_menu, MF_ENABLED, IDM_VIEWKEYS, "&View Keys");
+ AppendMenu (systray_menu, MF_ENABLED, IDM_ABOUT, "&About");
AppendMenu (systray_menu, MF_ENABLED, IDM_CLOSE, "E&xit");
}