X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/9a30e26b7801d63e4ccfe8d36169299c09b89dff..4c48c989a62fba2809d684b30963b4411038fe96:/unix/uxcons.c?ds=inline

diff --git a/unix/uxcons.c b/unix/uxcons.c
index 2375a63e..881b6bfe 100644
--- a/unix/uxcons.c
+++ b/unix/uxcons.c
@@ -29,6 +29,10 @@ void cleanup_exit(int code)
     exit(code);
 }
 
+void update_specials_menu(void *frontend)
+{
+}
+
 void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 			 char *keystr, char *fingerprint)
 {
@@ -37,13 +41,13 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
     static const char absentmsg_batch[] =
 	"The server's host key is not cached. You have no guarantee\n"
 	"that the server is the computer you think it is.\n"
-	"The server's key fingerprint is:\n"
+	"The server's %s key fingerprint is:\n"
 	"%s\n"
 	"Connection abandoned.\n";
     static const char absentmsg[] =
 	"The server's host key is not cached. You have no guarantee\n"
 	"that the server is the computer you think it is.\n"
-	"The server's key fingerprint is:\n"
+	"The server's %s key fingerprint is:\n"
 	"%s\n"
 	"If you trust this host, enter \"y\" to add the key to\n"
 	"PuTTY's cache and carry on connecting.\n"
@@ -59,7 +63,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 	"cached. This means that either the server administrator\n"
 	"has changed the host key, or you have actually connected\n"
 	"to another computer pretending to be the server.\n"
-	"The new key fingerprint is:\n"
+	"The new %s key fingerprint is:\n"
 	"%s\n"
 	"Connection abandoned.\n";
     static const char wrongmsg[] =
@@ -68,7 +72,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 	"cached. This means that either the server administrator\n"
 	"has changed the host key, or you have actually connected\n"
 	"to another computer pretending to be the server.\n"
-	"The new key fingerprint is:\n"
+	"The new %s key fingerprint is:\n"
 	"%s\n"
 	"If you were expecting this change and trust the new key,\n"
 	"enter \"y\" to update PuTTY's cache and continue connecting.\n"
@@ -93,18 +97,18 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 
     if (ret == 2) {		       /* key was different */
 	if (console_batch_mode) {
-	    fprintf(stderr, wrongmsg_batch, fingerprint);
+	    fprintf(stderr, wrongmsg_batch, keytype, fingerprint);
 	    cleanup_exit(1);
 	}
-	fprintf(stderr, wrongmsg, fingerprint);
+	fprintf(stderr, wrongmsg, keytype, fingerprint);
 	fflush(stderr);
     }
     if (ret == 1) {		       /* key was absent */
 	if (console_batch_mode) {
-	    fprintf(stderr, absentmsg_batch, fingerprint);
+	    fprintf(stderr, absentmsg_batch, keytype, fingerprint);
 	    cleanup_exit(1);
 	}
-	fprintf(stderr, absentmsg, fingerprint);
+	fprintf(stderr, absentmsg, keytype, fingerprint);
 	fflush(stderr);
     }
 
@@ -254,7 +258,7 @@ void old_keyfile_warning(void)
     fputs(message, stderr);
 }
 
-void logevent(void *frontend, char *string)
+void logevent(void *frontend, const char *string)
 {
     log_eventlog(logctx, string);
 }