Merge remote-tracking branch 'refs/remotes/origin/L1'

Author: dkulwin

.gitignore

@@ -239,9 +239,18 @@ ssh_host_rsa_key
 ssh_host_rsa_key
 ssh_host_rsa_key
 ssh_host_dsa_key
+ssh_host_dsa_key.pub
 ssh_host_ecdsa_key.pub
+ssh_host_ecdsa_key
+ssh_host_ed25519_key
+ssh_host_ed25519_key.pub
 ssh_host_rsa_key.pub
 id_rsa.pub
+id_rsa
+id_dsa.pub
+id_dsa
+is_rsa
+is_rsa.pub
 regress/t10.out.pub
 regress/t12.out.pub
 regress/t6.out1
@@ -263,4 +272,7 @@ regress/t7.out.pub
 regress/t6.out2
 config.h
 configure
-config.h
+config.h
+
+#temp key files
+d2utmpa*

Makefile.in

@@ -87,7 +87,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
 	msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
 	ssh-pkcs11.o smult_curve25519_ref.o \
 	poly1305.o chacha.o cipher-chachapoly.o \
-	ssh-ed25519.o digest-openssl.o digest-libc.o hmac.o \
+	ssh-ed25519.o digest-libc.o hmac.o \
 	sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \
 	kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
 	kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \

README.md

@@ -1,2 +1,7 @@
 # OpenSSH
 Win32 port of OpenSSH
+
+Look at the [wiki](https://github.com/PowerShell/Win32-OpenSSH/wiki) for help
+First release announcement is here:
+OpenSSH for Windows Update - Windows PowerShell Blog - Site Home - MSDN Blogs
+http://blogs.msdn.com/b/powershell/archive/2015/10/19/openssh-for-windows-update.aspx

channels.c

@@ -1685,6 +1685,10 @@ channel_handle_rfd(Channel *c, fd_set *readset, fd_set *writeset)
 	if (c->rfd != -1 && (force || FD_ISSET(c->rfd, readset))) {
 		errno = 0;
 		len = read(c->rfd, buf, sizeof(buf));
+		#ifdef WIN32_FIXME
+		if (len == 0)
+			return 1; // in Win32 console read, there may be no data, but is ok
+		#endif
 		if (len < 0 && (errno == EINTR ||
 		    ((errno == EAGAIN || errno == EWOULDBLOCK) && !force)))
 			return 1;
@@ -2395,9 +2399,7 @@ channel_output_poll(void)
 		}
 	}
 }
-#ifdef WIN32_FIXME
-int lftocrlf = 0;
-#endif
+
 /* -- protocol input */
 
 /* ARGSUSED */
@@ -2462,13 +2464,25 @@ channel_input_data(int type, u_int32_t seq, void *ctxt)
 		#else
 		if ( c->client_tty )
 			telProcessNetwork ( data, data_len ); // run it by ANSI engine if it is the ssh client
-		else
-			buffer_append(&c->output, data, data_len); // it is the sshd server, so pass it on
-		if ( c->isatty ) {
-			buffer_append(&c->input, data, data_len); // we echo the data if it is sshd server and pty interactive mode
-			if ( (data_len ==1) && (data[0] == '\b') )
-				buffer_append(&c->input, " \b", 2); // for backspace, we need to send space and another backspace for visual erase
+		else {
+				if  ( ( c->isatty) && (data_len ==1) && (data[0] == '\003') ) {
+						/* send control-c to the shell process */
+						if ( GenerateConsoleCtrlEvent ( CTRL_C_EVENT, 0 ) ) {
+						}
+						else {
+							debug3("GenerateConsoleCtrlEvent failed with %d\n",GetLastError());
+						}
+				}
+				else {
+					buffer_append(&c->output, data, data_len); // it is the sshd server, so pass it on
+					if ( c->isatty ) {  // we echo the data if it is sshd server and pty interactive mode
+						buffer_append(&c->input, data, data_len);
+						if ( (data_len ==1) && (data[0] == '\b') )
+							buffer_append(&c->input, " \b", 2); // for backspace, we need to send space and another backspace for visual erase
+					}
+				}
 		}
+
 		#endif
 	}
 	packet_check_eom();
@@ -3913,10 +3927,11 @@ channel_connect_to_path(const char *path, char *ctype, char *rname)
 	return connect_to(path, PORT_STREAMLOCAL, ctype, rname);
 }
 
