X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/83e7d008503efaaf4b727224b71a0fd828960c81..21a22afe608ae2dbc4a663b7055e7524c54db0c1:/mac/mac.c

diff --git a/mac/mac.c b/mac/mac.c
index 8dde3e12..d621b914 100644
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -71,6 +71,7 @@ static int cold = 1;
 static int borednow = FALSE;
 struct mac_gestalts mac_gestalts;
 UInt32 sleeptime;
+static long timing_next_time;
 
 static void mac_startup(void);
 static void mac_eventloop(void);
@@ -244,16 +245,31 @@ static void mac_startup(void) {
 			  NewAEEventHandlerUPP(&mac_aevt_quit), 0, FALSE);
 }
 
+void timer_change_notify(long next)
+{
+    timing_next_time = next;
+}
+
 static void mac_eventloop(void) {
     Boolean gotevent;
     EventRecord event;
     RgnHandle cursrgn;
+    long next;
+    long ticksleft;
 
     cursrgn = NewRgn();
     sleeptime = 0;
     for (;;) {
-    	mac_adjustcursor(cursrgn);
+	ticksleft=timing_next_time-GETTICKCOUNT();
+	if (sleeptime > ticksleft && ticksleft >=0)
+	    sleeptime=ticksleft;
 	gotevent = WaitNextEvent(everyEvent, &event, sleeptime, cursrgn);
+	if (timing_next_time <= GETTICKCOUNT()) {
+            if (run_timers(timing_next_time, &next)) {
+                timer_change_notify(next);
+            }
+        }
+
 	/*
 	 * XXX For now, limit sleep time to 1/10 s to work around
 	 * wake-before-sleep race in MacTCP code.
@@ -267,9 +283,8 @@ static void mac_eventloop(void) {
 	    if (borednow)
 		cleanup_exit(0);
 	}
-	sk_poll();
 	if (!gotevent)
-	    mac_pollterm();
+	    sk_poll();
 	if (mac_gestalts.apprvers >= 0x100 && mac_frontwindow() != NULL)
 	    IdleControls(mac_frontwindow());
     }
@@ -457,6 +472,9 @@ static void mac_menucommand(long result) {
 	  case iOpen:
 	    mac_opensession();
 	    goto done;
+	  case iChange:
+	    mac_reconfig();
+	    goto done;
           case iClose:
             mac_closewindow(window);
             goto done;
@@ -552,6 +570,7 @@ static void mac_adjustmenus(void) {
     if (window != NULL && mac_wininfo(window)->adjustmenus != NULL)
 	(*mac_wininfo(window)->adjustmenus)(window);
     else {
+	DisableItem(menu, iChange);
 	DisableItem(menu, iSave);
 	DisableItem(menu, iSaveAs);
 	DisableItem(menu, iDuplicate);
@@ -677,6 +696,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 {
     Str255 stuff;
     Session *s = frontend;
+    int ret;
 
     /*
      * This function is horribly wrong.  For one thing, the alert
@@ -684,23 +704,40 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
      * 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.
+     * data just because this one's waiting for the user. Also 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);
+    /* Verify the key against the cache */
+
+    ret = verify_host_key(host, port, keytype, keystr);
+
+    if (ret == 0)		       /* success - key matched OK */
+	return;
+    if (ret == 2) {		       /* key was different */
+	stuff[0] = sprintf((char *)(&stuff[1]),
+			   "WARNING - POTENTIAL SECURITY BREACH\n",
+			   "The key fingerprint is: %s\n"
+			   "Continue connecting?", fingerprint);
+	ParamText(stuff, NULL, NULL, NULL);
+    }
+    if (ret == 1) {                     /* key was absent */
+	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.
-	 */
+	 */	
+    } else {
+	store_host_key(host, port, keytype, keystr);
     }
 }
 
@@ -784,6 +821,8 @@ void update_specials_menu(void *frontend)
 	mac_adjustmenus();
 }
 
+void notify_remote_exit(void *fe) { /* XXX anything needed here? */ }
+
 /*
  * Local Variables:
  * c-file-style: "simon"