From 65f66c88084c7dc925c48f7441a7e4330451f2cd Mon Sep 17 00:00:00 2001 From: owen Date: Thu, 26 Jun 2003 14:19:33 +0000 Subject: [PATCH] Implement hostkey-prompt-type everywhere except Macintosh. git-svn-id: svn://svn.tartarus.org/sgt/putty@3307 cda61777-01e9-0310-a592-d414129be87e --- console.c | 16 ++++++++-------- unix/gtkdlg.c | 6 +++--- unix/uxcons.c | 16 ++++++++-------- windlg.c | 8 ++++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/console.c b/console.c index fe201347..039716c6 100644 --- a/console.c +++ b/console.c @@ -47,14 +47,14 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, "The server's host key is not cached in the registry. You\n" "have no guarantee that the server is the computer you\n" "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 in the registry. You\n" "have no guarantee that the server is the computer you\n" "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" @@ -71,7 +71,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, "server administrator has changed the host key, or you\n" "have actually connected to another computer pretending\n" "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[] = @@ -81,7 +81,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, "server administrator has changed the host key, or you\n" "have actually connected to another computer pretending\n" "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" @@ -106,18 +106,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); } diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c index ea39c5ed..460fe888 100644 --- a/unix/gtkdlg.c +++ b/unix/gtkdlg.c @@ -2296,7 +2296,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, static const char absenttxt[] = "The server's host key is not cached. You have no guarantee " "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, press \"Accept\" to add the key to " "PuTTY's cache and carry on connecting.\n" @@ -2310,7 +2310,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, "cached. This means that either the server administrator " "has changed the host key, or you have actually connected " "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, " "press \"Accept\" to update PuTTY's cache and continue connecting.\n" @@ -2330,7 +2330,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, if (ret == 0) /* success - key matched OK */ return; - text = dupprintf((ret == 2 ? wrongtxt : absenttxt), fingerprint); + text = dupprintf((ret == 2 ? wrongtxt : absenttxt), keytype, fingerprint); ret = messagebox(GTK_WIDGET(get_window(frontend)), "PuTTY Security Alert", text, diff --git a/unix/uxcons.c b/unix/uxcons.c index 80ed246e..881b6bfe 100644 --- a/unix/uxcons.c +++ b/unix/uxcons.c @@ -41,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" @@ -63,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[] = @@ -72,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" @@ -97,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); } diff --git a/windlg.c b/windlg.c index 277b2c00..7f6d88c3 100644 --- a/windlg.c +++ b/windlg.c @@ -711,7 +711,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, "The server's host key is not cached in the registry. You\n" "have no guarantee that the server is the computer you\n" "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, hit Yes to add the key to\n" "%s's cache and carry on connecting.\n" @@ -728,7 +728,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, "server administrator has changed the host key, or you\n" "have actually connected to another computer pretending\n" "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" "hit Yes to update %s's cache and continue connecting.\n" @@ -749,7 +749,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, if (ret == 2) { /* key was different */ int mbret; char *message, *title; - message = dupprintf(wrongmsg, appname, fingerprint, appname); + message = dupprintf(wrongmsg, appname, keytype, fingerprint, appname); title = dupprintf(mbtitle, appname); mbret = MessageBox(NULL, message, title, MB_ICONWARNING | MB_YESNOCANCEL); @@ -763,7 +763,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, if (ret == 1) { /* key was absent */ int mbret; char *message, *title; - message = dupprintf(absentmsg, fingerprint, appname); + message = dupprintf(absentmsg, keytype, fingerprint, appname); title = dupprintf(mbtitle, appname); mbret = MessageBox(NULL, message, title, MB_ICONWARNING | MB_YESNOCANCEL); -- 2.11.0