+#ifndef WIN32_FIXME
 void
 channel_send_window_changes(void)
 {
-#ifndef WIN32_FIXME
+
 	u_int i;
 	struct winsize ws;
 
@@ -3933,9 +3948,30 @@ channel_send_window_changes(void)
 		packet_put_int((u_int)ws.ws_ypixel);
 		packet_send();
 	}
-#endif
 }
 
+#else // WIN32_FIXME
+void
+channel_send_window_changes(int col, int row, int xpixel, int ypixel)
+{
+	u_int i;
+	struct winsize ws;
+
+	for (i = 0; i < channels_alloc; i++) {
+		if (channels[i] == NULL || !channels[i]->client_tty ||
+		    channels[i]->type != SSH_CHANNEL_OPEN)
+			continue;
+		channel_request_start(i, "window-change", 0);
+		packet_put_int((u_int)col);
+		packet_put_int((u_int)row);
+		packet_put_int((u_int)xpixel);
+		packet_put_int((u_int)ypixel);
+		packet_send();
+	}
+}
+#endif
+
+
 /* -- X11 forwarding */
 
 /*

channels.h

@@ -226,7 +226,12 @@ void	 channel_register_status_confirm(int, channel_confirm_cb *,
     channel_confirm_abandon_cb *, void *);
 void	 channel_cancel_cleanup(int);
 int	 channel_close_fd(int *);
+#ifndef WIN32_FIXME
 void	 channel_send_window_changes(void);
+#else
+void channel_send_window_changes(int, int, int, int);
+#endif
+
 
 /* protocol handler */
 

clientloop.c

@@ -119,6 +119,12 @@
 #include <sys/stat.h>
 
 #define isatty(a) WSHELPisatty(a)
+
+// Windows Console screen size change related
+extern int ScreenX;
+extern int ScrollBottom;
+int win_received_window_change_signal = 1;
+
 #endif
 
 /* import options */
@@ -162,7 +168,10 @@ static int escape_pending1;	/* Last character was an escape (proto1 only) */
 static int last_was_cr;		/* Last character was a newline. */
 static int exit_status;		/* Used to store the command exit status. */
 static int stdin_eof;		/* EOF has been encountered on stderr. */
-static Buffer stdin_buffer;	/* Buffer for stdin data. */
+#ifndef WIN32_FIXME
+static
+#endif
+Buffer stdin_buffer;	/* Buffer for stdin data. */
 static Buffer stdout_buffer;	/* Buffer for stdout data. */
 static Buffer stderr_buffer;	/* Buffer for stderr data. */
 static u_int buffer_high;	/* Soft max buffer size. */
@@ -563,6 +572,25 @@ client_check_window_change(void)
 		packet_put_int((u_int)ws.ws_ypixel);
 		packet_send();
 	}
+#else
+
+	if (! win_received_window_change_signal)
+		return;
+	/** XXX race */
+	win_received_window_change_signal = 0;
+
+	debug2("client_check_window_change: changed");
+
+	if (compat20) {
+		channel_send_window_changes(ScreenX, ScrollBottom, 640, 480);
+	} else {
+		packet_start(SSH_CMSG_WINDOW_SIZE);
+		packet_put_int((u_int)ScreenX);
+		packet_put_int((u_int)ScrollBottom);
+		packet_put_int((u_int)640);
+		packet_put_int((u_int)480);
+		packet_send();
+	}
 #endif /* !WIN32_FIXME */
 }
 
@@ -1320,14 +1348,14 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
 		 * and append it to the buffer.
 		 */
 		last_was_cr = (ch == '\r' || ch == '\n');
-		#ifdef WIN32_FIXME
-		extern int lftocrlf ; // defined in channels.c file's channel_input_data() function for now
-		if ( (lftocrlf == 1) && ( ch == '\n') ) {
+		//#ifdef WIN32_FIXME
+		//extern int lftocrlf ; // defined in channels.c file's channel_input_data() function for now
+		//if ( (lftocrlf == 1) && ( ch == '\n') ) {
 			// add a \r before \n if sshd server sent us ESC[20h during initial tty mode setting
-			buffer_put_char(bin, '\r');
-			bytes++;
-		}
-		#endif
+			//buffer_put_char(bin, '\r');
+			//bytes++;
+		//}
+		//#endif
 		buffer_put_char(bin, ch);
 		bytes++;
 	}
