Add a preference list for SSH-2 key exchange algorithms, on a new "Kex" panel

[u/mdw/putty] / mac / mac.c

diff --git a/mac/mac.c b/mac/mac.c
index a9a327f..8dde3e1 100644 (file)
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.52 2003/02/27 23:34:59 ben Exp $ */
+/* $Id$ */
 /*
  * Copyright (c) 1999, 2003 Ben Harris
  * All rights reserved.
@@ -31,6 +31,7 @@
 #include <MacTypes.h>
 #include <AEDataModel.h>
 #include <AppleEvents.h>
+#include <Controls.h>
 #include <Quickdraw.h>
 #include <Fonts.h>
 #include <MacWindows.h>
@@ -61,6 +62,7 @@
 #include "macresid.h"
 #include "putty.h"
 #include "ssh.h"
+#include "terminal.h"
 #include "mac.h"
 
 Session *sesslist;
@@ -68,6 +70,7 @@ Session *sesslist;
 static int cold = 1;
 static int borednow = FALSE;
 struct mac_gestalts mac_gestalts;
+UInt32 sleeptime;
 
 static void mac_startup(void);
 static void mac_eventloop(void);
@@ -192,8 +195,11 @@ static void mac_startup(void) {
        fatalbox("Unable to create menu bar.");
     SetMenuBar(menuBar);
     AppendResMenu(GetMenuHandle(mApple), 'DRVR');
-    if (mac_gestalts.menuattr & gestaltMenuMgrAquaLayoutMask)
+    if (mac_gestalts.menuattr & gestaltMenuMgrAquaLayoutMask) {
        DeleteMenuItem(GetMenuHandle(mFile), iQuit);
+       /* Also delete the separator above the Quit item. */
+       DeleteMenuItem(GetMenuHandle(mFile), iQuit - 1);
+    }
     mac_adjustmenus();
     DrawMenuBar();
     InitCursor();
@@ -244,16 +250,28 @@ static void mac_eventloop(void) {
     RgnHandle cursrgn;
 
     cursrgn = NewRgn();
+    sleeptime = 0;
     for (;;) {
        mac_adjustcursor(cursrgn);
-       gotevent = WaitNextEvent(everyEvent, &event, LONG_MAX, cursrgn);
+       gotevent = WaitNextEvent(everyEvent, &event, sleeptime, cursrgn);
+       /*
+        * XXX For now, limit sleep time to 1/10 s to work around
+        * wake-before-sleep race in MacTCP code.
+        */
+       sleeptime = 6;
        mac_adjustcursor(cursrgn);
-       if (gotevent)
+       if (gotevent) {
+           /* Ensure we get a null event when the real ones run out. */
+           sleeptime = 0;
            mac_event(&event);
-       if (borednow)
-           cleanup_exit(0);
+           if (borednow)
+               cleanup_exit(0);
+       }
        sk_poll();
-       mac_pollterm();
+       if (!gotevent)
+           mac_pollterm();
+       if (mac_gestalts.apprvers >= 0x100 && mac_frontwindow() != NULL)
+           IdleControls(mac_frontwindow());
     }
     DisposeRgn(cursrgn);
 }
@@ -643,11 +661,13 @@ int agent_exists(void)
     return FALSE;
 }
 
-void agent_query(void *in, int inlen, void **out, int *outlen)
+int agent_query(void *in, int inlen, void **out, int *outlen,
+               void (*callback)(void *, void *, int), void *callback_ctx)
 {
 
     *out = NULL;
     *outlen = 0;
+    return 1;
 }
 
 /* Temporary null routines for testing. */
@@ -655,10 +675,36 @@ void agent_query(void *in, int inlen, void **out, int *outlen)
 void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
                         char *keystr, char *fingerprint)
 {
+    Str255 stuff;
+    Session *s = frontend;
 
+    /*
+     * This function is horribly wrong.  For one thing, the alert
+     * shouldn't be modal, it should be movable modal, or a sheet in
+     * Aqua.  Also, PuTTY might be in the background, in which case we
+     * should use the Notification Manager to wake up the user.  In
+     * any case, we shouldn't hold up processing of other connections'
+     * data just because this one's waiting for the user.  It should
+     * also handle a host key cache, of course, and see the note below
+     * about closing the connection.  All in all, a bit of a mess
+     * really.
+     */
+
+    stuff[0] = sprintf((char *)(&stuff[1]),
+                      "The server's key fingerprint is: %s\n"
+                      "Continue connecting?", fingerprint);
+    ParamText(stuff, NULL, NULL, NULL);
+    if (CautionAlert(wQuestion, NULL) == 2) {
+       /*
+        * User chose "Cancel".  Unfortunately, if I tear the
+        * connection down here, Bad Things happen when I return.  I
+        * think this function should actually return something
+        * telling the SSH code to abandon the connection.
+        */
+    }
 }
 
-void askcipher(void *frontend, char *ciphername, int cs)
+void askalg(void *frontend, const char *algtype, const char *algname)
 {
 
 }
@@ -728,6 +774,16 @@ void platform_get_x11_auth(char *display, int *proto,
     /* SGT: I have no idea whether Mac X servers need anything here. */
 }
 
+void update_specials_menu(void *frontend)
+{
+    Session *s = frontend;
+    WindowPtr front;
+
+    front = mac_frontwindow();
+    if (front != NULL && mac_windowsession(front) == s)
+       mac_adjustmenus();
+}
+
 /*
  * Local Variables:
  * c-file-style: "simon"