X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/67b59fbb07af8c69efea70c1eb9dbc5d4753d1b8..ff2ae36762dccc463baba86bf9d39de1a57a70e1:/psftp.c

diff --git a/psftp.c b/psftp.c
index 52f6dc99..302e1a73 100644
--- a/psftp.c
+++ b/psftp.c
@@ -1438,179 +1438,6 @@ void do_sftp(int mode, int modeflags, char *batchfile)
 
 static int verbose = 0;
 
-void verify_ssh_host_key(char *host, int port, char *keytype,
-			 char *keystr, char *fingerprint)
-{
-    int ret;
-    HANDLE hin;
-    DWORD savemode, i;
-
-    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"
-	"%s\n"
-	"If you trust this host, enter \"y\" to add the key to\n"
-	"PuTTY's cache and carry on connecting.\n"
-	"If you want to carry on connecting just once, without\n"
-	"adding the key to the cache, enter \"n\".\n"
-	"If you do not trust this host, press Return to abandon the\n"
-	"connection.\n"
-	"Store key in cache? (y/n) ";
-
-    static const char wrongmsg[] =
-	"WARNING - POTENTIAL SECURITY BREACH!\n"
-	"The server's host key does not match the one PuTTY has\n"
-	"cached in the registry. This means that either the\n"
-	"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"
-	"%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"
-	"If you want to carry on connecting but without updating\n"
-	"the cache, enter \"n\".\n"
-	"If you want to abandon the connection completely, press\n"
-	"Return to cancel. Pressing Return is the ONLY guaranteed\n"
-	"safe choice.\n"
-	"Update cached key? (y/n, Return cancels connection) ";
-
-    static const char abandoned[] = "Connection abandoned.\n";
-
-    char line[32];
-
-    /*
-     * Verify the key against the registry.
-     */
-    ret = verify_host_key(host, port, keytype, keystr);
-
-    if (ret == 0)		       /* success - key matched OK */
-	return;
-
-    if (ret == 2) {		       /* key was different */
-	fprintf(stderr, wrongmsg, fingerprint);
-	fflush(stderr);
-    }
-    if (ret == 1) {		       /* key was absent */
-	fprintf(stderr, absentmsg, fingerprint);
-	fflush(stderr);
-    }
-
-    hin = GetStdHandle(STD_INPUT_HANDLE);
-    GetConsoleMode(hin, &savemode);
-    SetConsoleMode(hin, (savemode | ENABLE_ECHO_INPUT |
-			 ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT));
-    ReadFile(hin, line, sizeof(line) - 1, &i, NULL);
-    SetConsoleMode(hin, savemode);
-
-    if (line[0] != '\0' && line[0] != '\r' && line[0] != '\n') {
-	if (line[0] == 'y' || line[0] == 'Y')
-	    store_host_key(host, port, keytype, keystr);
-    } else {
-	fprintf(stderr, abandoned);
-	exit(0);
-    }
-}
-
-/*
- * Ask whether the selected cipher is acceptable (since it was
- * below the configured 'warn' threshold).
- * cs: 0 = both ways, 1 = client->server, 2 = server->client
- */
-void askcipher(char *ciphername, int cs)
-{
-    HANDLE hin;
-    DWORD savemode, i;
-
-    static const char msg[] =
-	"The first %scipher supported by the server is\n"
-	"%s, which is below the configured warning threshold.\n"
-	"Continue with connection? (y/n) ";
-    static const char abandoned[] = "Connection abandoned.\n";
-
-    char line[32];
-
-    fprintf(stderr, msg,
-	    (cs == 0) ? "" :
-	    (cs == 1) ? "client-to-server " :
-			"server-to-client ",
-	    ciphername);
-    fflush(stderr);
-
-    hin = GetStdHandle(STD_INPUT_HANDLE);
-    GetConsoleMode(hin, &savemode);
-    SetConsoleMode(hin, (savemode | ENABLE_ECHO_INPUT |
-			 ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT));
-    ReadFile(hin, line, sizeof(line) - 1, &i, NULL);
-    SetConsoleMode(hin, savemode);
-
-    if (line[0] == 'y' || line[0] == 'Y') {
-	return;
-    } else {
-	fprintf(stderr, abandoned);
-	exit(0);
-    }
-}
-
-/*
- * Ask whether to wipe a session log file before writing to it.
- * Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
- */
-int askappend(char *filename)
-{
-    HANDLE hin;
-    DWORD savemode, i;
-
-    static const char msgtemplate[] =
-	"The session log file \"%.*s\" already exists.\n"
-	"You can overwrite it with a new session log,\n"
-	"append your session log to the end of it,\n"
-	"or disable session logging for this session.\n"
-	"Enter \"y\" to wipe the file, \"n\" to append to it,\n"
-	"or just press Return to disable logging.\n"
-	"Wipe the log file? (y/n, Return cancels logging) ";
-
-    char line[32];
-
-    fprintf(stderr, msgtemplate, FILENAME_MAX, filename);
-    fflush(stderr);
-
-    hin = GetStdHandle(STD_INPUT_HANDLE);
-    GetConsoleMode(hin, &savemode);
-    SetConsoleMode(hin, (savemode | ENABLE_ECHO_INPUT |
-			 ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT));
-    ReadFile(hin, line, sizeof(line) - 1, &i, NULL);
-    SetConsoleMode(hin, savemode);
-
-    if (line[0] == 'y' || line[0] == 'Y')
-	return 2;
-    else if (line[0] == 'n' || line[0] == 'N')
-	return 1;
-    else
-	return 0;
-}
-
-/*
- * Warn about the obsolescent key file format.
- */
-void old_keyfile_warning(void)
-{
-    static const char message[] =
-	"You are loading an SSH 2 private key which has an\n"
-	"old version of the file format. This means your key\n"
-	"file is not fully tamperproof. Future versions of\n"
-	"PuTTY may stop supporting this private key format,\n"
-	"so we recommend you convert your key to the new\n"
-	"format.\n"
-	"\n"
-	"Once the key is loaded into PuTTYgen, you can perform\n"
-	"this conversion simply by saving it again.\n";
-
-    fputs(message, stderr);
-}
-
 /*
  *  Print an error message and perform a fatal exit.
  */