@@ -2571,11 +2599,11 @@ client_session2_setup(int id, int want_tty, int want_subsystem,
 		tty_make_modes(-1, tiop);
 
 #else
-		packet_put_cstring(term != NULL ? term : "");
-		packet_put_int((u_int) 80 /*ws.ws_col*/);
-		packet_put_int((u_int) 25 /*ws.ws_row*/);
-		packet_put_int((u_int) 640 /*ws.ws_xpixel*/);
-		packet_put_int((u_int) 480 /*ws.ws_ypixel*/);
+		packet_put_cstring(term != NULL ? term : "vt220");
+		packet_put_int((u_int) ScreenX);
+		packet_put_int((u_int) ScrollBottom);
+		packet_put_int((u_int) 640);
+		packet_put_int((u_int) 480);
 		tty_make_modes(-1, NULL);
 #endif /* else !WIN32_FIXME */
 		packet_send();

contrib/win32/win32compat/Makefile.in

@@ -19,11 +19,12 @@ LDFLAGS=-L. @LDFLAGS@ -L/lib/win32api
 
 WIN32COMPATFILES = daemon.o gettimeofday.o homedirhelp.o pwd.o sfds.o \
 	socket.o startupneeds.o strcasecmp.o syslog.o lsalogon.o lsastring.o \
-	stringhelp.o deskright.o win32auth.o kerberos.o cng_cipher.o ansiprsr.o console.o tnnet.o
+	stringhelp.o deskright.o win32auth.o kerberos.o cng_cipher.o ansiprsr.o \
+	console.o tnnet.o conio.o tncon.o
 
 WIN32COMPATLIB=@LIBWIN32COMPAT@
 
-CNGFILES=cng_cipher.o
+CNGFILES=cng_cipher.o cng_digest.o
 
 
 .c.o:
@@ -44,6 +45,6 @@ distclean: clean
 
 $(WIN32COMPATFILES): ../../../config.h
 
-$(WIN32COMPATLIB): $(WIN32COMPATFILES)
-	$(AR) rv $@ $(WIN32COMPATFILES)
+$(WIN32COMPATLIB): $(WIN32COMPATFILES) $(CNGFILES)
+	$(AR) rv $@ $(WIN32COMPATFILES) $(CNGFILES)
 	$(RANLIB) $@

contrib/win32/win32compat/ansiprsr.c

@@ -1,17 +1,36 @@
-/* ansiprsr.c
- * Author: Pragma Systems, Inc. <www.pragmasys.com>
- * Contribution by Pragma Systems, Inc. for Microsoft openssh win32 port
- * Copyright (c) 2011, 2015 Pragma Systems, Inc.
+/*
+ * Author: Microsoft Corp.
+ *
+ * Copyright (c) 2015 Microsoft Corp.
  * All rights reserved
- * 
- * ANSI Parser to run on Win32 based operating systems.
+ *
+ * Microsoft openssh win32 port
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/* ansiprsr.c
+ * 
+ * ANSI Parser to run on Win32 based operating systems.
  *
- * 1. Redistributions of source code must retain the above copyright notice.
- * 2. Binaries produced provide no direct or implied warranties or any
- *    guarantee of performance or suitability.
  */
 
 #include <stdlib.h>
@@ -32,7 +51,6 @@
 // items used from other modules
 int NetWriteString(char* pszString, size_t cbString);
 TelParams Parameters;
-extern int lftocrlf;
 
 extern int ScreenX;
 extern  int ScreenY;
@@ -388,12 +406,10 @@ void ConSetExtendedMode(int iFunction, BOOL bEnable)
 		case 20:   // LNM Mode CSI 20h
 			if (bEnable){
 				VTMode |= MODE_LNM;
-				Parameters.nReceiveCRLF = ENUM_LF;
-				lftocrlf = 1;
+				Parameters.nReceiveCRLF = ENUM_CRLF;
 			}else{
 				VTMode &= ~MODE_LNM;
-				Parameters.nReceiveCRLF = ENUM_CRLF;
-				lftocrlf = 0;
+				Parameters.nReceiveCRLF = ENUM_LF;
 			}
 			break;
 		case 25: