X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/71581f966353977ea2ee12e2ec02ac5905fdcb5d..dee42491003c8fdd01bd039da46b9d6a2d171584:/mac/mac.c

diff --git a/mac/mac.c b/mac/mac.c
index 747acdc6..2fb7d44c 100644
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -260,7 +260,6 @@ static void mac_eventloop(void) {
     cursrgn = NewRgn();
     sleeptime = 0;
     for (;;) {
-    	mac_adjustcursor(cursrgn);
 	ticksleft=timing_next_time-GETTICKCOUNT();
 	if (sleeptime > ticksleft && ticksleft >=0)
 	    sleeptime=ticksleft;
@@ -286,7 +285,6 @@ static void mac_eventloop(void) {
 	}
 	if (!gotevent)
 	    sk_poll();
-	    mac_pollterm();
 	if (mac_gestalts.apprvers >= 0x100 && mac_frontwindow() != NULL)
 	    IdleControls(mac_frontwindow());
     }
@@ -693,41 +691,70 @@ int agent_query(void *in, int inlen, void **out, int *outlen,
 
 /* Temporary null routines for testing. */
 
-void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
-			 char *keystr, char *fingerprint)
+int verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
+                        char *keystr, char *fingerprint,
+                        void (*callback)(void *ctx, int result), void *ctx)
 {
-    Str255 stuff;
+    Str255 pappname;
+    Str255 pfingerprint;
+    Str255 pkeytype;
     Session *s = frontend;
+    int ret, alertret;
+    
+    c2pstrcpy(pappname, appname);
+    c2pstrcpy(pkeytype, keytype);
+    c2pstrcpy(pfingerprint, fingerprint);
 
     /*
-     * 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.
+     * 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.
      */
 
-    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.
-	 */
+    /* Verify the key against the cache */
+
+    ret = verify_host_key(host, port, keytype, keystr);
+
+    if (ret == 0) {		       /* success - key matched OK */
+	return 1;
+    } else if (ret == 2) {	       /* key was different */
+	ParamText(pappname, pkeytype, pfingerprint, NULL);
+	alertret=CautionAlert(wWrong, NULL);
+	if (alertret == 8) {
+	    /* Cancel */
+            return 0;
+	} else if (alertret == 9) {
+	    /* Connect Just Once */
+            return 1;
+	} else {
+	    /* Update Key */
+	    store_host_key(host, port, keytype, keystr);
+            return 1;
+	}
+    } else /* ret == 1 */ {	       /* key was absent */
+	ParamText(pkeytype, pfingerprint, pappname, NULL);
+	alertret=CautionAlert(wAbsent, NULL);
+	if (alertret == 7) {
+	    /* Cancel */
+            return 0;
+	} else if (alertret == 8) {
+	    /* Connect Just Once */
+            return 1;
+	} else {
+	    /* Update Key */
+	    store_host_key(host, port, keytype, keystr);
+            return 1;
+	}
     }
 }
 
-void askalg(void *frontend, const char *algtype, const char *algname)
+int askalg(void *frontend, const char *algtype, const char *algname,
+	   void (*callback)(void *ctx, int result), void *ctx)
 {
-
+    return 0;
 }
 
 void old_keyfile_warning(void)