X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/080954b86f2b5d52a6ab8401faeb9ac4dd9c7e08..2184a5d91ffbcf2de2f730c83dda2d9443035f50:/pageant.c?ds=sidebyside

diff --git a/pageant.c b/pageant.c
index e0018639..01148047 100644
--- a/pageant.c
+++ b/pageant.c
@@ -65,7 +65,7 @@ int agent_exists(void);
  * pads its data with random bytes. Since we only use rsadecrypt()
  * and the signing functions, which are deterministic, this should
  * never be called.
- * 
+ *
  * If it _is_ called, there is a _serious_ problem, because it
  * won't generate true random numbers. So we must scream, panic,
  * and exit immediately if that should happen.
@@ -237,6 +237,26 @@ static int CALLBACK PassphraseProc(HWND hwnd, UINT msg,
 }
 
 /*
+ * Warn about the obsolescent key file format.
+ */
+void old_keyfile_warning(void)
+{
+    static const char mbtitle[] = "PuTTY Key File Warning";
+    static const char message[] =
+	"You are loading an SSH 2 private key which has an\n"
+	"old version of the file format. This means your key\n"
+	"file is not fully tamperproof. Future versions of\n"
+	"PuTTY may stop supporting this private key format,\n"
+	"so we recommend you convert your key to the new\n"
+	"format.\n"
+	"\n"
+	"You can perform this conversion by loading the key\n"
+	"into PuTTYgen and then saving it again.";
+
+    MessageBox(NULL, message, mbtitle, MB_OK);
+}
+
+/*
  * Update the visible key list.
  */
 static void keylist_update(void)
@@ -613,7 +633,7 @@ static void answer_msg(void *msg)
 	break;
       case SSH2_AGENTC_SIGN_REQUEST:
 	/*
-	 * Reply with either SSH2_AGENT_RSA_RESPONSE or
+	 * Reply with either SSH2_AGENT_SIGN_RESPONSE or
 	 * SSH_AGENT_FAILURE, depending on whether we have that key
 	 * or not.
 	 */
@@ -652,7 +672,7 @@ static void answer_msg(void *msg)
 	    char *comment;
             int commentlen;
 	    key = smalloc(sizeof(struct RSAKey));
-	    memset(key, 0, sizeof(key));
+	    memset(key, 0, sizeof(struct RSAKey));
 	    p += makekey(p, key, NULL, 1);
 	    p += makeprivate(p, key);
 	    p += ssh1_read_bignum(p, &key->iqmp);	/* p^-1 mod q */
@@ -696,6 +716,8 @@ static void answer_msg(void *msg)
 	    /* Add further algorithm names here. */
 	    if (alglen == 7 && !memcmp(alg, "ssh-rsa", 7))
 		key->alg = &ssh_rsa;
+	    else if (alglen == 7 && !memcmp(alg, "ssh-dss", 7))
+		key->alg = &ssh_dss;
 	    else {
 		sfree(key);
 		goto failure;
@@ -1073,13 +1095,54 @@ static int CALLBACK KeyListProc(HWND hwnd, UINT msg,
     return 0;
 }
 
+/* Set up a system tray icon */
+static BOOL AddTrayIcon(HWND hwnd)
+{
+    BOOL res;
+    NOTIFYICONDATA tnid;
+    HICON hicon;
+
+#ifdef NIM_SETVERSION
+    tnid.uVersion = 0;
+    res = Shell_NotifyIcon(NIM_SETVERSION, &tnid);
+#endif
+
+    tnid.cbSize = sizeof(NOTIFYICONDATA);
+    tnid.hWnd = hwnd;
+    tnid.uID = 1;	       /* unique within this systray use */
+    tnid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
+    tnid.uCallbackMessage = WM_SYSTRAY;
+    tnid.hIcon = hicon = LoadIcon(instance, MAKEINTRESOURCE(201));
+    strcpy(tnid.szTip, "Pageant (PuTTY authentication agent)");
+
+    res = Shell_NotifyIcon(NIM_ADD, &tnid);
+
+    if (hicon) DestroyIcon(hicon);
+    
+    return res;
+}
+
 static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam)
 {
     int ret;
     static int menuinprogress;
+    static UINT msgTaskbarCreated = 0;
 
     switch (message) {
+      case WM_CREATE:
+        msgTaskbarCreated = RegisterWindowMessage(_T("TaskbarCreated"));
+        break;
+      default:
+        if (message==msgTaskbarCreated) {
+            /*
+	     * Explorer has been restarted, so the tray icon will
+	     * have been lost.
+	     */
+	    AddTrayIcon(hwnd);
+        }
+        break;
+        
       case WM_SYSTRAY:
 	if (lParam == WM_RBUTTONUP) {
 	    POINT cursorpos;
@@ -1340,37 +1403,15 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 			    100, 100, NULL, NULL, inst, NULL);
 
 	/* Set up a system tray icon */
-	{
-	    BOOL res;
-	    NOTIFYICONDATA tnid;
-	    HICON hicon;
-
-#ifdef NIM_SETVERSION
-	    tnid.uVersion = 0;
-	    res = Shell_NotifyIcon(NIM_SETVERSION, &tnid);
-#endif
-
-	    tnid.cbSize = sizeof(NOTIFYICONDATA);
-	    tnid.hWnd = hwnd;
-	    tnid.uID = 1;	       /* unique within this systray use */
-	    tnid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
-	    tnid.uCallbackMessage = WM_SYSTRAY;
-	    tnid.hIcon = hicon = LoadIcon(instance, MAKEINTRESOURCE(201));
-	    strcpy(tnid.szTip, "Pageant (PuTTY authentication agent)");
-
-	    res = Shell_NotifyIcon(NIM_ADD, &tnid);
-
-	    if (hicon)
-		DestroyIcon(hicon);
-
-	    systray_menu = CreatePopupMenu();
-	    /* accelerators used: vkxa */
-	    AppendMenu(systray_menu, MF_ENABLED, IDM_VIEWKEYS,
-		       "&View Keys");
-	    AppendMenu(systray_menu, MF_ENABLED, IDM_ADDKEY, "Add &Key");
-	    AppendMenu(systray_menu, MF_ENABLED, IDM_ABOUT, "&About");
-	    AppendMenu(systray_menu, MF_ENABLED, IDM_CLOSE, "E&xit");
-	}
+	AddTrayIcon(hwnd);
+
+        systray_menu = CreatePopupMenu();
+        /* accelerators used: vkxa */
+        AppendMenu(systray_menu, MF_ENABLED, IDM_VIEWKEYS,
+               "&View Keys");
+        AppendMenu(systray_menu, MF_ENABLED, IDM_ADDKEY, "Add &Key");
+        AppendMenu(systray_menu, MF_ENABLED, IDM_ABOUT, "&About");
+        AppendMenu(systray_menu, MF_ENABLED, IDM_CLOSE, "E&xit");
 
 	ShowWindow(hwnd, SW_HIDE);