@@ -1641,10 +1468,6 @@ void connection_fatal(char *fmt, ...)
     exit(1);
 }
 
-void logevent(char *string)
-{
-}
-
 void ldisc_send(char *buf, int len, int interactive)
 {
     /*
@@ -1790,57 +1613,6 @@ static void ssh_sftp_init(void)
     }
 }
 
-static char *password = NULL;
-static int get_line(const char *prompt, char *str, int maxlen, int is_pw)
-{
-    HANDLE hin, hout;
-    DWORD savemode, newmode, i;
-
-    if (password) {
-	static int tried_once = 0;
-
-	if (tried_once) {
-	    return 0;
-	} else {
-	    strncpy(str, password, maxlen);
-	    str[maxlen - 1] = '\0';
-	    tried_once = 1;
-	    return 1;
-	}
-    }
-
-    hin = GetStdHandle(STD_INPUT_HANDLE);
-    hout = GetStdHandle(STD_OUTPUT_HANDLE);
-    if (hin == INVALID_HANDLE_VALUE || hout == INVALID_HANDLE_VALUE) {
-	fprintf(stderr, "Cannot get standard input/output handles\n");
-	exit(1);
-    }
-
-    GetConsoleMode(hin, &savemode);
-    newmode = savemode | ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT;
-    if (is_pw)
-	newmode &= ~ENABLE_ECHO_INPUT;
-    else
-	newmode |= ENABLE_ECHO_INPUT;
-    SetConsoleMode(hin, newmode);
-
-    WriteFile(hout, prompt, strlen(prompt), &i, NULL);
-    ReadFile(hin, str, maxlen - 1, &i, NULL);
-
-    SetConsoleMode(hin, savemode);
-
-    if ((int) i > maxlen)
-	i = maxlen - 1;
-    else
-	i = i - 2;
-    str[i] = '\0';
-
-    if (is_pw)
-	WriteFile(hout, "\r\n", 2, &i, NULL);
-
-    return 1;
-}
-
 /*
  *  Initialize the Win$ock driver.
  */
@@ -2025,7 +1797,7 @@ int main(int argc, char *argv[])
     char *batchfile = NULL;
 
     flags = FLAG_STDERR | FLAG_INTERACTIVE;
-    ssh_get_line = &get_line;
+    ssh_get_line = &console_get_line;
     init_winsock();
     sk_init();
 
@@ -2047,12 +1819,14 @@ int main(int argc, char *argv[])
 	} else if (strcmp(argv[i], "-P") == 0 && i + 1 < argc) {
 	    portnumber = atoi(argv[++i]);
 	} else if (strcmp(argv[i], "-pw") == 0 && i + 1 < argc) {
-	    password = argv[++i];
+	    console_password = argv[++i];
 	} else if (strcmp(argv[i], "-b") == 0 && i + 1 < argc) {
 	    mode = 1;
 	    batchfile = argv[++i];
 	} else if (strcmp(argv[i], "-bc") == 0) {
 	    modeflags = modeflags | 1;
+	} else if (strcmp(argv[i], "-batch") == 0) {
+	    console_batch_mode = TRUE;
 	} else if (strcmp(argv[i], "-be") == 0) {
 	    modeflags = modeflags | 2;
 	} else if (strcmp(argv[i], "--") == 0) {