diff -Nru mosh-1.2.2/COPYING.iOS mosh-1.2.4a/COPYING.iOS --- mosh-1.2.2/COPYING.iOS 1970-01-01 00:00:00.000000000 +0000 +++ mosh-1.2.4a/COPYING.iOS 2013-03-27 22:36:03.000000000 +0000 @@ -0,0 +1,11 @@ +The Mosh developers are aware that the terms of service that apply to +apps distributed via Apple's App Store services may conflict with +rights granted under Mosh's license, the GNU General Public License, +version 3. The Mosh copyright holders do not wish this conflict to +prevent the otherwise-compliant distribution of Mosh-derived apps via +the App Store. Therefore, we have committed not to pursue any license +violation that results solely from the conflict between the GPLv3 and +the Apple App Store terms of service. In other words, as long as you +comply with the GPL in all other respects, including its requirements +to provide users with source code and the text of the license, we will +not object to your distribution of Mosh through the App Store. diff -Nru mosh-1.2.2/ChangeLog mosh-1.2.4a/ChangeLog --- mosh-1.2.2/ChangeLog 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/ChangeLog 2013-03-27 22:36:03.000000000 +0000 @@ -1,3 +1,62 @@ +2013-03-27 Keith Winstein + + * Version 1.2.4 released. + + * New features: + * Support port ranges with -p LOWPORT:HIGHPORT (Luke Mewburn) + * Ctrl-^ Ctrl-Z suspends mosh client (Nikolai Zeldovich) + * mm:ss display of lost-contact times (Kevin Ballard) + * Show infobar with control chars when Ctrl-^ is typed + * Put terminal in altscreen mode (Anders Kaseorg) + * Tell automake/Debian pkg about our checks (Anders Kaseorg) + + * Platform support: + * OS X: Script to build a universal package (Peter Iannucci) + * FreeBSD: Fix build problems (Jimmy Olgeni) + * AIX: port by Anton Lundin + * Solaris with system curses (Anton Lundin) + * Cygwin and others: eliminate use of IO::Pty (Anton Lundin) + + * Bug fixes: + * Fix bug (introduced in 1.2.3) where server stays around + if process quits while client is detached + * Clean up spurious entries from detached sessions warning + * Fix freeze when connectivity is one-directional for hours + (reported by Axel Beckert) + * Don't wipe title until a new one is set (sqweek) + * Eliminate memory leaks and cppcheck warnings (Anders Kaseorg) + +2012-10-19 Keith Winstein + + * Version 1.2.3 released. + + * Security improvements: + * Use OpenSSL AES implementation + * Update AES-OCB implementation (Keegan McAllister) + * Don't let bad server dictate IP (Felix Groebert) + + * New features: + * Client hops ports to survive challenging client-side firewall + * Server stops sending to save client power (Daniel Drown) + * Set DiffServ code point and ECN-capable (Dave Täht) + * Slow down if explicit congestion notification received + * Warn about unattached Mosh sessions on login + * Compatible with KDE konsole (uses BEL to terminate OSC) + * Improved heuristic about color of predicted characters + + * Bug fixes: + * Improved performance on systems with expensive time + * No longer choke on "ffff::" address for hosts with IPv6 + * More conservative MTU and datagram sizing + + * Platform support: + * Build on Solaris and IllumOS (Timo Sirainen, Ira Cooper) + * Build on ARM with gcc 4.7 (Alexander Chernyakhovsky) + + * Licensing changes: + * Allow distribution on Apple App Stores + * Allow linking with OpenSSL + 2012-06-12 Keith Winstein * Version 1.2.2 released. diff -Nru mosh-1.2.2/Makefile.am mosh-1.2.4a/Makefile.am --- mosh-1.2.2/Makefile.am 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/Makefile.am 2013-03-27 22:36:03.000000000 +0000 @@ -1,3 +1,3 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src scripts man conf -EXTRA_DIST = autogen.sh ocb-license.html README.md +EXTRA_DIST = autogen.sh ocb-license.html README.md COPYING.iOS diff -Nru mosh-1.2.2/THANKS mosh-1.2.4a/THANKS --- mosh-1.2.2/THANKS 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/THANKS 2013-03-27 22:36:03.000000000 +0000 @@ -48,3 +48,21 @@ * Ryan Steinmetz * Jay Freeman + +* Dave Täht + +* Larry Doolittle + +* Daniel Drown + +* Timo Juhani Lindfors + +* Timo Sirainen + +* Ira Cooper + +* Felix Gröbert + +* Luke Mewburn + +* Anton Lundin diff -Nru mosh-1.2.2/configure.ac mosh-1.2.4a/configure.ac --- mosh-1.2.2/configure.ac 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/configure.ac 2013-03-27 22:36:03.000000000 +0000 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.61]) -AC_INIT([mosh], [1.2.2], [mosh-devel@mit.edu]) +AC_INIT([mosh], [1.2.4a], [mosh-devel@mit.edu]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_SRCDIR([src/frontend/mosh-client.cc]) @@ -134,12 +134,6 @@ [build_server="yes"]) AM_CONDITIONAL([BUILD_SERVER], [test x"$build_server" != xno]) -AC_ARG_ENABLE([tests], - [AS_HELP_STRING([--enable-tests], [Build tests @<:@no@:>@])], - [build_tests="$enableval"], - [build_tests="no"]) -AM_CONDITIONAL([BUILD_TESTS], [test x"$build_tests" != xno]) - AC_ARG_ENABLE([examples], [AS_HELP_STRING([--enable-examples], [Build the miscellaneous programs in src/examples @<:@no@:>@])], [build_examples="$enableval"], @@ -172,11 +166,17 @@ AC_SEARCH_LIBS([compress], [z], , [AC_MSG_ERROR([Unable to find zlib.])]) +AC_SEARCH_LIBS([socket], [socket]) +AC_SEARCH_LIBS([inet_addr], [nsl]) + # Checks for header files. AC_CHECK_HEADERS([arpa/inet.h fcntl.h langinfo.h limits.h locale.h netinet/in.h stddef.h stdint.h inttypes.h stdlib.h string.h sys/ioctl.h sys/resource.h sys/socket.h sys/stat.h sys/time.h termios.h unistd.h wchar.h wctype.h], [], [AC_MSG_ERROR([Missing required header file.])]) AC_CHECK_HEADERS([pty.h util.h libutil.h paths.h]) AC_CHECK_HEADERS([endian.h sys/endian.h]) +AC_CHECK_HEADERS([utmpx.h]) +AC_CHECK_HEADERS([termio.h]) +AC_CHECK_HEADERS([sys/uio.h]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL @@ -195,23 +195,51 @@ # Checks for library functions. AC_FUNC_FORK AC_FUNC_MBRTOWC -AC_CHECK_FUNCS([gettimeofday setrlimit inet_ntoa iswprint memchr memset nl_langinfo posix_memalign setenv setlocale sigaction socket strchr strdup strerror strtol wcwidth]) +AC_CHECK_FUNCS([gettimeofday setrlimit inet_ntoa iswprint memchr memset nl_langinfo posix_memalign setenv setlocale sigaction socket strchr strdup strncasecmp strtok strerror strtol wcwidth cfmakeraw]) AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [Define if clock_gettime is available.])]) -PKG_CHECK_MODULES([TINFO], [tinfo], , - [PKG_CHECK_MODULES([TINFO], [ncurses], , - [AX_CHECK_LIBRARY([TINFO], [curses.h], [tinfo], - [AC_SUBST([TINFO_CFLAGS], ["$TINFO_CPPFLAGS"]) - AC_SUBST([TINFO_LIBS], ["$TINFO_LDFLAGS -ltinfo"])], - [AX_CHECK_LIBRARY([NCURSES], [curses.h], [ncurses], - [AC_SUBST([TINFO_CFLAGS], ["$TINFO_CPPFLAGS"]) - AC_SUBST([TINFO_LIBS], ["$TINFO_LDFLAGS -lncurses"])], - [AC_SUBST([CPPFLAGS], ["$CPPFLAGS -I/usr/include/ncurses"]) - AX_CHECK_LIBRARY([CYGWINNCURSES], [term.h], [ncurses], - [AC_SUBST([TINFO_CFLAGS], ["$TINFO_CPPFLAGS -I/usr/include/ncurses"]) - AC_SUBST([TINFO_LIBS], ["$TINFO_LDFLAGS -lncurses"])], - [AC_MSG_ERROR([Unable to find libtinfo or libncurses.])])])])])]) +PKG_CHECK_MODULES([OPENSSL], [openssl]) + +# Start by trying to find the needed tinfo parts by pkg-config +PKG_CHECK_MODULES([TINFO], [tinfo], + [AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if is present])], + [PKG_CHECK_MODULES([TINFO], [ncurses], + [AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if is present])], + [AX_CHECK_LIBRARY([TINFO], [curses.h], [tinfo], + [AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if is present]) + AC_SUBST([TINFO_CFLAGS], ["$TINFO_CPPFLAGS"]) + AC_SUBST([TINFO_LIBS], ["$TINFO_LDFLAGS -ltinfo"])],)])]) + +# Then try to find it in a specific install dir +AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where curses is installed]), + [if test $withval != yes; then + cv_curses=$withval + fi + if test x$cv_curses != x/usr; then + CURSES_LDFLAGS="-L${cv_curses}/lib" + CURSES_CPPFLAGS="-I${cv_curses}/include" + fi]) + +if test "x$ax_cv_have_TINFO" = xno ; then + # save away old LDFLAGS/CPPFLAGS and check for curses with cv_curses + old_LDFLAGS="$LDFLAGS" + old_CPPFLAGS="$CPPFLAGS" + LDFLAGS="$LDFLAGS $CURSES_LDFLAGS" + CPPFLAGS="$LDFLAGS $CURSES_CPPFLAGS" + + AX_WITH_CURSES + # restore old LDFLAGS/CPPFLAGS + LDFLAGS="$old_LDFLAGS" + CPPFLAGS="$old_CPPFLAGS" + + if test "x$ax_cv_curses_which" = xno ; then + AC_MSG_ERROR([requires either tinfo, NcursesW or Ncurses library]) + else + AC_SUBST([TINFO_LIBS], ["$CURSES_LDFLAGS $CURSES_LIB"]) + AC_SUBST([TINFO_CFLAGS], ["$CURSES_CPPFLAGS"]) + fi +fi AC_CHECK_DECL([forkpty], [AC_DEFINE([FORKPTY_IN_LIBUTIL], [1], @@ -219,6 +247,12 @@ , [[#include #include ]]) +AC_CHECK_LIB([util], [forkpty], [ + AC_DEFINE([HAVE_FORKPTY],, [Define if you have forkpty().]) + LIBUTIL="-lutil" + AC_SUBST([LIBUTIL]) +]) + AC_MSG_CHECKING([whether pipe2(..., O_CLOEXEC) is supported]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define _GNU_SOURCE #include @@ -268,7 +302,12 @@ AC_CHECK_DECL([IP_MTU_DISCOVER], [AC_DEFINE([HAVE_IP_MTU_DISCOVER], [1], [Define if IP_MTU_DISCOVER is a valid sockopt.])], - , [[#include ]]) + , [[#include ]]) + +AC_CHECK_DECL([IP_RECVTOS], + [AC_DEFINE([HAVE_IP_RECVTOS], [1], + [Define if IP_RECVTOS is a valid sockopt.])], + , [[#include ]]) AC_CHECK_DECL([__STDC_ISO_10646__], [], @@ -301,3 +340,11 @@ conf/Makefile ]) AC_OUTPUT + +AC_MSG_NOTICE([ === Configuration results ===]) +AC_MSG_NOTICE([Version: $PACKAGE_VERSION]) +AC_MSG_NOTICE([c++ compiler: $CXX]) +AC_MSG_NOTICE([Warning CXXFLAGS: $WARNING_CXXFLAGS]) +AC_MSG_NOTICE([Picky CXXFLAGS: $PICKY_CXXFLAGS]) +AC_MSG_NOTICE([Harden CFLAGS: $HARDEN_CFLAGS]) +AC_MSG_NOTICE([ =============================]) diff -Nru mosh-1.2.2/debian/changelog mosh-1.2.4a/debian/changelog --- mosh-1.2.2/debian/changelog 2012-08-26 05:50:33.000000000 +0000 +++ mosh-1.2.4a/debian/changelog 2013-07-27 13:27:56.000000000 +0000 @@ -1,8 +1,90 @@ -mosh (1.2.2-1~ubuntu12.04.1) precise-backports; urgency=low +mosh (1.2.4a-1~ubuntu12.04.1) precise-backports; urgency=low - * No-change backport to precise (LP: #1041010) + * No-change backport to precise (LP: #1205640) - -- Micah Gersten Sun, 26 Aug 2012 00:50:33 -0500 + -- Scott Kitterman Sat, 27 Jul 2013 09:27:56 -0400 + +mosh (1.2.4a-1) unstable; urgency=low + + * Eliminate redundant ocb.cc test (fixes build warning on ARM/MIPS/s390) + * Add explicit cast to int (fixes build warning on older gcc) + + -- Keith Winstein Wed, 27 Mar 2013 18:32:33 -0400 + +mosh (1.2.4-1) unstable; urgency=low + + * Version 1.2.4 released. + + -- Keith Winstein Wed, 27 Mar 2013 00:17:39 -0400 + +mosh (1.2.3.95rc1-1) unstable; urgency=low + + * Version 1.2.4 release candidate + + * New features: + * Support port ranges with -p LOWPORT:HIGHPORT (Luke Mewburn) + * Ctrl-^ Ctrl-Z suspends mosh client (Nikolai Zeldovich) + * mm:ss display of lost-contact times (Kevin Ballard) + * Show infobar with control chars when Ctrl-^ is typed + * Put terminal in altscreen mode (Anders Kaseorg) + * Tell automake/Debian pkg about our checks (Anders Kaseorg) + + * Platform support: + * OS X: Script to build a universal package (Peter Iannucci) + * FreeBSD: Fix build problems (Jimmy Olgeni) + * AIX: port by Anton Lundin + * Solaris with system curses (Anton Lundin) + * Cygwin and others: eliminate use of IO::Pty (Anton Lundin) + + * Bug fixes: + * Fix bug (introduced in 1.2.3) where server stays around + if process quits while client is detached + * Clean up spurious entries from detached sessions warning + * Fix freeze when connectivity is one-directional for hours + (reported by Axel Beckert) + * Don't wipe title until a new one is set (sqweek) + * Eliminate memory leaks and cppcheck warnings (Anders Kaseorg) + + -- Keith Winstein Sun, 10 Mar 2013 17:46:37 -0400 + +mosh (1.2.3-1) unstable; urgency=low + + * Version 1.2.3 released. + + * Update AES-OCB implementation (Keegan McAllister) + + * More conservative MTU and datagram sizing + + -- Keith Winstein Fri, 19 Oct 2012 15:21:54 -0400 + +mosh (1.2.2.95rc1-1) unstable; urgency=low + + * Security improvements: + * Use OpenSSL AES implementation + * Don't let bad server dictate IP (Felix Groebert) + + * New features: + * Client hops ports to survive challenging client-side firewall + * Server stops sending to save client power (Daniel Drown) + * Set DiffServ code point and ECN-capable (Dave Täht) + * Slow down if explicit congestion notification received + * Warn about unattached Mosh sessions on login + * Compatible with KDE konsole (uses BEL to terminate OSC) + * Improved heuristic about color of predicted characters + + * Bug fixes: + * Improved performance on systems with expensive time + * No longer choke on "ffff::" address for hosts with IPv6 + + * Platform support: + * Build on Solaris and IllumOS (Timo Sirainen, Ira Cooper) + * Build on ARM with gcc 4.7 (Alexander Chernyakhovsky) + + * Licensing changes: + * Allow distribution on Apple App Stores + * Allow linking with OpenSSL + + -- Keith Winstein Fri, 05 Oct 2012 19:45:51 -0400 mosh (1.2.2-1) unstable; urgency=low diff -Nru mosh-1.2.2/debian/control mosh-1.2.4a/debian/control --- mosh-1.2.2/debian/control 2012-06-12 20:22:58.000000000 +0000 +++ mosh-1.2.4a/debian/control 2013-03-27 05:08:55.000000000 +0000 @@ -3,15 +3,15 @@ Priority: optional Maintainer: Keith Winstein DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7.0.50), autotools-dev, protobuf-compiler, libprotobuf-dev, dh-autoreconf, pkg-config, libutempter-dev, zlib1g-dev, libncurses5-dev -Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 7.0.50), autotools-dev, protobuf-compiler, libprotobuf-dev, dh-autoreconf, pkg-config, libutempter-dev, zlib1g-dev, libncurses5-dev, libssl-dev +Standards-Version: 3.9.4.0 Homepage: http://mosh.mit.edu Vcs-Git: git://github.com/keithw/mosh.git -Vcs-Browser: http://github.com/keithw/mosh +Vcs-Browser: https://github.com/keithw/mosh Package: mosh Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libio-pty-perl, openssh-client +Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client Description: Mobile shell that supports roaming and intelligent local echo Mosh is a remote terminal application that supports: - intermittent network connectivity, diff -Nru mosh-1.2.2/debian/copyright mosh-1.2.4a/debian/copyright --- mosh-1.2.2/debian/copyright 2012-05-23 15:04:35.000000000 +0000 +++ mosh-1.2.4a/debian/copyright 2012-10-06 00:22:28.000000000 +0000 @@ -4,7 +4,7 @@ Files: * Copyright: 2012 Keith Winstein -License: GPL-3+ +License: GPL-3+ with OpenSSL exception This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or @@ -18,6 +18,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . . + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + . + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. + . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". @@ -133,44 +147,3 @@ warranty of any kind. Use at your own risk. . Comments are welcome: Ted Krovetz . - -Files: src/crypto/rijndael-alg-fst.* -Copyright: none -License: public-domain - @author Vincent Rijmen - @author Antoon Bosselaers - @author Paulo Barreto - . - This code is hereby placed in the public domain. - . - THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 AUTHORS OR CONTRIBUTORS 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. - -Files: src/crypto/base64.* -Copyright: 1999-2001, 2004-2006, 2009-2011 Free Software Foundation, Inc. -License: GPL3+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff -Nru mosh-1.2.2/debian/watch mosh-1.2.4a/debian/watch --- mosh-1.2.2/debian/watch 2012-03-22 03:07:07.000000000 +0000 +++ mosh-1.2.4a/debian/watch 2013-03-27 05:08:55.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -https://github.com/keithw/mosh/tags /keithw/mosh/tarball/mosh-(.+) +https://github.com/keithw/mosh/tags .*/mosh-(\d[\d\.]+)\.tar\.gz diff -Nru mosh-1.2.2/fedora/mosh.spec mosh-1.2.4a/fedora/mosh.spec --- mosh-1.2.2/fedora/mosh.spec 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/fedora/mosh.spec 2013-03-27 22:36:03.000000000 +0000 @@ -1,6 +1,6 @@ Name: mosh -Version: 1.2 -Release: 2%{?dist} +Version: 1.2.4 +Release: 1%{?dist} Summary: Mobile shell that supports roaming and intelligent local echo License: GPLv3+ @@ -13,8 +13,9 @@ BuildRequires: libutempter-devel BuildRequires: zlib-devel BuildRequires: ncurses-devel +BuildRequires: openssl-devel Requires: openssh-clients -Requires: perl-IO-Tty +Requires: openssl %description Mosh is a remote terminal application that supports: @@ -50,6 +51,24 @@ %changelog +* Wed Mar 27 2013 Alexander Chernyakhovsky - 1.2.4-1 +- Update to mosh 1.2.4 + +* Sun Mar 10 2013 Alexander Chernyakhovsky - 1.2.3-3 +- Rebuilt for Protobuf API change from 2.4.1 to 2.5.0 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Oct 19 2012 Alexander Chernyakhovsky - 1.2.3-1 +- Update to mosh 1.2.3 + +* Fri Jul 20 2012 Fedora Release Engineering - 1.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jun 13 2012 Alexander Chernyakhovsky - 1.2.2-1 +- Update to mosh 1.2.2 + * Sat Apr 28 2012 Alexander Chernyakhovsky - 1.2-2 - Add -g and -O2 CFLAGS diff -Nru mosh-1.2.2/m4/ax_with_curses.m4 mosh-1.2.4a/m4/ax_with_curses.m4 --- mosh-1.2.2/m4/ax_with_curses.m4 1970-01-01 00:00:00.000000000 +0000 +++ mosh-1.2.4a/m4/ax_with_curses.m4 2013-03-27 22:36:03.000000000 +0000 @@ -0,0 +1,518 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_with_curses.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_WITH_CURSES +# +# DESCRIPTION +# +# This macro checks whether a SysV or X/Open-compatible Curses library is +# present, along with the associated header file. The NcursesW +# (wide-character) library is searched for first, followed by Ncurses, +# then the system-default plain Curses. The first library found is the +# one returned. +# +# The following options are understood: --with-ncursesw, --with-ncurses, +# --without-ncursesw, --without-ncurses. The "--with" options force the +# macro to use that particular library, terminating with an error if not +# found. The "--without" options simply skip the check for that library. +# The effect on the search pattern is: +# +# (no options) - NcursesW, Ncurses, Curses +# --with-ncurses --with-ncursesw - NcursesW only [*] +# --without-ncurses --with-ncursesw - NcursesW only [*] +# --with-ncursesw - NcursesW only [*] +# --with-ncurses --without-ncursesw - Ncurses only [*] +# --with-ncurses - NcursesW, Ncurses [**] +# --without-ncurses --without-ncursesw - Curses only +# --without-ncursesw - Ncurses, Curses +# --without-ncurses - NcursesW, Curses +# +# [*] If the library is not found, abort the configure script. +# +# [**] If the second library (Ncurses) is not found, abort configure. +# +# The following preprocessor symbols may be defined by this macro if the +# appropriate conditions are met: +# +# HAVE_CURSES - if any SysV or X/Open Curses library found +# HAVE_CURSES_ENHANCED - if library supports X/Open Enhanced functions +# HAVE_CURSES_COLOR - if library supports color (enhanced functions) +# HAVE_CURSES_OBSOLETE - if library supports certain obsolete features +# HAVE_NCURSESW - if NcursesW (wide char) library is to be used +# HAVE_NCURSES - if the Ncurses library is to be used +# +# HAVE_CURSES_H - if is present and should be used +# HAVE_NCURSESW_H - if should be used +# HAVE_NCURSES_H - if should be used +# HAVE_NCURSESW_CURSES_H - if should be used +# HAVE_NCURSES_CURSES_H - if should be used +# +# (These preprocessor symbols are discussed later in this document.) +# +# The following output variable is defined by this macro; it is precious +# and may be overridden on the ./configure command line: +# +# CURSES_LIB - library to add to xxx_LDADD +# +# The library listed in CURSES_LIB is NOT added to LIBS by default. You +# need to add CURSES_LIB to the appropriate xxx_LDADD line in your +# Makefile.am. For example: +# +# prog_LDADD = @CURSES_LIB@ +# +# If CURSES_LIB is set on the configure command line (such as by running +# "./configure CURSES_LIB=-lmycurses"), then the only header searched for +# is . The user may use the CPPFLAGS precious variable to +# override the standard #include search path. If the user needs to +# specify an alternative path for a library (such as for a non-standard +# NcurseW), the user should use the LDFLAGS variable. +# +# The following shell variables may be defined by this macro: +# +# ax_cv_curses - set to "yes" if any Curses library found +# ax_cv_curses_enhanced - set to "yes" if Enhanced functions present +# ax_cv_curses_color - set to "yes" if color functions present +# ax_cv_curses_obsolete - set to "yes" if obsolete features present +# +# ax_cv_ncursesw - set to "yes" if NcursesW library found +# ax_cv_ncurses - set to "yes" if Ncurses library found +# ax_cv_plaincurses - set to "yes" if plain Curses library found +# ax_cv_curses_which - set to "ncursesw", "ncurses", "plaincurses" or "no" +# +# These variables can be used in your configure.ac to determine the level +# of support you need from the Curses library. For example, if you must +# have either Ncurses or NcursesW, you could include: +# +# AX_WITH_CURSES +# if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then +# AX_MSG_ERROR([requires either NcursesW or Ncurses library]) +# fi +# +# If any Curses library will do (but one must be present and must support +# color), you could use: +# +# AX_WITH_CURSES +# if test "x$ax_cv_curses" != xyes || test "x$ax_cv_curses_color" != xyes; then +# AC_MSG_ERROR([requires an X/Open-compatible Curses library with color]) +# fi +# +# Certain preprocessor symbols and shell variables defined by this macro +# can be used to determine various features of the Curses library. In +# particular, HAVE_CURSES and ax_cv_curses are defined if the Curses +# library found conforms to the traditional SysV and/or X/Open Base Curses +# definition. Any working Curses library conforms to this level. +# +# HAVE_CURSES_ENHANCED and ax_cv_curses_enhanced are defined if the +# library supports the X/Open Enhanced Curses definition. In particular, +# the wide-character types attr_t, cchar_t and wint_t, the functions +# wattr_set() and wget_wch() and the macros WA_NORMAL and _XOPEN_CURSES +# are checked. The Ncurses library does NOT conform to this definition, +# although NcursesW does. +# +# HAVE_CURSES_COLOR and ax_cv_curses_color are defined if the library +# supports color functions and macros such as COLOR_PAIR, A_COLOR, +# COLOR_WHITE, COLOR_RED and init_pair(). These are NOT part of the +# X/Open Base Curses definition, but are part of the Enhanced set of +# functions. The Ncurses library DOES support these functions, as does +# NcursesW. +# +# HAVE_CURSES_OBSOLETE and ax_cv_curses_obsolete are defined if the +# library supports certain features present in SysV and BSD Curses but not +# defined in the X/Open definition. In particular, the functions +# getattrs(), getcurx() and getmaxx() are checked. +# +# To use the HAVE_xxx_H preprocessor symbols, insert the following into +# your system.h (or equivalent) header file: +# +# #if defined HAVE_NCURSESW_CURSES_H +# # include +# #elif defined HAVE_NCURSESW_H +# # include +# #elif defined HAVE_NCURSES_CURSES_H +# # include +# #elif defined HAVE_NCURSES_H +# # include +# #elif defined HAVE_CURSES_H +# # include +# #else +# # error "SysV or X/Open-compatible Curses header file required" +# #endif +# +# For previous users of this macro: you should not need to change anything +# in your configure.ac or Makefile.am, as the previous (serial 10) +# semantics are still valid. However, you should update your system.h (or +# equivalent) header file to the fragment shown above. You are encouraged +# also to make use of the extended functionality provided by this version +# of AX_WITH_CURSES, as well as in the additional macros +# AX_WITH_CURSES_PANEL, AX_WITH_CURSES_MENU and AX_WITH_CURSES_FORM. +# +# LICENSE +# +# Copyright (c) 2009 Mark Pulford +# Copyright (c) 2009 Damian Pietras +# Copyright (c) 2012 Reuben Thomas +# Copyright (c) 2011 John Zaitseff +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 13 + +AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES]) +AC_DEFUN([AX_WITH_CURSES], [ + AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses]) + AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses], + [force the use of Ncurses or NcursesW])], + [], [with_ncurses=check]) + AC_ARG_WITH([ncursesw], [AS_HELP_STRING([--without-ncursesw], + [do not use NcursesW (wide character support)])], + [], [with_ncursesw=check]) + + ax_saved_LIBS=$LIBS + AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes], + [ax_with_plaincurses=no], [ax_with_plaincurses=check]) + + ax_cv_curses_which=no + + # Test for NcursesW + + AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [ + LIBS="$ax_saved_LIBS -lncursesw" + + AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [ + AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], + [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no]) + ]) + AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [ + AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library]) + ]) + + AS_IF([test "x$ax_cv_ncursesw" = xyes], [ + ax_cv_curses=yes + ax_cv_curses_which=ncursesw + CURSES_LIB="-lncursesw" + AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present]) + AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) + + AC_CACHE_CHECK([for working ncursesw/curses.h], [ax_cv_header_ncursesw_curses_h], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@define _XOPEN_SOURCE_EXTENDED 1 + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + ]])], + [ax_cv_header_ncursesw_curses_h=yes], + [ax_cv_header_ncursesw_curses_h=no]) + ]) + AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xyes], [ + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + AC_DEFINE([HAVE_NCURSESW_CURSES_H], [1], [Define to 1 if is present]) + ]) + + AC_CACHE_CHECK([for working ncursesw.h], [ax_cv_header_ncursesw_h], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@define _XOPEN_SOURCE_EXTENDED 1 + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + ]])], + [ax_cv_header_ncursesw_h=yes], + [ax_cv_header_ncursesw_h=no]) + ]) + AS_IF([test "x$ax_cv_header_ncursesw_h" = xyes], [ + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + AC_DEFINE([HAVE_NCURSESW_H], [1], [Define to 1 if is present]) + ]) + + AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h_with_ncursesw], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@define _XOPEN_SOURCE_EXTENDED 1 + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + ]])], + [ax_cv_header_ncurses_h_with_ncursesw=yes], + [ax_cv_header_ncurses_h_with_ncursesw=no]) + ]) + AS_IF([test "x$ax_cv_header_ncurses_h_with_ncursesw" = xyes], [ + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if is present]) + ]) + + AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xno && test "x$ax_cv_header_ncursesw_h" = xno && test "x$ax_cv_header_ncurses_h_with_ncursesw" = xno], [ + AC_MSG_WARN([could not find a working ncursesw/curses.h, ncursesw.h or ncurses.h]) + ]) + ]) + ]) + + # Test for Ncurses + + AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [ + LIBS="$ax_saved_LIBS -lncurses" + + AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [ + AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], + [ax_cv_ncurses=yes], [ax_cv_ncurses=no]) + ]) + AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [ + AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library]) + ]) + + AS_IF([test "x$ax_cv_ncurses" = xyes], [ + ax_cv_curses=yes + ax_cv_curses_which=ncurses + CURSES_LIB="-lncurses" + AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present]) + AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) + + AC_CACHE_CHECK([for working ncurses/curses.h], [ax_cv_header_ncurses_curses_h], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + ]])], + [ax_cv_header_ncurses_curses_h=yes], + [ax_cv_header_ncurses_curses_h=no]) + ]) + AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xyes], [ + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + AC_DEFINE([HAVE_NCURSES_CURSES_H], [1], [Define to 1 if is present]) + ]) + + AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + ]])], + [ax_cv_header_ncurses_h=yes], + [ax_cv_header_ncurses_h=no]) + ]) + AS_IF([test "x$ax_cv_header_ncurses_h" = xyes], [ + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if is present]) + ]) + + AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xno && test "x$ax_cv_header_ncurses_h" = xno], [ + AC_MSG_WARN([could not find a working ncurses/curses.h or ncurses.h]) + ]) + ]) + ]) + + # Test for plain Curses (or if CURSES_LIB was set by user) + + AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [ + AS_IF([test "x$CURSES_LIB" != x], [ + LIBS="$ax_saved_LIBS $CURSES_LIB" + ], [ + LIBS="$ax_saved_LIBS -lcurses" + ]) + + AC_CACHE_CHECK([for Curses library], [ax_cv_plaincurses], [ + AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], + [ax_cv_plaincurses=yes], [ax_cv_plaincurses=no]) + ]) + + AS_IF([test "x$ax_cv_plaincurses" = xyes], [ + ax_cv_curses=yes + ax_cv_curses_which=plaincurses + AS_IF([test "x$CURSES_LIB" = x], [ + CURSES_LIB="-lcurses" + ]) + AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) + + # Check for base conformance (and header file) + + AC_CACHE_CHECK([for working curses.h], [ax_cv_header_curses_h], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + initscr(); + ]])], + [ax_cv_header_curses_h=yes], + [ax_cv_header_curses_h=no]) + ]) + AS_IF([test "x$ax_cv_header_curses_h" = xyes], [ + AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if is present]) + + # Check for X/Open Enhanced conformance + + AC_CACHE_CHECK([for X/Open Enhanced Curses conformance], [ax_cv_plaincurses_enhanced], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@define _XOPEN_SOURCE_EXTENDED 1 + @%:@include + @%:@ifndef _XOPEN_CURSES + @%:@error "this Curses library is not enhanced" + "this Curses library is not enhanced" + @%:@endif + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + ]])], + [ax_cv_plaincurses_enhanced=yes], + [ax_cv_plaincurses_enhanced=no]) + ]) + AS_IF([test "x$ax_cv_plaincurses_enhanced" = xyes], [ + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + ]) + + # Check for color functions + + AC_CACHE_CHECK([for Curses color functions], [ax_cv_plaincurses_color], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@define _XOPEN_SOURCE_EXTENDED 1 + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + ]])], + [ax_cv_plaincurses_color=yes], + [ax_cv_plaincurses_color=no]) + ]) + AS_IF([test "x$ax_cv_plaincurses_color" = xyes], [ + ax_cv_curses_color=yes + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + ]) + + # Check for obsolete functions + + AC_CACHE_CHECK([for obsolete Curses functions], [ax_cv_plaincurses_obsolete], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + ]])], + [ax_cv_plaincurses_obsolete=yes], + [ax_cv_plaincurses_obsolete=no]) + ]) + AS_IF([test "x$ax_cv_plaincurses_obsolete" = xyes], [ + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + ]) + ]) + + AS_IF([test "x$ax_cv_header_curses_h" = xno], [ + AC_MSG_WARN([could not find a working curses.h]) + ]) + ]) + ]) + + AS_IF([test "x$ax_cv_curses" != xyes], [ax_cv_curses=no]) + AS_IF([test "x$ax_cv_curses_enhanced" != xyes], [ax_cv_curses_enhanced=no]) + AS_IF([test "x$ax_cv_curses_color" != xyes], [ax_cv_curses_color=no]) + AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no]) + + LIBS=$ax_saved_LIBS +])dnl diff -Nru mosh-1.2.2/macosx/build.sh mosh-1.2.4a/macosx/build.sh --- mosh-1.2.2/macosx/build.sh 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/macosx/build.sh 2013-03-27 22:36:03.000000000 +0000 @@ -1,22 +1,78 @@ #!/bin/bash +set -e + echo "Building into prefix..." -mkdir -p prefix +PREFIX=`pwd`/prefix +PREFIX_i386=`pwd`/prefix_i386 +PREFIX_x86_64=`pwd`/prefix_x86_64 +#PREFIX_ppc=`pwd`/prefix_ppc +#PREFIX_ppc64=`pwd`/prefix_ppc64 + +mkdir -p "$PREFIX" +mkdir -p "$PREFIX_i386" +mkdir -p "$PREFIX_x86_64" +#mkdir -p "$PREFIX_ppc" +#mkdir -p "$PREFIX_ppc64" pushd .. > /dev/null if [ ! -f configure ]; then echo "Running autogen." - ./autogen.sh + PATH=/opt/local/bin:$PATH ./autogen.sh fi -./configure --prefix=`pwd`/macosx/prefix +echo "Building for x86_64..." +./configure --prefix="$PREFIX_x86_64" ac_cv_poll_pty=no \ + CC="clang -arch x86_64" CPP="clang -arch x86_64 -E" CXX="clang++ -arch x86_64" \ + TINFO_LIBS=-lncurses protobuf_LIBS=/opt/local/lib/libprotobuf.a +make clean +make install -j8 +echo "Building for i386..." +./configure --prefix="$PREFIX_i386" ac_cv_poll_pty=no \ + CC="clang -arch i386" CPP="clang -arch i386 -E" CXX="clang++ -arch i386" \ + TINFO_LIBS=-lncurses protobuf_LIBS=/opt/local/lib/libprotobuf.a +make clean make install -j8 -perl -wlpi -e 's{#!/usr/bin/env perl}{#!/usr/bin/perl}' `pwd`/macosx/prefix/bin/mosh +#echo "Building for ppc..." +#./configure --prefix="$PREFIX_ppc" ac_cv_poll_pty=no \ +# --target=ppc-apple-darwin --build=i686-apple-darwin --host=ppc-apple-darwin \ +# CC="clang -arch ppc -mmacosx-version-min=10.5" CPP="clang -arch ppc -mmacosx-version-min=10.5 -E" CXX="clang++ -arch ppc -mmacosx-version-min=10.5" \ +# TINFO_LIBS=-lncurses protobuf_LIBS=/opt/local/lib/libprotobuf.a +#make clean +#make install -j8 +# +#echo "Building for ppc64..." +#./configure --prefix="$PREFIX_ppc64" ac_cv_poll_pty=no \ +# --target=ppc-apple-darwin --build=i686-apple-darwin --host=ppc-apple-darwin \ +# CC="clang -arch ppc64 -mmacosx-version-min=10.5" CPP="clang -arch ppc64 -mmacosx-version-min=10.5 -E" CXX="clang++ -arch ppc64 -mmacosx-version-min=10.5" \ +# TINFO_LIBS=-lncurses protobuf_LIBS=/opt/local/lib/libprotobuf.a +#make clean +#make install -j8 + +echo "Building universal binaries..." + +cp -r "$PREFIX_x86_64/" "$PREFIX/" + +strip "$PREFIX_i386/bin/mosh-client" +strip "$PREFIX_i386/bin/mosh-server" +strip "$PREFIX_x86_64/bin/mosh-client" +strip "$PREFIX_x86_64/bin/mosh-server" +#strip "$PREFIX_ppc/bin/mosh-client" +#strip "$PREFIX_ppc/bin/mosh-server" +#strip "$PREFIX_ppc64/bin/mosh-client" +#strip "$PREFIX_ppc64/bin/mosh-server" + +#lipo -create "$PREFIX_ppc/bin/mosh-client" "$PREFIX_ppc64/bin/mosh-client" "$PREFIX_i386/bin/mosh-client" "$PREFIX_x86_64/bin/mosh-client" -output "$PREFIX/bin/mosh-client" +#lipo -create "$PREFIX_ppc/bin/mosh-server" "$PREFIX_ppc64/bin/mosh-server" "$PREFIX_i386/bin/mosh-server" "$PREFIX_x86_64/bin/mosh-server" -output "$PREFIX/bin/mosh-server" +lipo -create "$PREFIX_i386/bin/mosh-client" "$PREFIX_x86_64/bin/mosh-client" -output "$PREFIX/bin/mosh-client" +lipo -create "$PREFIX_i386/bin/mosh-server" "$PREFIX_x86_64/bin/mosh-server" -output "$PREFIX/bin/mosh-server" + +perl -wlpi -e 's{#!/usr/bin/env perl}{#!/usr/bin/perl}' "$PREFIX/bin/mosh" popd > /dev/null @@ -39,7 +95,7 @@ popd > /dev/null echo "Running PackageMaker..." -PackageMaker -d mosh-package.pmdoc -o "$OUTFILE" +PATH=/Applications/PackageMaker.app/Contents/MacOS:$PATH PackageMaker -d mosh-package.pmdoc -o "$OUTFILE" echo "Cleaning up..." rm -r "$OUTDIR" diff -Nru mosh-1.2.2/man/mosh-server.1 mosh-1.2.4a/man/mosh-server.1 --- mosh-1.2.2/man/mosh-server.1 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/man/mosh-server.1 2013-03-27 22:36:03.000000000 +0000 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH MOSH 1 "February 2012" +.TH MOSH 1 "October 2012" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -22,9 +22,9 @@ new [\-s] [\-v] -[\-i IP] -[\-p port] -[\-c colors] +[\-i \fIIP\fP] +[\-p \fIPORT\fP[:\fIPORT2\fP]] +[\-c \fICOLORS\fP] [\-\- command...] .br .SH DESCRIPTION @@ -69,8 +69,8 @@ IP address of the local interface to bind (for multihomed hosts) .TP -.B \-p \fIPORT\fP -UDP port number to bind +.B \-p \fIPORT\fP[:\fIPORT2\fP] +UDP port number or port-range to bind .TP .B \-c \fICOLORS\fP diff -Nru mosh-1.2.2/man/mosh.1 mosh-1.2.4a/man/mosh.1 --- mosh-1.2.2/man/mosh.1 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/man/mosh.1 2013-03-27 22:36:03.000000000 +0000 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH MOSH 1 "February 2012" +.TH MOSH 1 "October 2012" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -121,17 +121,25 @@ Synonym for \-\-predict=never .TP -.B \-p \fINUM\fP, \-\-port=\fINUM\fP -Use a particular server-side UDP port, for example, if this is the +.B \-p \fIPORT\fP[:\fIPORT2\fP], \-\-port=\fIPORT\fP[:\fIPORT2\fP] +Use a particular server-side UDP port or port range, +for example, if this is the only port that is forwarded through a firewall to the server. Otherwise, \fBmosh\fP will choose a port between 60000 and 61000. -.SH ESCAPE SEQUENCE +.TP +.B \-\-no\-init +Do not send the \fBsmcup\fP initialization string and \fBrmcup\fP +deinitialization string to the client's terminal. On many terminals +this disables alternate screen mode. + +.SH ESCAPE SEQUENCES The escape sequence to shut down the connection is \fBCtrl-^ .\fP (typically typed with Ctrl-Shift-6, then a period). To send a literal -Ctrl-^, type \fBCtrl-^ ^\fP. +Ctrl-^, type \fBCtrl-^ ^\fP. The sequence \fBCtrl-^ Ctrl-Z\fP suspends the +client. .SH ENVIRONMENT VARIABLES diff -Nru mosh-1.2.2/ocb-license.html mosh-1.2.4a/ocb-license.html --- mosh-1.2.2/ocb-license.html 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/ocb-license.html 2013-03-27 22:36:03.000000000 +0000 @@ -35,4 +35,13 @@ Pseudorandom Function. +
+

June 12, 2012: Phillip Rogaway licensed the distribution of OCB +in Mosh under the GPL with the OpenSSL linking exception and iOS +waiver contained in the COPYING.iOS file.

+ +
+ "Mosh with the two GPL exemptions you specify in the attached note + is freely licensed to use for any OCB-related IP that I own." +
diff -Nru mosh-1.2.2/scripts/mosh mosh-1.2.4a/scripts/mosh --- mosh-1.2.2/scripts/mosh 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/scripts/mosh 2013-03-27 22:36:03.000000000 +0000 @@ -15,13 +15,26 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# +# In addition, as a special exception, the copyright holders give +# permission to link the code of portions of this program with the +# OpenSSL library under certain conditions as described in each +# individual source file, and distribute linked combinations including +# the two. +# +# You must obey the GNU General Public License in all respects for all +# of the code used other than OpenSSL. If you modify file(s) with this +# exception, you may extend this exception to your version of the +# file(s), but you are not obligated to do so. If you do not wish to do +# so, delete this exception statement from your version. If you delete +# this exception statement from all source files in the program, then +# also delete it here. -my $MOSH_VERSION = '1.2.2'; +my $MOSH_VERSION = '1.2.4a'; use warnings; use strict; use Socket; -use IO::Pty; use Getopt::Long; $|=1; @@ -35,6 +48,8 @@ my $ssh = 'ssh'; +my $term_init = 1; + my $help = undef; my $version = undef; @@ -52,12 +67,15 @@ -n --predict=never never use local echo --predict=experimental aggressively echo even when incorrect --p NUM --port=NUM server-side UDP port +-p PORT[:PORT2] + --port=PORT[:PORT2] server-side UDP port or range --ssh=COMMAND ssh command to run when setting up session (example: "ssh -p 2222") (default: "ssh") + --no-init do not send terminal initialization string + --help this message --version version and copyright information @@ -85,11 +103,12 @@ GetOptions( 'client=s' => \$client, 'server=s' => \$server, 'predict=s' => \$predict, - 'port=i' => \$port_request, + 'port=s' => \$port_request, 'a' => sub { $predict = 'always' }, 'n' => sub { $predict = 'never' }, - 'p=i' => \$port_request, + 'p=s' => \$port_request, 'ssh=s' => \$ssh, + 'init!' => \$term_init, 'help' => \$help, 'version' => \$version, 'fake-proxy!' => \my $fake_proxy ) or die $usage; @@ -108,12 +127,22 @@ } if ( defined $port_request ) { - if ( $port_request =~ m{^[0-9]+$} - and $port_request >= 0 - and $port_request <= 65535 ) { - # good port + if ( $port_request =~ m{^(\d+)(:(\d+))?$} ) { + my ( $low, $clause, $high ) = ( $1, $2, $3 ); + # good port or port-range + if ( $low <= 0 or $low > 65535 ) { + die "$0: Server-side (low) port ($low) must be within valid range [1..65535].\n"; + } + if ( defined $high ) { + if ( $high <= 0 or $high > 65535 ) { + die "$0: Server-side high port ($high) must be within valid range [1..65535].\n"; + } + if ( $low > $high ) { + die "$0: Server-side port range ($port_request): low port greater than high port.\n"; + } + } } else { - die "$0: Server-side port ($port_request) must be within valid range [0..65535].\n"; + die "$0: Server-side port or range ($port_request) is not valid.\n"; } } @@ -140,6 +169,9 @@ PeerPort => $port, Proto => "tcp" ) or die "$0: connect to host $ip port $port: $!\n"; + binmode($sock); + binmode(STDIN); + binmode(STDOUT); sub cat { my ( $from, $to ) = @_; @@ -168,12 +200,6 @@ my $userhost = shift; my @command = @ARGV; -# Run SSH and read password -my $pty = new IO::Pty; -my $pty_slave = $pty->slave; - -$pty_slave->clone_winsize_from( \*STDIN ); - # Count colors open COLORCOUNT, '-|', $client, ('-c') or die "Can't count colors: $!\n"; my $colors = ""; @@ -191,13 +217,15 @@ $colors = 0; } +my ($p_read, $p_write); +pipe($p_read, $p_write); my $pid = fork; die "$0: fork: $!\n" unless ( defined $pid ); if ( $pid == 0 ) { # child - $pty->close_slave(); - $pty->set_raw(); - open STDOUT, ">&", $pty or die; - open STDERR, ">&", $pty or die; + open STDOUT, ">&", $p_write or die; + open STDERR, ">&", $p_write or die; + close $p_write; + close $p_read; my @server = ( 'new', '-s' ); @@ -216,14 +244,18 @@ } my $quoted_self = shell_quote( $0 ); - exec "$ssh " . shell_quote( '-S', 'none', '-o', "ProxyCommand=$quoted_self --fake-proxy -- %h %p", '-t', $userhost, '--', "$server " . shell_quote( @server ) ); + exec "$ssh " . shell_quote( '-S', 'none', '-o', "ProxyCommand=$quoted_self --fake-proxy -- %h %p", '-n', '-tt', $userhost, '--', "$server " . shell_quote( @server ) ); die "Cannot exec ssh: $!\n"; -} else { # server +} else { # parent my ( $ip, $port, $key ); - close $pty; - LINE: while ( <$pty_slave> ) { + my $bad_udp_port_warning = 0; + close $p_write; + LINE: while ( <$p_read> ) { chomp; if ( m{^MOSH IP } ) { + if ( defined $ip ) { + die "$0 error: detected attempt to redefine MOSH IP.\n"; + } ( $ip ) = m{^MOSH IP (\S+)\s*$} or die "Bad MOSH IP string: $_\n"; } elsif ( m{^MOSH CONNECT } ) { if ( ( $port, $key ) = m{^MOSH CONNECT (\d+?) ([A-Za-z0-9/+]{22})\s*$} ) { @@ -232,22 +264,30 @@ die "Bad MOSH CONNECT string: $_\n"; } } else { + if ( defined $port_request and $port_request =~ m{:} and m{Bad UDP port} ) { + $bad_udp_port_warning = 1; + } print "$_\n"; } } waitpid $pid, 0; + close $p_read; if ( not defined $ip ) { die "$0: Did not find remote IP address (is SSH ProxyCommand disabled?).\n"; } if ( not defined $key or not defined $port ) { + if ( $bad_udp_port_warning ) { + die "$0: Server does not support UDP port range option.\n"; + } die "$0: Did not find mosh server startup message.\n"; } # Now start real mosh client $ENV{ 'MOSH_KEY' } = $key; $ENV{ 'MOSH_PREDICTION_DISPLAY' } = $predict; + $ENV{ 'MOSH_NO_TERM_INIT' } = '1' if !$term_init; exec {$client} ("$client @cmdline |", $ip, $port); } diff -Nru mosh-1.2.2/src/crypto/Makefile.am mosh-1.2.4a/src/crypto/Makefile.am --- mosh-1.2.2/src/crypto/Makefile.am 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/crypto/Makefile.am 2013-03-27 22:36:03.000000000 +0000 @@ -1,15 +1,17 @@ +AM_CPPFLAGS = -I$(srcdir)/../util $(OPENSSL_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) noinst_LIBRARIES = libmoshcrypto.a -libmoshcrypto_a_SOURCES = \ +OCB_SRCS = \ ae.h \ + ocb.cc + +libmoshcrypto_a_SOURCES = \ + $(OCB_SRCS) \ base64.cc \ base64.h \ byteorder.h \ crypto.cc \ crypto.h \ - ocb.cc \ - prng.h \ - rijndael-alg-fst.cc \ - rijndael-alg-fst.h + prng.h diff -Nru mosh-1.2.2/src/crypto/base64.cc mosh-1.2.4a/src/crypto/base64.cc --- mosh-1.2.2/src/crypto/base64.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/crypto/base64.cc 2013-03-27 22:36:03.000000000 +0000 @@ -1,577 +1,132 @@ -/* Taken from GNU coreutils */ +/* + Mosh: the mobile shell + Copyright 2012 Keith Winstein + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. +*/ -/* base64.c -- Encode binary data using printable characters. - Copyright (C) 1999-2001, 2004-2006, 2009-2011 Free Software Foundation, Inc. +#include +#include +#include - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -/* Written by Simon Josefsson. Partially adapted from GNU MailUtils - * (mailbox/filter_trans.c, as of 2004-11-28). Improved by review - * from Paul Eggert, Bruno Haible, and Stepan Kasal. - * - * See also RFC 3548 . - * - * Be careful with error checking. Here is how you would typically - * use these functions: - * - * bool ok = base64_decode_alloc (in, inlen, &out, &outlen); - * if (!ok) - * FAIL: input was not valid base64 - * if (out == NULL) - * FAIL: memory allocation error - * OK: data in OUT/OUTLEN - * - * size_t outlen = base64_encode_alloc (in, inlen, &out); - * if (out == NULL && outlen == 0 && inlen != 0) - * FAIL: input too long - * if (out == NULL) - * FAIL: memory allocation error - * OK: data in OUT/OUTLEN. - * - */ - -// #include +#include "fatal_assert.h" -/* Get prototype. */ -#include "base64.h" +bool base64_decode( const char *b64, const size_t b64_len, + char *raw, size_t *raw_len ) +{ + bool ret = false; -/* Get malloc. */ -#include + fatal_assert( b64_len == 24 ); /* only useful for Mosh keys */ + fatal_assert( *raw_len == 16 ); -/* Get UCHAR_MAX. */ -#include + /* initialize input/output */ + BIO_METHOD *b64_method = BIO_f_base64(); + fatal_assert( b64_method ); -#include + BIO *b64_bio = BIO_new( b64_method ); + fatal_assert( b64_bio ); -/* C89 compliant way to cast 'char' to 'unsigned char'. */ -static inline unsigned char -to_uchar (char ch) -{ - return ch; -} + BIO_set_flags( b64_bio, BIO_FLAGS_BASE64_NO_NL ); -/* Base64 encode IN array of size INLEN into OUT array of size OUTLEN. - If OUTLEN is less than BASE64_LENGTH(INLEN), write as many bytes as - possible. If OUTLEN is larger than BASE64_LENGTH(INLEN), also zero - terminate the output buffer. */ -void -base64_encode (const char *restrict in, size_t inlen, - char *restrict out, size_t outlen) -{ - static const char b64str[65] = /* KJW */ - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + BIO *mem_bio = BIO_new_mem_buf( (void *) b64, b64_len ); + fatal_assert( mem_bio ); - while (inlen && outlen) - { - *out++ = b64str[(to_uchar (in[0]) >> 2) & 0x3f]; - if (!--outlen) - break; - *out++ = b64str[((to_uchar (in[0]) << 4) - + (--inlen ? to_uchar (in[1]) >> 4 : 0)) - & 0x3f]; - if (!--outlen) - break; - *out++ = - (inlen - ? b64str[((to_uchar (in[1]) << 2) - + (--inlen ? to_uchar (in[2]) >> 6 : 0)) - & 0x3f] - : '='); - if (!--outlen) - break; - *out++ = inlen ? b64str[to_uchar (in[2]) & 0x3f] : '='; - if (!--outlen) - break; - if (inlen) - inlen--; - if (inlen) - in += 3; - } + BIO *combined_bio = BIO_push( b64_bio, mem_bio ); + fatal_assert( combined_bio ); - if (outlen) - *out = '\0'; -} + fatal_assert( 1 == BIO_flush( combined_bio ) ); + + /* read the string */ + int bytes_read = BIO_read( combined_bio, raw, *raw_len ); + if ( bytes_read <= 0 ) { + goto end; + } -/* Allocate a buffer and store zero terminated base64 encoded data - from array IN of size INLEN, returning BASE64_LENGTH(INLEN), i.e., - the length of the encoded data, excluding the terminating zero. On - return, the OUT variable will hold a pointer to newly allocated - memory that must be deallocated by the caller. If output string - length would overflow, 0 is returned and OUT is set to NULL. If - memory allocation failed, OUT is set to NULL, and the return value - indicates length of the requested memory block, i.e., - BASE64_LENGTH(inlen) + 1. */ -size_t -base64_encode_alloc (const char *in, size_t inlen, char **out) -{ - size_t outlen = 1 + BASE64_LENGTH (inlen); + if ( bytes_read != (int)*raw_len ) { + goto end; + } - /* Check for overflow in outlen computation. - * - * If there is no overflow, outlen >= inlen. - * - * If the operation (inlen + 2) overflows then it yields at most +1, so - * outlen is 0. - * - * If the multiplication overflows, we lose at least half of the - * correct value, so the result is < ((inlen + 2) / 3) * 2, which is - * less than (inlen + 2) * 0.66667, which is less than inlen as soon as - * (inlen > 4). - */ - if (inlen > outlen) - { - *out = NULL; - return 0; - } - - *out = (char *) malloc (outlen); /* KJW */ - if (!*out) - return outlen; + fatal_assert( 1 == BIO_flush( combined_bio ) ); - base64_encode (in, inlen, *out, outlen); + /* check if there is more to read */ + char extra[ 256 ]; + bytes_read = BIO_read( combined_bio, extra, 256 ); + if ( bytes_read > 0 ) { + goto end; + } - return outlen - 1; -} + /* check if mem buf is empty */ + if ( !BIO_eof( mem_bio ) ) { + goto end; + } -/* With this approach this file works independent of the charset used - (think EBCDIC). However, it does assume that the characters in the - Base64 alphabet (A-Za-z0-9+/) are encoded in 0..255. POSIX - 1003.1-2001 require that char and unsigned char are 8-bit - quantities, though, taking care of that problem. But this may be a - potential problem on non-POSIX C99 platforms. - - IBM C V6 for AIX mishandles "#define B64(x) ...'x'...", so use "_" - as the formal parameter rather than "x". */ -#define B64(_) \ - ((_) == 'A' ? 0 \ - : (_) == 'B' ? 1 \ - : (_) == 'C' ? 2 \ - : (_) == 'D' ? 3 \ - : (_) == 'E' ? 4 \ - : (_) == 'F' ? 5 \ - : (_) == 'G' ? 6 \ - : (_) == 'H' ? 7 \ - : (_) == 'I' ? 8 \ - : (_) == 'J' ? 9 \ - : (_) == 'K' ? 10 \ - : (_) == 'L' ? 11 \ - : (_) == 'M' ? 12 \ - : (_) == 'N' ? 13 \ - : (_) == 'O' ? 14 \ - : (_) == 'P' ? 15 \ - : (_) == 'Q' ? 16 \ - : (_) == 'R' ? 17 \ - : (_) == 'S' ? 18 \ - : (_) == 'T' ? 19 \ - : (_) == 'U' ? 20 \ - : (_) == 'V' ? 21 \ - : (_) == 'W' ? 22 \ - : (_) == 'X' ? 23 \ - : (_) == 'Y' ? 24 \ - : (_) == 'Z' ? 25 \ - : (_) == 'a' ? 26 \ - : (_) == 'b' ? 27 \ - : (_) == 'c' ? 28 \ - : (_) == 'd' ? 29 \ - : (_) == 'e' ? 30 \ - : (_) == 'f' ? 31 \ - : (_) == 'g' ? 32 \ - : (_) == 'h' ? 33 \ - : (_) == 'i' ? 34 \ - : (_) == 'j' ? 35 \ - : (_) == 'k' ? 36 \ - : (_) == 'l' ? 37 \ - : (_) == 'm' ? 38 \ - : (_) == 'n' ? 39 \ - : (_) == 'o' ? 40 \ - : (_) == 'p' ? 41 \ - : (_) == 'q' ? 42 \ - : (_) == 'r' ? 43 \ - : (_) == 's' ? 44 \ - : (_) == 't' ? 45 \ - : (_) == 'u' ? 46 \ - : (_) == 'v' ? 47 \ - : (_) == 'w' ? 48 \ - : (_) == 'x' ? 49 \ - : (_) == 'y' ? 50 \ - : (_) == 'z' ? 51 \ - : (_) == '0' ? 52 \ - : (_) == '1' ? 53 \ - : (_) == '2' ? 54 \ - : (_) == '3' ? 55 \ - : (_) == '4' ? 56 \ - : (_) == '5' ? 57 \ - : (_) == '6' ? 58 \ - : (_) == '7' ? 59 \ - : (_) == '8' ? 60 \ - : (_) == '9' ? 61 \ - : (_) == '+' ? 62 \ - : (_) == '/' ? 63 \ - : -1) - -static const signed char b64[0x100] = { - B64 (0), B64 (1), B64 (2), B64 (3), - B64 (4), B64 (5), B64 (6), B64 (7), - B64 (8), B64 (9), B64 (10), B64 (11), - B64 (12), B64 (13), B64 (14), B64 (15), - B64 (16), B64 (17), B64 (18), B64 (19), - B64 (20), B64 (21), B64 (22), B64 (23), - B64 (24), B64 (25), B64 (26), B64 (27), - B64 (28), B64 (29), B64 (30), B64 (31), - B64 (32), B64 (33), B64 (34), B64 (35), - B64 (36), B64 (37), B64 (38), B64 (39), - B64 (40), B64 (41), B64 (42), B64 (43), - B64 (44), B64 (45), B64 (46), B64 (47), - B64 (48), B64 (49), B64 (50), B64 (51), - B64 (52), B64 (53), B64 (54), B64 (55), - B64 (56), B64 (57), B64 (58), B64 (59), - B64 (60), B64 (61), B64 (62), B64 (63), - B64 (64), B64 (65), B64 (66), B64 (67), - B64 (68), B64 (69), B64 (70), B64 (71), - B64 (72), B64 (73), B64 (74), B64 (75), - B64 (76), B64 (77), B64 (78), B64 (79), - B64 (80), B64 (81), B64 (82), B64 (83), - B64 (84), B64 (85), B64 (86), B64 (87), - B64 (88), B64 (89), B64 (90), B64 (91), - B64 (92), B64 (93), B64 (94), B64 (95), - B64 (96), B64 (97), B64 (98), B64 (99), - B64 (100), B64 (101), B64 (102), B64 (103), - B64 (104), B64 (105), B64 (106), B64 (107), - B64 (108), B64 (109), B64 (110), B64 (111), - B64 (112), B64 (113), B64 (114), B64 (115), - B64 (116), B64 (117), B64 (118), B64 (119), - B64 (120), B64 (121), B64 (122), B64 (123), - B64 (124), B64 (125), B64 (126), B64 (127), - B64 (128), B64 (129), B64 (130), B64 (131), - B64 (132), B64 (133), B64 (134), B64 (135), - B64 (136), B64 (137), B64 (138), B64 (139), - B64 (140), B64 (141), B64 (142), B64 (143), - B64 (144), B64 (145), B64 (146), B64 (147), - B64 (148), B64 (149), B64 (150), B64 (151), - B64 (152), B64 (153), B64 (154), B64 (155), - B64 (156), B64 (157), B64 (158), B64 (159), - B64 (160), B64 (161), B64 (162), B64 (163), - B64 (164), B64 (165), B64 (166), B64 (167), - B64 (168), B64 (169), B64 (170), B64 (171), - B64 (172), B64 (173), B64 (174), B64 (175), - B64 (176), B64 (177), B64 (178), B64 (179), - B64 (180), B64 (181), B64 (182), B64 (183), - B64 (184), B64 (185), B64 (186), B64 (187), - B64 (188), B64 (189), B64 (190), B64 (191), - B64 (192), B64 (193), B64 (194), B64 (195), - B64 (196), B64 (197), B64 (198), B64 (199), - B64 (200), B64 (201), B64 (202), B64 (203), - B64 (204), B64 (205), B64 (206), B64 (207), - B64 (208), B64 (209), B64 (210), B64 (211), - B64 (212), B64 (213), B64 (214), B64 (215), - B64 (216), B64 (217), B64 (218), B64 (219), - B64 (220), B64 (221), B64 (222), B64 (223), - B64 (224), B64 (225), B64 (226), B64 (227), - B64 (228), B64 (229), B64 (230), B64 (231), - B64 (232), B64 (233), B64 (234), B64 (235), - B64 (236), B64 (237), B64 (238), B64 (239), - B64 (240), B64 (241), B64 (242), B64 (243), - B64 (244), B64 (245), B64 (246), B64 (247), - B64 (248), B64 (249), B64 (250), B64 (251), - B64 (252), B64 (253), B64 (254), B64 (255) -}; - -#if UCHAR_MAX == 255 -# define uchar_in_range(c) true -#else -# define uchar_in_range(c) ((c) <= 255) -#endif - -/* Return true if CH is a character from the Base64 alphabet, and - false otherwise. Note that '=' is padding and not considered to be - part of the alphabet. */ -bool -isbase64 (char ch) -{ - return uchar_in_range (to_uchar (ch)) && 0 <= b64[to_uchar (ch)]; + ret = true; + end: + BIO_free_all( combined_bio ); + return ret; } -/* Initialize decode-context buffer, CTX. */ -void -base64_decode_ctx_init (struct base64_decode_context *ctx) +void base64_encode( const char *raw, const size_t raw_len, + char *b64, const size_t b64_len ) { - ctx->i = 0; -} + fatal_assert( b64_len == 24 ); /* only useful for Mosh keys */ + fatal_assert( raw_len == 16 ); -/* If CTX->i is 0 or 4, there are four or more bytes in [*IN..IN_END), and - none of those four is a newline, then return *IN. Otherwise, copy up to - 4 - CTX->i non-newline bytes from that range into CTX->buf, starting at - index CTX->i and setting CTX->i to reflect the number of bytes copied, - and return CTX->buf. In either case, advance *IN to point to the byte - after the last one processed, and set *N_NON_NEWLINE to the number of - verified non-newline bytes accessible through the returned pointer. */ -static inline char * -get_4 (struct base64_decode_context *ctx, - char const *restrict *in, char const *restrict in_end, - size_t *n_non_newline) -{ - if (ctx->i == 4) - ctx->i = 0; + /* initialize input/output */ + BIO_METHOD *b64_method = BIO_f_base64(), *mem_method = BIO_s_mem(); + fatal_assert( b64_method ); + fatal_assert( mem_method ); - if (ctx->i == 0) - { - char const *t = *in; - if (4 <= in_end - *in && memchr (t, '\n', 4) == NULL) - { - /* This is the common case: no newline. */ - *in += 4; - *n_non_newline = 4; - return (char *) t; - } - } - - { - /* Copy non-newline bytes into BUF. */ - char const *p = *in; - while (p < in_end) - { - char c = *p++; - if (c != '\n') - { - ctx->buf[ctx->i++] = c; - if (ctx->i == 4) - break; - } - } - - *in = p; - *n_non_newline = ctx->i; - return ctx->buf; - } -} + BIO *b64_bio = BIO_new( b64_method ), *mem_bio = BIO_new( mem_method ); + fatal_assert( b64_bio ); + fatal_assert( mem_bio ); -#define return_false \ - do \ - { \ - *outp = out; \ - return false; \ - } \ - while (false) - -/* Decode up to four bytes of base64-encoded data, IN, of length INLEN - into the output buffer, *OUT, of size *OUTLEN bytes. Return true if - decoding is successful, false otherwise. If *OUTLEN is too small, - as many bytes as possible are written to *OUT. On return, advance - *OUT to point to the byte after the last one written, and decrement - *OUTLEN to reflect the number of bytes remaining in *OUT. */ -static inline bool -decode_4 (char const *restrict in, size_t inlen, - char *restrict *outp, size_t *outleft) -{ - char *out = *outp; - if (inlen < 2) - return false; - - if (!isbase64 (in[0]) || !isbase64 (in[1])) - return false; - - if (*outleft) - { - *out++ = ((b64[to_uchar (in[0])] << 2) - | (b64[to_uchar (in[1])] >> 4)); - --*outleft; - } - - if (inlen == 2) - return_false; - - if (in[2] == '=') - { - if (inlen != 4) - return_false; - - if (in[3] != '=') - return_false; - } - else - { - if (!isbase64 (in[2])) - return_false; - - if (*outleft) - { - *out++ = (((b64[to_uchar (in[1])] << 4) & 0xf0) - | (b64[to_uchar (in[2])] >> 2)); - --*outleft; - } - - if (inlen == 3) - return_false; - - if (in[3] == '=') - { - if (inlen != 4) - return_false; - } - else - { - if (!isbase64 (in[3])) - return_false; - - if (*outleft) - { - *out++ = (((b64[to_uchar (in[2])] << 6) & 0xc0) - | b64[to_uchar (in[3])]); - --*outleft; - } - } - } + BIO_set_flags( b64_bio, BIO_FLAGS_BASE64_NO_NL ); - *outp = out; - return true; -} + BIO *combined_bio = BIO_push( b64_bio, mem_bio ); + fatal_assert( combined_bio ); + + /* write the string */ + int bytes_written = BIO_write( combined_bio, raw, raw_len ); + fatal_assert( bytes_written >= 0 ); -/* Decode base64-encoded input array IN of length INLEN to output array - OUT that can hold *OUTLEN bytes. The input data may be interspersed - with newlines. Return true if decoding was successful, i.e. if the - input was valid base64 data, false otherwise. If *OUTLEN is too - small, as many bytes as possible will be written to OUT. On return, - *OUTLEN holds the length of decoded bytes in OUT. Note that as soon - as any non-alphabet, non-newline character is encountered, decoding - is stopped and false is returned. If INLEN is zero, then process - only whatever data is stored in CTX. - - Initially, CTX must have been initialized via base64_decode_ctx_init. - Subsequent calls to this function must reuse whatever state is recorded - in that buffer. It is necessary for when a quadruple of base64 input - bytes spans two input buffers. - - If CTX is NULL then newlines are treated as garbage and the input - buffer is processed as a unit. */ - -bool -base64_decode_ctx (struct base64_decode_context *ctx, - const char *restrict in, size_t inlen, - char *restrict out, size_t *outlen) -{ - size_t outleft = *outlen; - bool ignore_newlines = ctx != NULL; - bool flush_ctx = false; - unsigned int ctx_i = 0; - - if (ignore_newlines) - { - ctx_i = ctx->i; - flush_ctx = inlen == 0; - } - - - while (true) - { - size_t outleft_save = outleft; - if (ctx_i == 0 && !flush_ctx) - { - while (true) - { - /* Save a copy of outleft, in case we need to re-parse this - block of four bytes. */ - outleft_save = outleft; - if (!decode_4 (in, inlen, &out, &outleft)) - break; - - in += 4; - inlen -= 4; - } - } - - if (inlen == 0 && !flush_ctx) - break; - - /* Handle the common case of 72-byte wrapped lines. - This also handles any other multiple-of-4-byte wrapping. */ - if (inlen && *in == '\n' && ignore_newlines) - { - ++in; - --inlen; - continue; - } - - /* Restore OUT and OUTLEFT. */ - out -= outleft_save - outleft; - outleft = outleft_save; - - { - char const *in_end = in + inlen; - char const *non_nl; - - if (ignore_newlines) - non_nl = get_4 (ctx, &in, in_end, &inlen); - else - non_nl = in; /* Might have nl in this case. */ - - /* If the input is empty or consists solely of newlines (0 non-newlines), - then we're done. Likewise if there are fewer than 4 bytes when not - flushing context and not treating newlines as garbage. */ - if (inlen == 0 || (inlen < 4 && !flush_ctx && ignore_newlines)) - { - inlen = 0; - break; - } - if (!decode_4 (non_nl, inlen, &out, &outleft)) - break; - - inlen = in_end - in; - } - } + fatal_assert( bytes_written == (int)raw_len ); - *outlen -= outleft; + fatal_assert( 1 == BIO_flush( combined_bio ) ); - return inlen == 0; -} + /* check if mem buf has desired length */ + fatal_assert( BIO_pending( mem_bio ) == (int)b64_len ); -/* Allocate an output buffer in *OUT, and decode the base64 encoded - data stored in IN of size INLEN to the *OUT buffer. On return, the - size of the decoded data is stored in *OUTLEN. OUTLEN may be NULL, - if the caller is not interested in the decoded length. *OUT may be - NULL to indicate an out of memory error, in which case *OUTLEN - contains the size of the memory block needed. The function returns - true on successful decoding and memory allocation errors. (Use the - *OUT and *OUTLEN parameters to differentiate between successful - decoding and memory error.) The function returns false if the - input was invalid, in which case *OUT is NULL and *OUTLEN is - undefined. */ -bool -base64_decode_alloc_ctx (struct base64_decode_context *ctx, - const char *in, size_t inlen, char **out, - size_t *outlen) -{ - /* This may allocate a few bytes too many, depending on input, - but it's not worth the extra CPU time to compute the exact size. - The exact size is 3 * inlen / 4, minus 1 if the input ends - with "=" and minus another 1 if the input ends with "==". - Dividing before multiplying avoids the possibility of overflow. */ - size_t needlen = 3 * (inlen / 4) + 2; - - *out = (char *) malloc (needlen); - if (!*out) - return true; - - if (!base64_decode_ctx (ctx, in, inlen, *out, &needlen)) - { - free (*out); - *out = NULL; - return false; - } + char *mem_ptr; + + BIO_get_mem_data( mem_bio, &mem_ptr ); - if (outlen) - *outlen = needlen; + memcpy( b64, mem_ptr, b64_len ); - return true; + BIO_free_all( combined_bio ); } diff -Nru mosh-1.2.2/src/crypto/base64.h mosh-1.2.4a/src/crypto/base64.h --- mosh-1.2.2/src/crypto/base64.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/crypto/base64.h 2013-03-27 22:36:03.000000000 +0000 @@ -1,65 +1,37 @@ -/* Taken from GNU coreutils */ +/* + Mosh: the mobile shell + Copyright 2012 Keith Winstein + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. +*/ -/* base64.h -- Encode binary data using printable characters. - Copyright (C) 2004-2006, 2009-2011 Free Software Foundation, Inc. - Written by Simon Josefsson. +bool base64_decode( const char *b64, const size_t b64_len, + char *raw, size_t *raw_len ); - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -#ifndef BASE64_H -# define BASE64_H - -# include "config.h" - -/* Get size_t. */ -# include - -/* Get bool. */ -# include - -/* This uses that the expression (n+(k-1))/k means the smallest - integer >= n/k, i.e., the ceiling of n/k. */ -# define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4) - -struct base64_decode_context -{ - unsigned int i; - char buf[4]; -}; - -extern bool isbase64 (char ch); - -extern void base64_encode (const char *restrict in, size_t inlen, - char *restrict out, size_t outlen); - -extern size_t base64_encode_alloc (const char *in, size_t inlen, char **out); - -extern void base64_decode_ctx_init (struct base64_decode_context *ctx); - -extern bool base64_decode_ctx (struct base64_decode_context *ctx, - const char *restrict in, size_t inlen, - char *restrict out, size_t *outlen); - -extern bool base64_decode_alloc_ctx (struct base64_decode_context *ctx, - const char *in, size_t inlen, - char **out, size_t *outlen); - -#define base64_decode(in, inlen, out, outlen) \ - base64_decode_ctx (NULL, in, inlen, out, outlen) - -#define base64_decode_alloc(in, inlen, out, outlen) \ - base64_decode_alloc_ctx (NULL, in, inlen, out, outlen) - -#endif /* BASE64_H */ +bool base64_encode( const char *raw, const size_t raw_len, + char *b64, size_t b64_len ); diff -Nru mosh-1.2.2/src/crypto/byteorder.h mosh-1.2.4a/src/crypto/byteorder.h --- mosh-1.2.2/src/crypto/byteorder.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/crypto/byteorder.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef BYTEORDER_HPP diff -Nru mosh-1.2.2/src/crypto/crypto.cc mosh-1.2.4a/src/crypto/crypto.cc --- mosh-1.2.2/src/crypto/crypto.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/crypto/crypto.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -22,6 +36,7 @@ #include #include #include +#include #include "byteorder.h" #include "crypto.h" @@ -107,30 +122,23 @@ Base64Key::Base64Key() { - FILE *devrandom = fopen( rdev, "r" ); - if ( devrandom == NULL ) { - throw CryptoException( string( rdev ) + ": " + strerror( errno ) ); - } + ifstream devrandom( rdev, ifstream::in | ifstream::binary ); - if ( 1 != fread( key, 16, 1, devrandom ) ) { + devrandom.read( reinterpret_cast( key ), sizeof( key ) ); + if ( !devrandom ) { throw CryptoException( "Could not read from " + string( rdev ) ); } - - if ( 0 != fclose( devrandom ) ) { - throw CryptoException( string( rdev ) + ": " + strerror( errno ) ); - } } string Base64Key::printable_key( void ) const { - char base64[ 25 ]; + char base64[ 24 ]; - base64_encode( (char *)key, 16, base64, 25 ); + base64_encode( (char *)key, 16, base64, 24 ); - if ( (base64[ 24 ] != 0) - || (base64[ 23 ] != '=') + if ( (base64[ 23 ] != '=') || (base64[ 22 ] != '=') ) { - throw CryptoException( "Unexpected output from base64_encode." ); + throw CryptoException( string( "Unexpected output from base64_encode: " ) + string( base64, 24 ) ); } base64[ 22 ] = 0; diff -Nru mosh-1.2.2/src/crypto/crypto.h mosh-1.2.4a/src/crypto/crypto.h --- mosh-1.2.2/src/crypto/crypto.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/crypto/crypto.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef CRYPTO_HPP @@ -83,8 +97,8 @@ Nonce( uint64_t val ); Nonce( char *s_bytes, size_t len ); - string cc_str( void ) { return string( (char *)( bytes + 4 ), 8 ); } - char *data( void ) { return bytes; } + string cc_str( void ) const { return string( bytes + 4, 8 ); } + const char *data( void ) const { return bytes; } uint64_t val( void ); }; diff -Nru mosh-1.2.2/src/crypto/ocb.cc mosh-1.2.4a/src/crypto/ocb.cc --- mosh-1.2.2/src/crypto/ocb.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/crypto/ocb.cc 2013-03-27 22:36:03.000000000 +0000 @@ -1,7 +1,7 @@ /*------------------------------------------------------------------------ -/ OCB Version 3 Reference Code (Optimized C) Last modified 13-JUL-2011 +/ OCB Version 3 Reference Code (Optimized C) Last modified 08-SEP-2012 /------------------------------------------------------------------------- -/ Copyright (c) 2011 Ted Krovetz. +/ Copyright (c) 2012 Ted Krovetz. / / Permission to use, copy, modify, and/or distribute this software for any / purpose with or without fee is hereby granted, provided that the above @@ -18,6 +18,8 @@ / Phillip Rogaway holds patents relevant to OCB. See the following for / his patent grant: http://www.cs.ucdavis.edu/~rogaway/ocb/grant.htm / +/ Special thanks to Keegan McAllister for suggesting several good improvements +/ / Comments are welcome: Ted Krovetz - Dedicated to Laurel K /------------------------------------------------------------------------- */ @@ -31,7 +33,7 @@ / So, when on machines with these facilities, all pointers passed to / any function should be 16-byte aligned. / - Plaintext and ciphertext pointers may be equal (ie, plaintext gets -/ encrypted in-place), but no other pair of pointers may be equal. +/ encrypted in-place), but no other pair of pointers may be equal. / - This code assumes all x86 processors have SSE2 and SSSE3 instructions / when compiling under MSVC. If untrue, alter the #define. / - This code is tested for C99 and recent versions of GCC and MSVC. */ @@ -48,15 +50,15 @@ /* This implementation has built-in support for multiple AES APIs. Set any / one of the following to non-zero to specify which to use. */ -#define USE_OPENSSL_AES 0 /* http://openssl.org */ -#define USE_REFERENCE_AES 1 /* Internet search: rijndael-alg-fst.c */ +#define USE_OPENSSL_AES 1 /* http://openssl.org */ +#define USE_REFERENCE_AES 0 /* Internet search: rijndael-alg-fst.c */ #define USE_AES_NI 0 /* Uses compiler's intrinsics */ /* During encryption and decryption, various "L values" are required. / The L values can be precomputed during initialization (requiring extra / space in ae_ctx), generated as needed (slightly slowing encryption and / decryption), or some combination of the two. L_TABLE_SZ specifies how many -/ L values to precomute. L_TABLE_SZ must be at least 3. L_TABLE_SZ*16 bytes +/ L values to precompute. L_TABLE_SZ must be at least 3. L_TABLE_SZ*16 bytes / are used for L values in ae_ctx. Plaintext and ciphertexts shorter than / 2^L_TABLE_SZ blocks need no L values calculated dynamically. */ #define L_TABLE_SZ 16 @@ -122,7 +124,7 @@ #else #if (L_TABLE_SZ <= 9) && (L_TABLE_SZ_IS_ENOUGH) /* < 2^13 byte texts */ static inline unsigned ntz(unsigned x) { - static const unsigned char tz_table[] = {0, + static const unsigned char tz_table[] = {0, 2,3,2,4,2,3,2,5,2,3,2,4,2,3,2,6,2,3,2,4,2,3,2,5,2,3,2,4,2,3,2,7, 2,3,2,4,2,3,2,5,2,3,2,4,2,3,2,6,2,3,2,4,2,3,2,5,2,3,2,4,2,3,2,8, 2,3,2,4,2,3,2,5,2,3,2,4,2,3,2,6,2,3,2,4,2,3,2,5,2,3,2,4,2,3,2,7, @@ -131,8 +133,8 @@ } #else /* From http://supertech.csail.mit.edu/papers/debruijn.pdf */ static inline unsigned ntz(unsigned x) { - static const unsigned char tz_table[32] = - { 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, + static const unsigned char tz_table[32] = + { 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9}; return tz_table[((uint32_t)((x & -x) * 0x077CB531u)) >> 27]; } @@ -282,7 +284,7 @@ } else return b; } - + /* KtopStr is reg correct by 64 bits, return mem correct */ block gen_offset(uint64_t KtopStr[3], unsigned bot) { block rval; @@ -302,7 +304,7 @@ "adcs %H1,%H1,%H1\n\t" "adcs %0,%0,%0\n\t" "adcs %H0,%H0,%H0\n\t" - "it cs\n\t" + "it cs\n\t" "eorcs %1,%1,#135" : "+r"(b.l), "+r"(b.r) : : "cc"); return b; @@ -315,7 +317,7 @@ return b; } #endif - + #endif /* ----------------------------------------------------------------------- */ @@ -420,7 +422,7 @@ x3 = _mm_xor_si128(x3,_mm_shuffle_epi32(x0, 255)); \ kp[idx+2] = x0; tmp = x3 -void AES_128_Key_Expansion(const unsigned char *userkey, void *key) +static void AES_128_Key_Expansion(const unsigned char *userkey, void *key) { __m128i x0,x1,x2; __m128i *kp = (__m128i *)key; @@ -438,7 +440,7 @@ EXPAND_ASSIST(x0,x1,x2,x0,255,54); kp[10] = x0; } -void AES_192_Key_Expansion(const unsigned char *userkey, void *key) +static void AES_192_Key_Expansion(const unsigned char *userkey, void *key) { __m128i x0,x1,x2,x3,tmp,*kp = (__m128i *)key; kp[0] = x0 = _mm_loadu_si128((__m128i*)userkey); @@ -450,7 +452,7 @@ EXPAND192_STEP(10,64); } -void AES_256_Key_Expansion(const unsigned char *userkey, void *key) +static void AES_256_Key_Expansion(const unsigned char *userkey, void *key) { __m128i x0,x1,x2,x3,*kp = (__m128i *)key; kp[0] = x0 = _mm_loadu_si128((__m128i*)userkey ); @@ -471,7 +473,7 @@ EXPAND_ASSIST(x0,x1,x2,x3,255,64); kp[14] = x0; } -int AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key) +static int AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key) { if (bits == 128) { AES_128_Key_Expansion (userKey,key); @@ -486,7 +488,7 @@ return 0; } - void AES_set_decrypt_key_fast(AES_KEY *dkey, const AES_KEY *ekey) +static void AES_set_decrypt_key_fast(AES_KEY *dkey, const AES_KEY *ekey) { int j = 0; int i = ROUNDS(ekey); @@ -499,7 +501,7 @@ dkey->rd_key[i] = ekey->rd_key[j]; } -int AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key) +static int AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key) { AES_KEY temp_key; AES_set_encrypt_key(userKey,bits,&temp_key); @@ -568,12 +570,12 @@ / Each item in the OCB context is stored either "memory correct" or / "register correct". On big-endian machines, this is identical. On / little-endian machines, one must choose whether the byte-string -/ is in the corrct order when it resides in memory or in registers. +/ is in the correct order when it resides in memory or in registers. / It must be register correct whenever it is to be manipulated / arithmetically, but must be memory correct whenever it interacts / with the plaintext or ciphertext. /------------------------------------------------------------------------- */ - + struct _ae_ctx { block offset; /* Memory correct */ block checksum; /* Memory correct */ @@ -641,10 +643,10 @@ { unsigned i; block tmp_blk; - + if (nonce_len != 12) return AE_NOT_SUPPORTED; - + /* Initialize encryption & decryption keys */ #if (OCB_KEY_LEN > 0) key_len = OCB_KEY_LEN; @@ -655,11 +657,11 @@ #else AES_set_decrypt_key((unsigned char *)key, (int)(key_len*8), &ctx->decrypt_key); #endif - + /* Zero things that need zeroing */ ctx->cached_Top = ctx->ad_checksum = zero_block(); ctx->ad_blocks_processed = 0; - + /* Compute key-dependent values */ AES_encrypt((unsigned char *)&ctx->cached_Top, (unsigned char *)&ctx->Lstar, &ctx->encrypt_key); @@ -676,7 +678,7 @@ #if (OCB_TAG_LEN == 0) ctx->tag_len = tag_len; #else - (void) tag_len; /* Supress var not used error */ + (void) tag_len; /* Suppress var not used error */ #endif return AE_SUCCESS; @@ -710,13 +712,13 @@ return gen_offset(ctx->KtopStr, idx); } - void process_ad(ae_ctx *ctx, const void *ad, int ad_len, int final) +static void process_ad(ae_ctx *ctx, const void *ad, int ad_len, int final) { union { uint32_t u32[4]; uint8_t u8[16]; block bl; } tmp; block ad_offset, ad_checksum; const block * adp = (block *)ad; unsigned i,k,tz,remaining; - + ad_offset = ctx->ad_offset; ad_checksum = ctx->ad_checksum; i = ad_len/(BPI*16); @@ -767,7 +769,7 @@ if (final) { block ta[BPI]; - + /* Process remaining associated data, compute its tag contribution */ remaining = ((unsigned)ad_len) % (BPI*16); if (remaining) { @@ -916,10 +918,10 @@ ctx->blocks_processed = block_num; ctx->checksum = checksum; } - + if (final) { block ta[BPI+1], oa[BPI]; - + /* Process remaining plaintext and compute its tag contribution */ unsigned remaining = ((unsigned)pt_len) % (BPI*16); k = 0; /* How many blocks in ta[] need ECBing */ @@ -988,7 +990,7 @@ case 2: ctp[1] = xor_block(ta[1], oa[1]); case 1: ctp[0] = xor_block(ta[0], oa[0]); } - + /* Tag is placed at the correct location */ if (tag) { @@ -1014,6 +1016,28 @@ /* ----------------------------------------------------------------------- */ +/* Compare two regions of memory, taking a constant amount of time for a + given buffer size -- under certain assumptions about the compiler + and machine, of course. + + Use this to avoid timing side-channel attacks. + + Returns 0 for memory regions with equal contents; non-zero otherwise. */ +static int constant_time_memcmp(const void *av, const void *bv, size_t n) { + const uint8_t *a = (const uint8_t *) av; + const uint8_t *b = (const uint8_t *) bv; + uint8_t result = 0; + size_t i; + + for (i=0; i 0) @@ -1109,10 +1133,10 @@ ctx->blocks_processed = block_num; ctx->checksum = checksum; } - + if (final) { block ta[BPI+1], oa[BPI]; - + /* Process remaining plaintext and compute its tag contribution */ unsigned remaining = ((unsigned)ct_len) % (BPI*16); k = 0; /* How many blocks in ta[] need ECBing */ @@ -1176,7 +1200,7 @@ case 1: ptp[0] = xor_block(ta[0], oa[0]); checksum = xor_block(checksum, ptp[0]); } - + /* Calculate expected tag */ offset = xor_block(offset, ctx->Ldollar); tmp.bl = xor_block(offset, checksum); @@ -1194,10 +1218,10 @@ int len = ctx->tag_len; #endif if (tag) { - if (memcmp(tag,tmp.u8,len) != 0) + if (constant_time_memcmp(tag,tmp.u8,len) != 0) ct_len = AE_INVALID; } else { - if (memcmp((char *)ct + ct_len,tmp.u8,len) != 0) + if (constant_time_memcmp((char *)ct + ct_len,tmp.u8,len) != 0) ct_len = AE_INVALID; } } @@ -1205,10 +1229,168 @@ return ct_len; } +/* ----------------------------------------------------------------------- */ +/* Simple test program */ +/* ----------------------------------------------------------------------- */ + +#if defined(OCB_TEST_PROGRAM) + +#include +#include + +#if __GNUC__ + #define ALIGN(n) __attribute__ ((aligned(n))) +#elif _MSC_VER + #define ALIGN(n) __declspec(align(n)) +#else /* Not GNU/Microsoft: delete alignment uses. */ + #define ALIGN(n) +#endif + +static void pbuf(void *p, unsigned len, const void *s) +{ + unsigned i; + if (s) + printf("%s", (char *)s); + for (i = 0; i < len; i++) + printf("%02X", (unsigned)(((unsigned char *)p)[i])); + printf("\n"); +} + +static void vectors(ae_ctx *ctx, int len) +{ + ALIGN(16) uint8_t pt[128]; + ALIGN(16) uint8_t ct[144]; + ALIGN(16) uint8_t nonce[] = {0,1,2,3,4,5,6,7,8,9,10,11}; + int i; + for (i=0; i < 128; i++) pt[i] = i; + i = ae_encrypt(ctx,nonce,pt,len,pt,len,ct,NULL,AE_FINALIZE); + printf("P=%d,A=%d: ",len,len); pbuf(ct, i, NULL); + i = ae_encrypt(ctx,nonce,pt,0,pt,len,ct,NULL,AE_FINALIZE); + printf("P=%d,A=%d: ",0,len); pbuf(ct, i, NULL); + i = ae_encrypt(ctx,nonce,pt,len,pt,0,ct,NULL,AE_FINALIZE); + printf("P=%d,A=%d: ",len,0); pbuf(ct, i, NULL); +} + +void validate() +{ + ALIGN(16) uint8_t pt[1024]; + ALIGN(16) uint8_t ct[1024]; + ALIGN(16) uint8_t tag[16]; + ALIGN(16) uint8_t nonce[12] = {0,}; + ALIGN(16) uint8_t key[32] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}; + ALIGN(16) uint8_t valid[] = {0xB2,0xB4,0x1C,0xBF,0x9B,0x05,0x03,0x7D, + 0xA7,0xF1,0x6C,0x24,0xA3,0x5C,0x1C,0x94}; + ae_ctx ctx; + uint8_t *val_buf, *next; + int i, len; + + val_buf = (uint8_t *)malloc(22400 + 16); + next = val_buf = (uint8_t *)(((size_t)val_buf + 16) & ~((size_t)15)); + + if (0) { + ae_init(&ctx, key, 16, 12, 16); + /* pbuf(&ctx, sizeof(ctx), "CTX: "); */ + vectors(&ctx,0); + vectors(&ctx,8); + vectors(&ctx,16); + vectors(&ctx,24); + vectors(&ctx,32); + vectors(&ctx,40); + } + + memset(key,0,32); + memset(pt,0,128); + ae_init(&ctx, key, 16, 12, 16); + + /* RFC Vector test */ + for (i = 0; i < 128; i++) { + int first = ((i/3)/(BPI*16))*(BPI*16); + int second = first; + int third = i - (first + second); + + nonce[11] = i; + + if (0) { + ae_encrypt(&ctx,nonce,pt,i,pt,i,ct,NULL,AE_FINALIZE); + memcpy(next,ct,(size_t)i+16); + next = next+i+16; + + ae_encrypt(&ctx,nonce,pt,i,pt,0,ct,NULL,AE_FINALIZE); + memcpy(next,ct,(size_t)i+16); + next = next+i+16; + + ae_encrypt(&ctx,nonce,pt,0,pt,i,ct,NULL,AE_FINALIZE); + memcpy(next,ct,16); + next = next+16; + } else { + ae_encrypt(&ctx,nonce,pt,first,pt,first,ct,NULL,AE_PENDING); + ae_encrypt(&ctx,NULL,pt+first,second,pt+first,second,ct+first,NULL,AE_PENDING); + ae_encrypt(&ctx,NULL,pt+first+second,third,pt+first+second,third,ct+first+second,NULL,AE_FINALIZE); + memcpy(next,ct,(size_t)i+16); + next = next+i+16; + + ae_encrypt(&ctx,nonce,pt,first,pt,0,ct,NULL,AE_PENDING); + ae_encrypt(&ctx,NULL,pt+first,second,pt,0,ct+first,NULL,AE_PENDING); + ae_encrypt(&ctx,NULL,pt+first+second,third,pt,0,ct+first+second,NULL,AE_FINALIZE); + memcpy(next,ct,(size_t)i+16); + next = next+i+16; + + ae_encrypt(&ctx,nonce,pt,0,pt,first,ct,NULL,AE_PENDING); + ae_encrypt(&ctx,NULL,pt,0,pt+first,second,ct,NULL,AE_PENDING); + ae_encrypt(&ctx,NULL,pt,0,pt+first+second,third,ct,NULL,AE_FINALIZE); + memcpy(next,ct,16); + next = next+16; + } + + } + nonce[11] = 0; + ae_encrypt(&ctx,nonce,NULL,0,val_buf,next-val_buf,ct,tag,AE_FINALIZE); + pbuf(tag,16,0); + if (memcmp(valid,tag,16) == 0) + printf("Vectors: PASS\n"); + else + printf("Vectors: FAIL\n"); + + + /* Encrypt/Decrypt test */ + for (i = 0; i < 128; i++) { + int first = ((i/3)/(BPI*16))*(BPI*16); + int second = first; + int third = i - (first + second); + + nonce[11] = i%128; + + if (1) { + len = ae_encrypt(&ctx,nonce,val_buf,i,val_buf,i,ct,tag,AE_FINALIZE); + len = ae_encrypt(&ctx,nonce,val_buf,i,val_buf,-1,ct,tag,AE_FINALIZE); + len = ae_decrypt(&ctx,nonce,ct,len,val_buf,-1,pt,tag,AE_FINALIZE); + if (len == -1) { printf("Authentication error: %d\n", i); return; } + if (len != i) { printf("Length error: %d\n", i); return; } + if (memcmp(val_buf,pt,i)) { printf("Decrypt error: %d\n", i); return; } + } else { + len = ae_encrypt(&ctx,nonce,val_buf,i,val_buf,i,ct,NULL,AE_FINALIZE); + ae_decrypt(&ctx,nonce,ct,first,val_buf,first,pt,NULL,AE_PENDING); + ae_decrypt(&ctx,NULL,ct+first,second,val_buf+first,second,pt+first,NULL,AE_PENDING); + len = ae_decrypt(&ctx,NULL,ct+first+second,len-(first+second),val_buf+first+second,third,pt+first+second,NULL,AE_FINALIZE); + if (len == -1) { printf("Authentication error: %d\n", i); return; } + if (memcmp(val_buf,pt,i)) { printf("Decrypt error: %d\n", i); return; } + } + + } + printf("Decrypt: PASS\n"); +} + +int main() +{ + validate(); + return 0; +} +#endif + #if USE_AES_NI -char infoString[] = "OCB (AES-NI)"; +char infoString[] = "OCB3 (AES-NI)"; #elif USE_REFERENCE_AES -char infoString[] = "OCB (Reference AES)"; +char infoString[] = "OCB3 (Reference)"; #elif USE_OPENSSL_AES -char infoString[] = "OCB (OpenSSL AES)"; +char infoString[] = "OCB3 (OpenSSL)"; #endif diff -Nru mosh-1.2.2/src/crypto/prng.h mosh-1.2.4a/src/crypto/prng.h --- mosh-1.2.2/src/crypto/prng.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/crypto/prng.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,16 +14,28 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef PRNG_HPP #define PRNG_HPP #include -#include -#include -#include #include +#include #include "crypto.h" @@ -37,32 +49,22 @@ class PRNG { private: - FILE *randfile; + std::ifstream randfile; /* unimplemented to satisfy -Weffc++ */ PRNG( const PRNG & ); PRNG & operator=( const PRNG & ); public: - PRNG() : randfile( fopen( rdev, "rb" ) ) - { - if ( randfile == NULL ) { - throw CryptoException( std::string( rdev ) + ": " + strerror( errno ) ); - } - } - - ~PRNG() { - if ( 0 != fclose( randfile ) ) { - throw CryptoException( std::string( rdev ) + ": " + strerror( errno ) ); - } - } + PRNG() : randfile( rdev, std::ifstream::in | std::ifstream::binary ) {} void fill( void *dest, size_t size ) { if ( 0 == size ) { return; } - if ( 1 != fread( dest, size, 1, randfile ) ) { + randfile.read( static_cast( dest ), size ); + if ( !randfile ) { throw CryptoException( "Could not read from " + std::string( rdev ) ); } } diff -Nru mosh-1.2.2/src/crypto/rijndael-alg-fst.cc mosh-1.2.4a/src/crypto/rijndael-alg-fst.cc --- mosh-1.2.2/src/crypto/rijndael-alg-fst.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/crypto/rijndael-alg-fst.cc 1970-01-01 00:00:00.000000000 +0000 @@ -1,1400 +0,0 @@ -/** - * rijndael-alg-fst.c - * - * @version 3.0 (December 2000) - * - * Optimised ANSI C code for the Rijndael cipher (now AES) - * - * @author Vincent Rijmen - * @author Antoon Bosselaers - * @author Paulo Barreto - * - * This code is hereby placed in the public domain. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 AUTHORS OR CONTRIBUTORS 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. - */ -#include -#include - -#include "rijndael-alg-fst.h" - -/* -Te0[x] = S [x].[02, 01, 01, 03]; -Te1[x] = S [x].[03, 02, 01, 01]; -Te2[x] = S [x].[01, 03, 02, 01]; -Te3[x] = S [x].[01, 01, 03, 02]; -Te4[x] = S [x].[01, 01, 01, 01]; - -Td0[x] = Si[x].[0e, 09, 0d, 0b]; -Td1[x] = Si[x].[0b, 0e, 09, 0d]; -Td2[x] = Si[x].[0d, 0b, 0e, 09]; -Td3[x] = Si[x].[09, 0d, 0b, 0e]; -Td4[x] = Si[x].[01, 01, 01, 01]; -*/ - -static const u32 Te0[256] = { - 0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU, - 0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U, - 0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU, - 0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU, - 0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U, - 0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU, - 0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU, - 0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU, - 0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU, - 0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU, - 0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U, - 0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU, - 0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU, - 0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U, - 0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU, - 0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU, - 0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU, - 0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU, - 0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU, - 0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U, - 0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU, - 0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU, - 0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU, - 0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU, - 0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U, - 0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U, - 0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U, - 0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U, - 0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU, - 0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U, - 0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U, - 0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU, - 0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU, - 0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U, - 0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U, - 0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U, - 0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU, - 0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U, - 0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU, - 0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U, - 0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU, - 0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U, - 0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U, - 0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU, - 0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U, - 0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U, - 0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U, - 0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U, - 0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U, - 0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U, - 0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U, - 0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U, - 0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU, - 0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U, - 0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U, - 0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U, - 0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U, - 0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U, - 0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U, - 0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU, - 0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U, - 0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U, - 0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U, - 0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU, -}; -static const u32 Te1[256] = { - 0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU, - 0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U, - 0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU, - 0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U, - 0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU, - 0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U, - 0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU, - 0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U, - 0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U, - 0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU, - 0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U, - 0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U, - 0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U, - 0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU, - 0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U, - 0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U, - 0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU, - 0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U, - 0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U, - 0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U, - 0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU, - 0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU, - 0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U, - 0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU, - 0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU, - 0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U, - 0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU, - 0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U, - 0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU, - 0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U, - 0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U, - 0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U, - 0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU, - 0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U, - 0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU, - 0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U, - 0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU, - 0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U, - 0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U, - 0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU, - 0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU, - 0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU, - 0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U, - 0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U, - 0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU, - 0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U, - 0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU, - 0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U, - 0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU, - 0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U, - 0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU, - 0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU, - 0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U, - 0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU, - 0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U, - 0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU, - 0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U, - 0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U, - 0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U, - 0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU, - 0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU, - 0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U, - 0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU, - 0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U, -}; -static const u32 Te2[256] = { - 0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU, - 0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U, - 0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU, - 0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U, - 0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU, - 0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U, - 0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU, - 0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U, - 0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U, - 0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU, - 0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U, - 0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U, - 0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U, - 0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU, - 0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U, - 0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U, - 0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU, - 0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U, - 0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U, - 0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U, - 0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU, - 0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU, - 0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U, - 0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU, - 0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU, - 0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U, - 0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU, - 0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U, - 0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU, - 0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U, - 0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U, - 0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U, - 0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU, - 0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U, - 0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU, - 0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U, - 0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU, - 0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U, - 0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U, - 0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU, - 0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU, - 0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU, - 0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U, - 0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U, - 0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU, - 0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U, - 0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU, - 0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U, - 0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU, - 0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U, - 0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU, - 0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU, - 0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U, - 0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU, - 0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U, - 0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU, - 0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U, - 0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U, - 0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U, - 0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU, - 0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU, - 0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U, - 0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU, - 0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U, -}; -static const u32 Te3[256] = { - - 0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U, - 0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U, - 0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U, - 0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU, - 0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU, - 0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU, - 0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U, - 0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU, - 0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU, - 0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U, - 0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U, - 0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU, - 0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU, - 0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU, - 0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU, - 0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU, - 0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U, - 0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU, - 0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU, - 0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U, - 0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U, - 0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U, - 0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U, - 0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U, - 0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU, - 0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U, - 0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU, - 0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU, - 0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U, - 0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U, - 0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U, - 0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU, - 0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U, - 0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU, - 0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU, - 0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U, - 0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U, - 0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU, - 0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U, - 0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU, - 0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U, - 0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U, - 0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U, - 0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U, - 0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU, - 0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U, - 0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU, - 0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U, - 0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU, - 0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U, - 0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU, - 0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU, - 0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU, - 0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU, - 0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U, - 0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U, - 0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U, - 0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U, - 0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U, - 0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U, - 0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU, - 0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U, - 0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU, - 0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU, -}; -static const u32 Te4[256] = { - 0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU, - 0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U, - 0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU, - 0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U, - 0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU, - 0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U, - 0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU, - 0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U, - 0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U, - 0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU, - 0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U, - 0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U, - 0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U, - 0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU, - 0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U, - 0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U, - 0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU, - 0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U, - 0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U, - 0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U, - 0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU, - 0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU, - 0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U, - 0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU, - 0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU, - 0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U, - 0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU, - 0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U, - 0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU, - 0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U, - 0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U, - 0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U, - 0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU, - 0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U, - 0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU, - 0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U, - 0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU, - 0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U, - 0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U, - 0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU, - 0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU, - 0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU, - 0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U, - 0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U, - 0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU, - 0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U, - 0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU, - 0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U, - 0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU, - 0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U, - 0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU, - 0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU, - 0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U, - 0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU, - 0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U, - 0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU, - 0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U, - 0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U, - 0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U, - 0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU, - 0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU, - 0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U, - 0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU, - 0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U, -}; -static const u32 Td0[256] = { - 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U, - 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U, - 0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U, - 0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU, - 0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U, - 0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U, - 0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU, - 0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U, - 0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU, - 0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U, - 0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U, - 0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U, - 0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U, - 0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU, - 0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U, - 0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU, - 0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U, - 0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU, - 0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U, - 0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U, - 0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U, - 0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU, - 0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U, - 0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU, - 0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U, - 0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU, - 0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U, - 0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU, - 0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU, - 0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U, - 0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU, - 0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U, - 0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU, - 0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U, - 0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U, - 0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U, - 0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU, - 0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U, - 0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U, - 0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU, - 0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U, - 0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U, - 0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U, - 0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U, - 0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U, - 0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU, - 0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U, - 0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U, - 0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U, - 0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U, - 0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U, - 0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU, - 0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU, - 0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU, - 0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU, - 0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U, - 0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U, - 0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU, - 0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU, - 0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U, - 0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU, - 0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U, - 0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U, - 0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U, -}; -static const u32 Td1[256] = { - 0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU, - 0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U, - 0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU, - 0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U, - 0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U, - 0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U, - 0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U, - 0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U, - 0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U, - 0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU, - 0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU, - 0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU, - 0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U, - 0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU, - 0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U, - 0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U, - 0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U, - 0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU, - 0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU, - 0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U, - 0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU, - 0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U, - 0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU, - 0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU, - 0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U, - 0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U, - 0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U, - 0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU, - 0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U, - 0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU, - 0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U, - 0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U, - 0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U, - 0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU, - 0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U, - 0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U, - 0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U, - 0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U, - 0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U, - 0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U, - 0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU, - 0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU, - 0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U, - 0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU, - 0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U, - 0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU, - 0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU, - 0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U, - 0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU, - 0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U, - 0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U, - 0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U, - 0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U, - 0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U, - 0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U, - 0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U, - 0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU, - 0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U, - 0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U, - 0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU, - 0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U, - 0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U, - 0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U, - 0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U, -}; -static const u32 Td2[256] = { - 0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U, - 0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U, - 0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U, - 0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U, - 0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU, - 0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U, - 0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U, - 0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U, - 0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U, - 0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU, - 0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U, - 0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U, - 0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU, - 0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U, - 0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U, - 0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U, - 0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U, - 0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U, - 0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U, - 0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU, - - 0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U, - 0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U, - 0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U, - 0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U, - 0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U, - 0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU, - 0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU, - 0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U, - 0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU, - 0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U, - 0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU, - 0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU, - 0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU, - 0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU, - 0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U, - 0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U, - 0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U, - 0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U, - 0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U, - 0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U, - 0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U, - 0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU, - 0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU, - 0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U, - 0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U, - 0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU, - 0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU, - 0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U, - 0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U, - 0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U, - 0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U, - 0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U, - 0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U, - 0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U, - 0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU, - 0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U, - 0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U, - 0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U, - 0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U, - 0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U, - 0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U, - 0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU, - 0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U, - 0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U, -}; -static const u32 Td3[256] = { - 0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU, - 0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU, - 0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U, - 0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U, - 0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU, - 0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU, - 0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U, - 0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU, - 0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U, - 0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU, - 0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U, - 0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U, - 0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U, - 0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U, - 0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U, - 0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU, - 0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU, - 0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U, - 0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U, - 0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU, - 0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU, - 0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U, - 0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U, - 0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U, - 0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U, - 0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU, - 0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U, - 0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U, - 0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU, - 0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU, - 0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U, - 0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U, - 0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U, - 0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU, - 0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U, - 0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U, - 0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U, - 0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U, - 0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U, - 0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U, - 0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U, - 0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU, - 0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U, - 0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U, - 0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU, - 0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU, - 0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U, - 0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU, - 0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U, - 0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U, - 0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U, - 0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U, - 0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U, - 0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U, - 0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU, - 0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU, - 0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU, - 0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU, - 0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U, - 0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U, - 0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U, - 0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU, - 0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U, - 0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U, -}; -static const u32 Td4[256] = { - 0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U, - 0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U, - 0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU, - 0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU, - 0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U, - 0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U, - 0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U, - 0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU, - 0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U, - 0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU, - 0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU, - 0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU, - 0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U, - 0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U, - 0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U, - 0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U, - 0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U, - 0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U, - 0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU, - 0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U, - 0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U, - 0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU, - 0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U, - 0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U, - 0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U, - 0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU, - 0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U, - 0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U, - 0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU, - 0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U, - 0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U, - 0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU, - 0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U, - 0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU, - 0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU, - 0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U, - 0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U, - 0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U, - 0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U, - 0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU, - 0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U, - 0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U, - 0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU, - 0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU, - 0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU, - 0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U, - 0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU, - 0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U, - 0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U, - 0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U, - 0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U, - 0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU, - 0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U, - 0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU, - 0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU, - 0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU, - 0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU, - 0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U, - 0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU, - 0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U, - 0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU, - 0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U, - 0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U, - 0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU, -}; -static const u32 rcon[] = { - 0x01000000, 0x02000000, 0x04000000, 0x08000000, - 0x10000000, 0x20000000, 0x40000000, 0x80000000, - 0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */ -}; - -#define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00) - -#ifdef _MSC_VER -#define GETU32(p) SWAP(*((u32 *)(p))) -#define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); } -#else -#define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3])) -#define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >> 8); (ct)[3] = (u8)(st); } -#endif - -/** - * Expand the cipher key into the encryption key schedule. - * - * @return the number of rounds for the given cipher key size. - */ -int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) { - int i = 0; - u32 temp; - - rk[0] = GETU32(cipherKey ); - rk[1] = GETU32(cipherKey + 4); - rk[2] = GETU32(cipherKey + 8); - rk[3] = GETU32(cipherKey + 12); - if (keyBits == 128) { - for (;;) { - temp = rk[3]; - rk[4] = rk[0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[5] = rk[1] ^ rk[4]; - rk[6] = rk[2] ^ rk[5]; - rk[7] = rk[3] ^ rk[6]; - if (++i == 10) { - return 10; - } - rk += 4; - } - } - rk[4] = GETU32(cipherKey + 16); - rk[5] = GETU32(cipherKey + 20); - if (keyBits == 192) { - for (;;) { - temp = rk[ 5]; - rk[ 6] = rk[ 0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[ 7] = rk[ 1] ^ rk[ 6]; - rk[ 8] = rk[ 2] ^ rk[ 7]; - rk[ 9] = rk[ 3] ^ rk[ 8]; - if (++i == 8) { - return 12; - } - rk[10] = rk[ 4] ^ rk[ 9]; - rk[11] = rk[ 5] ^ rk[10]; - rk += 6; - } - } - rk[6] = GETU32(cipherKey + 24); - rk[7] = GETU32(cipherKey + 28); - if (keyBits == 256) { - for (;;) { - temp = rk[ 7]; - rk[ 8] = rk[ 0] ^ - (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ - (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ - (Te4[(temp ) & 0xff] & 0x0000ff00) ^ - (Te4[(temp >> 24) ] & 0x000000ff) ^ - rcon[i]; - rk[ 9] = rk[ 1] ^ rk[ 8]; - rk[10] = rk[ 2] ^ rk[ 9]; - rk[11] = rk[ 3] ^ rk[10]; - if (++i == 7) { - return 14; - } - temp = rk[11]; - rk[12] = rk[ 4] ^ - (Te4[(temp >> 24) ] & 0xff000000) ^ - (Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(temp >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(temp ) & 0xff] & 0x000000ff); - rk[13] = rk[ 5] ^ rk[12]; - rk[14] = rk[ 6] ^ rk[13]; - rk[15] = rk[ 7] ^ rk[14]; - - rk += 8; - } - } - return 0; -} - -/** - * Expand the cipher key into the decryption key schedule. - * - * @return the number of rounds for the given cipher key size. - */ -int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) { - int Nr, i, j; - u32 temp; - - /* expand the cipher key: */ - Nr = rijndaelKeySetupEnc(rk, cipherKey, keyBits); - /* invert the order of the round keys: */ - for (i = 0, j = 4*Nr; i < j; i += 4, j -= 4) { - temp = rk[i ]; rk[i ] = rk[j ]; rk[j ] = temp; - temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp; - temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp; - temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp; - } - /* apply the inverse MixColumn transform to all round keys but the first and the last: */ - for (i = 1; i < Nr; i++) { - rk += 4; - rk[0] = - Td0[Te4[(rk[0] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[0] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[0] ) & 0xff] & 0xff]; - rk[1] = - Td0[Te4[(rk[1] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[1] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[1] ) & 0xff] & 0xff]; - rk[2] = - Td0[Te4[(rk[2] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[2] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[2] ) & 0xff] & 0xff]; - rk[3] = - Td0[Te4[(rk[3] >> 24) ] & 0xff] ^ - Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^ - Td2[Te4[(rk[3] >> 8) & 0xff] & 0xff] ^ - Td3[Te4[(rk[3] ) & 0xff] & 0xff]; - } - return Nr; -} - -void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]) { - u32 s0, s1, s2, s3, t0, t1, t2, t3; -#ifndef FULL_UNROLL - int r; -#endif /* ?FULL_UNROLL */ - - /* - * map byte array block to cipher state - * and add initial round key: - */ - s0 = GETU32(pt ) ^ rk[0]; - s1 = GETU32(pt + 4) ^ rk[1]; - s2 = GETU32(pt + 8) ^ rk[2]; - s3 = GETU32(pt + 12) ^ rk[3]; -#ifdef FULL_UNROLL - /* round 1: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7]; - /* round 2: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11]; - /* round 3: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15]; - /* round 4: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19]; - /* round 5: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23]; - /* round 6: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27]; - /* round 7: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31]; - /* round 8: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35]; - /* round 9: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39]; - if (Nr > 10) { - /* round 10: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43]; - /* round 11: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47]; - if (Nr > 12) { - /* round 12: */ - s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48]; - s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49]; - s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50]; - s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51]; - /* round 13: */ - t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52]; - t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53]; - t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54]; - t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55]; - } - } - rk += Nr << 2; -#else /* !FULL_UNROLL */ - /* - * Nr - 1 full rounds: - */ - r = Nr >> 1; - for (;;) { - t0 = - Te0[(s0 >> 24) ] ^ - Te1[(s1 >> 16) & 0xff] ^ - Te2[(s2 >> 8) & 0xff] ^ - Te3[(s3 ) & 0xff] ^ - rk[4]; - t1 = - Te0[(s1 >> 24) ] ^ - Te1[(s2 >> 16) & 0xff] ^ - Te2[(s3 >> 8) & 0xff] ^ - Te3[(s0 ) & 0xff] ^ - rk[5]; - t2 = - Te0[(s2 >> 24) ] ^ - Te1[(s3 >> 16) & 0xff] ^ - Te2[(s0 >> 8) & 0xff] ^ - Te3[(s1 ) & 0xff] ^ - rk[6]; - t3 = - Te0[(s3 >> 24) ] ^ - Te1[(s0 >> 16) & 0xff] ^ - Te2[(s1 >> 8) & 0xff] ^ - Te3[(s2 ) & 0xff] ^ - rk[7]; - - rk += 8; - if (--r == 0) { - break; - } - - s0 = - Te0[(t0 >> 24) ] ^ - Te1[(t1 >> 16) & 0xff] ^ - Te2[(t2 >> 8) & 0xff] ^ - Te3[(t3 ) & 0xff] ^ - rk[0]; - s1 = - Te0[(t1 >> 24) ] ^ - Te1[(t2 >> 16) & 0xff] ^ - Te2[(t3 >> 8) & 0xff] ^ - Te3[(t0 ) & 0xff] ^ - rk[1]; - s2 = - Te0[(t2 >> 24) ] ^ - Te1[(t3 >> 16) & 0xff] ^ - Te2[(t0 >> 8) & 0xff] ^ - Te3[(t1 ) & 0xff] ^ - rk[2]; - s3 = - Te0[(t3 >> 24) ] ^ - Te1[(t0 >> 16) & 0xff] ^ - Te2[(t1 >> 8) & 0xff] ^ - Te3[(t2 ) & 0xff] ^ - rk[3]; - } -#endif /* ?FULL_UNROLL */ - /* - * apply last round and - * map cipher state to byte array block: - */ - s0 = - (Te4[(t0 >> 24) ] & 0xff000000) ^ - (Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t3 ) & 0xff] & 0x000000ff) ^ - rk[0]; - PUTU32(ct , s0); - s1 = - (Te4[(t1 >> 24) ] & 0xff000000) ^ - (Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t0 ) & 0xff] & 0x000000ff) ^ - rk[1]; - PUTU32(ct + 4, s1); - s2 = - (Te4[(t2 >> 24) ] & 0xff000000) ^ - (Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t1 ) & 0xff] & 0x000000ff) ^ - rk[2]; - PUTU32(ct + 8, s2); - s3 = - (Te4[(t3 >> 24) ] & 0xff000000) ^ - (Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(t2 ) & 0xff] & 0x000000ff) ^ - rk[3]; - PUTU32(ct + 12, s3); -} - -void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16], u8 pt[16]) { - u32 s0, s1, s2, s3, t0, t1, t2, t3; -#ifndef FULL_UNROLL - int r; -#endif /* ?FULL_UNROLL */ - - /* - * map byte array block to cipher state - * and add initial round key: - */ - s0 = GETU32(ct ) ^ rk[0]; - s1 = GETU32(ct + 4) ^ rk[1]; - s2 = GETU32(ct + 8) ^ rk[2]; - s3 = GETU32(ct + 12) ^ rk[3]; -#ifdef FULL_UNROLL - /* round 1: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7]; - /* round 2: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11]; - /* round 3: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15]; - /* round 4: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19]; - /* round 5: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23]; - /* round 6: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27]; - /* round 7: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31]; - /* round 8: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35]; - /* round 9: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39]; - if (Nr > 10) { - /* round 10: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43]; - /* round 11: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47]; - if (Nr > 12) { - /* round 12: */ - s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48]; - s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49]; - s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50]; - s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51]; - /* round 13: */ - t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52]; - t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53]; - t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54]; - t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55]; - } - } - rk += Nr << 2; -#else /* !FULL_UNROLL */ - /* - * Nr - 1 full rounds: - */ - r = Nr >> 1; - for (;;) { - t0 = - Td0[(s0 >> 24) ] ^ - Td1[(s3 >> 16) & 0xff] ^ - Td2[(s2 >> 8) & 0xff] ^ - Td3[(s1 ) & 0xff] ^ - rk[4]; - t1 = - Td0[(s1 >> 24) ] ^ - Td1[(s0 >> 16) & 0xff] ^ - Td2[(s3 >> 8) & 0xff] ^ - Td3[(s2 ) & 0xff] ^ - rk[5]; - t2 = - Td0[(s2 >> 24) ] ^ - Td1[(s1 >> 16) & 0xff] ^ - Td2[(s0 >> 8) & 0xff] ^ - Td3[(s3 ) & 0xff] ^ - rk[6]; - t3 = - Td0[(s3 >> 24) ] ^ - Td1[(s2 >> 16) & 0xff] ^ - Td2[(s1 >> 8) & 0xff] ^ - Td3[(s0 ) & 0xff] ^ - rk[7]; - - rk += 8; - if (--r == 0) { - break; - } - - s0 = - Td0[(t0 >> 24) ] ^ - Td1[(t3 >> 16) & 0xff] ^ - Td2[(t2 >> 8) & 0xff] ^ - Td3[(t1 ) & 0xff] ^ - rk[0]; - s1 = - Td0[(t1 >> 24) ] ^ - Td1[(t0 >> 16) & 0xff] ^ - Td2[(t3 >> 8) & 0xff] ^ - Td3[(t2 ) & 0xff] ^ - rk[1]; - s2 = - Td0[(t2 >> 24) ] ^ - Td1[(t1 >> 16) & 0xff] ^ - Td2[(t0 >> 8) & 0xff] ^ - Td3[(t3 ) & 0xff] ^ - rk[2]; - s3 = - Td0[(t3 >> 24) ] ^ - Td1[(t2 >> 16) & 0xff] ^ - Td2[(t1 >> 8) & 0xff] ^ - Td3[(t0 ) & 0xff] ^ - rk[3]; - } -#endif /* ?FULL_UNROLL */ - /* - * apply last round and - * map cipher state to byte array block: - */ - s0 = - (Td4[(t0 >> 24) ] & 0xff000000) ^ - (Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t1 ) & 0xff] & 0x000000ff) ^ - rk[0]; - PUTU32(pt , s0); - s1 = - (Td4[(t1 >> 24) ] & 0xff000000) ^ - (Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t2 ) & 0xff] & 0x000000ff) ^ - rk[1]; - PUTU32(pt + 4, s1); - s2 = - (Td4[(t2 >> 24) ] & 0xff000000) ^ - (Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t3 ) & 0xff] & 0x000000ff) ^ - rk[2]; - PUTU32(pt + 8, s2); - s3 = - (Td4[(t3 >> 24) ] & 0xff000000) ^ - (Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(t0 ) & 0xff] & 0x000000ff) ^ - rk[3]; - PUTU32(pt + 12, s3); -} - -#ifdef INTERMEDIATE_VALUE_KAT - -void rijndaelEncryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds) { - int r; - u32 s0, s1, s2, s3, t0, t1, t2, t3; - - /* - * map byte array block to cipher state - * and add initial round key: - */ - s0 = GETU32(block ) ^ rk[0]; - s1 = GETU32(block + 4) ^ rk[1]; - s2 = GETU32(block + 8) ^ rk[2]; - s3 = GETU32(block + 12) ^ rk[3]; - rk += 4; - - /* - * Nr - 1 full rounds: - */ - for (r = (rounds < Nr ? rounds : Nr - 1); r > 0; r--) { - t0 = - Te0[(s0 >> 24) ] ^ - Te1[(s1 >> 16) & 0xff] ^ - Te2[(s2 >> 8) & 0xff] ^ - Te3[(s3 ) & 0xff] ^ - rk[0]; - t1 = - Te0[(s1 >> 24) ] ^ - Te1[(s2 >> 16) & 0xff] ^ - Te2[(s3 >> 8) & 0xff] ^ - Te3[(s0 ) & 0xff] ^ - rk[1]; - t2 = - Te0[(s2 >> 24) ] ^ - Te1[(s3 >> 16) & 0xff] ^ - Te2[(s0 >> 8) & 0xff] ^ - Te3[(s1 ) & 0xff] ^ - rk[2]; - t3 = - Te0[(s3 >> 24) ] ^ - Te1[(s0 >> 16) & 0xff] ^ - Te2[(s1 >> 8) & 0xff] ^ - Te3[(s2 ) & 0xff] ^ - rk[3]; - - s0 = t0; - s1 = t1; - s2 = t2; - s3 = t3; - rk += 4; - - } - - /* - * apply last round and - * map cipher state to byte array block: - */ - if (rounds == Nr) { - t0 = - (Te4[(s0 >> 24) ] & 0xff000000) ^ - (Te4[(s1 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(s2 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(s3 ) & 0xff] & 0x000000ff) ^ - rk[0]; - t1 = - (Te4[(s1 >> 24) ] & 0xff000000) ^ - (Te4[(s2 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(s3 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(s0 ) & 0xff] & 0x000000ff) ^ - rk[1]; - t2 = - (Te4[(s2 >> 24) ] & 0xff000000) ^ - (Te4[(s3 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(s0 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(s1 ) & 0xff] & 0x000000ff) ^ - rk[2]; - t3 = - (Te4[(s3 >> 24) ] & 0xff000000) ^ - (Te4[(s0 >> 16) & 0xff] & 0x00ff0000) ^ - (Te4[(s1 >> 8) & 0xff] & 0x0000ff00) ^ - (Te4[(s2 ) & 0xff] & 0x000000ff) ^ - rk[3]; - - s0 = t0; - s1 = t1; - s2 = t2; - s3 = t3; - } - - PUTU32(block , s0); - PUTU32(block + 4, s1); - PUTU32(block + 8, s2); - PUTU32(block + 12, s3); -} - -void rijndaelDecryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds) { - int r; - u32 s0, s1, s2, s3, t0, t1, t2, t3; - - /* - * map byte array block to cipher state - * and add initial round key: - */ - s0 = GETU32(block ) ^ rk[0]; - s1 = GETU32(block + 4) ^ rk[1]; - s2 = GETU32(block + 8) ^ rk[2]; - s3 = GETU32(block + 12) ^ rk[3]; - rk += 4; - - /* - * Nr - 1 full rounds: - */ - for (r = (rounds < Nr ? rounds : Nr) - 1; r > 0; r--) { - t0 = - Td0[(s0 >> 24) ] ^ - Td1[(s3 >> 16) & 0xff] ^ - Td2[(s2 >> 8) & 0xff] ^ - Td3[(s1 ) & 0xff] ^ - rk[0]; - t1 = - Td0[(s1 >> 24) ] ^ - Td1[(s0 >> 16) & 0xff] ^ - Td2[(s3 >> 8) & 0xff] ^ - Td3[(s2 ) & 0xff] ^ - rk[1]; - t2 = - Td0[(s2 >> 24) ] ^ - Td1[(s1 >> 16) & 0xff] ^ - Td2[(s0 >> 8) & 0xff] ^ - Td3[(s3 ) & 0xff] ^ - rk[2]; - t3 = - Td0[(s3 >> 24) ] ^ - Td1[(s2 >> 16) & 0xff] ^ - Td2[(s1 >> 8) & 0xff] ^ - Td3[(s0 ) & 0xff] ^ - rk[3]; - - s0 = t0; - s1 = t1; - s2 = t2; - s3 = t3; - rk += 4; - - } - - /* - * complete the last round and - * map cipher state to byte array block: - */ - t0 = - (Td4[(s0 >> 24) ] & 0xff000000) ^ - (Td4[(s3 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(s2 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(s1 ) & 0xff] & 0x000000ff); - t1 = - (Td4[(s1 >> 24) ] & 0xff000000) ^ - (Td4[(s0 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(s3 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(s2 ) & 0xff] & 0x000000ff); - t2 = - (Td4[(s2 >> 24) ] & 0xff000000) ^ - (Td4[(s1 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(s0 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(s3 ) & 0xff] & 0x000000ff); - t3 = - (Td4[(s3 >> 24) ] & 0xff000000) ^ - (Td4[(s2 >> 16) & 0xff] & 0x00ff0000) ^ - (Td4[(s1 >> 8) & 0xff] & 0x0000ff00) ^ - (Td4[(s0 ) & 0xff] & 0x000000ff); - - if (rounds == Nr) { - t0 ^= rk[0]; - t1 ^= rk[1]; - t2 ^= rk[2]; - t3 ^= rk[3]; - } - - PUTU32(block , t0); - PUTU32(block + 4, t1); - PUTU32(block + 8, t2); - PUTU32(block + 12, t3); -} - -#endif /* INTERMEDIATE_VALUE_KAT */ diff -Nru mosh-1.2.2/src/crypto/rijndael-alg-fst.h mosh-1.2.4a/src/crypto/rijndael-alg-fst.h --- mosh-1.2.2/src/crypto/rijndael-alg-fst.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/crypto/rijndael-alg-fst.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/** - * rijndael-alg-fst.h - * - * @version 3.0 (December 2000) - * - * Optimised ANSI C code for the Rijndael cipher (now AES) - * - * @author Vincent Rijmen - * @author Antoon Bosselaers - * @author Paulo Barreto - * - * This code is hereby placed in the public domain. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 AUTHORS OR CONTRIBUTORS 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. - */ -#ifndef __RIJNDAEL_ALG_FST_H -#define __RIJNDAEL_ALG_FST_H - -#define MAXKC (256/32) -#define MAXKB (256/8) -#define MAXNR 14 - -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; - -int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits); -int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits); -void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]); -void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16], u8 pt[16]); - -#ifdef INTERMEDIATE_VALUE_KAT -void rijndaelEncryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds); -void rijndaelDecryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds); -#endif /* INTERMEDIATE_VALUE_KAT */ - -#endif /* __RIJNDAEL_ALG_FST_H */ diff -Nru mosh-1.2.2/src/examples/Makefile.am mosh-1.2.4a/src/examples/Makefile.am --- mosh-1.2.2/src/examples/Makefile.am 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/examples/Makefile.am 2013-03-27 22:36:03.000000000 +0000 @@ -7,24 +7,24 @@ encrypt_SOURCES = encrypt.cc encrypt_CPPFLAGS = -I$(srcdir)/../crypto -encrypt_LDADD = ../crypto/libmoshcrypto.a +encrypt_LDADD = ../crypto/libmoshcrypto.a $(OPENSSL_LIBS) decrypt_SOURCES = decrypt.cc decrypt_CPPFLAGS = -I$(srcdir)/../crypto -decrypt_LDADD = ../crypto/libmoshcrypto.a +decrypt_LDADD = ../crypto/libmoshcrypto.a $(OPENSSL_LIBS) parse_SOURCES = parse.cc parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil +parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a $(LIBUTIL) termemu_SOURCES = termemu.cc termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs -termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(TINFO_LIBS) $(protobuf_LIBS) +termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a $(LIBUTIL) $(TINFO_LIBS) $(protobuf_LIBS) ntester_SOURCES = ntester.cc ntester_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs $(protobuf_CFLAGS) -ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a ../util/libmoshutil.a -lutil -lm $(protobuf_LIBS) +ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a ../util/libmoshutil.a $(LIBUTIL) -lm $(protobuf_LIBS) $(OPENSSL_LIBS) benchmark_SOURCES = benchmark.cc benchmark_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I../protobufs -I$(srcdir)/../frontend -I$(srcdir)/../crypto -I$(srcdir)/../network $(protobuf_CFLAGS) -benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(STDDJB_LDFLAGS) -lutil -lm $(TINFO_LIBS) $(protobuf_LIBS) +benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(STDDJB_LDFLAGS) $(LIBUTIL) -lm $(TINFO_LIBS) $(protobuf_LIBS) $(OPENSSL_LIBS) diff -Nru mosh-1.2.2/src/examples/benchmark.cc mosh-1.2.4a/src/examples/benchmark.cc --- mosh-1.2.2/src/examples/benchmark.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/examples/benchmark.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "config.h" diff -Nru mosh-1.2.2/src/examples/decrypt.cc mosh-1.2.4a/src/examples/decrypt.cc --- mosh-1.2.2/src/examples/decrypt.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/examples/decrypt.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,15 +14,25 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include -#include -#include -#include -#include -#include #include +#include #include "crypto.h" @@ -41,36 +51,17 @@ Session session( key ); /* Read input */ - char *input = NULL; - int total_size = 0; - - while ( 1 ) { - unsigned char buf[ 16384 ]; - ssize_t bytes_read = read( STDIN_FILENO, buf, 16384 ); - if ( bytes_read == 0 ) { /* EOF */ - break; - } else if ( bytes_read < 0 ) { - perror( "read" ); - exit( 1 ); - } else { - input = (char *)realloc( input, total_size + bytes_read ); - assert( input ); - memcpy( input + total_size, buf, bytes_read ); - total_size += bytes_read; - } - } - - string ciphertext( input, total_size ); - free( input ); + ostringstream input; + input << cin.rdbuf(); /* Decrypt message */ - Message message = session.decrypt( ciphertext ); + Message message = session.decrypt( input.str() ); fprintf( stderr, "Nonce = %ld\n", (long)message.nonce.val() ); cout << message.text; - } catch ( CryptoException e ) { + } catch ( const CryptoException &e ) { cerr << e.text << endl; exit( 1 ); } diff -Nru mosh-1.2.2/src/examples/encrypt.cc mosh-1.2.4a/src/examples/encrypt.cc --- mosh-1.2.2/src/examples/encrypt.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/examples/encrypt.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,15 +14,25 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include -#include -#include -#include -#include -#include #include +#include #include "crypto.h" @@ -42,36 +52,17 @@ Nonce nonce( myatoi( argv[ 1 ] ) ); /* Read input */ - char *input = NULL; - int total_size = 0; - - while ( 1 ) { - unsigned char buf[ 16384 ]; - ssize_t bytes_read = read( STDIN_FILENO, buf, 16384 ); - if ( bytes_read == 0 ) { /* EOF */ - break; - } else if ( bytes_read < 0 ) { - perror( "read" ); - exit( 1 ); - } else { - input = (char *)realloc( input, total_size + bytes_read ); - assert( input ); - memcpy( input + total_size, buf, bytes_read ); - total_size += bytes_read; - } - } - - string plaintext( input, total_size ); - free( input ); + ostringstream input; + input << cin.rdbuf(); /* Encrypt message */ - string ciphertext = session.encrypt( Message( nonce, plaintext ) ); + string ciphertext = session.encrypt( Message( nonce, input.str() ) ); cerr << "Key: " << key.printable_key() << endl; cout << ciphertext; - } catch ( CryptoException e ) { + } catch ( const CryptoException &e ) { cerr << e.text << endl; exit( 1 ); } diff -Nru mosh-1.2.2/src/examples/ntester.cc mosh-1.2.4a/src/examples/ntester.cc --- mosh-1.2.2/src/examples/ntester.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/examples/ntester.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -21,6 +35,7 @@ #include "user.h" #include "fatal_assert.h" +#include "pty_compat.h" #include "networktransport.cc" #include "select.h" @@ -50,7 +65,7 @@ } else { n = new Transport( me, remote, NULL, NULL ); } - } catch ( CryptoException e ) { + } catch ( const CryptoException &e ) { fprintf( stderr, "Fatal error: %s\n", e.text.c_str() ); exit( 1 ); } @@ -59,10 +74,14 @@ if ( server ) { Select &sel = Select::get_instance(); - sel.add_fd( n->fd() ); uint64_t last_num = n->get_remote_state_num(); while ( true ) { try { + sel.clear_fds(); + std::vector< int > fd_list( n->fds() ); + assert( fd_list.size() == 1 ); /* servers don't hop */ + int network_fd = fd_list.back(); + sel.add_fd( network_fd ); if ( sel.select( n->wait_time() ) < 0 ) { perror( "select" ); exit( 1 ); @@ -70,7 +89,7 @@ n->tick(); - if ( sel.read( n->fd() ) ) { + if ( sel.read( network_fd ) ) { n->recv(); if ( n->get_remote_state_num() != last_num ) { @@ -78,7 +97,7 @@ last_num = n->get_remote_state_num(); } } - } catch ( CryptoException e ) { + } catch ( const CryptoException &e ) { fprintf( stderr, "Cryptographic error: %s\n", e.text.c_str() ); } } @@ -101,10 +120,18 @@ } Select &sel = Select::get_instance(); - sel.add_fd( STDIN_FILENO ); - sel.add_fd( n->fd() ); while( true ) { + sel.clear_fds(); + sel.add_fd( STDIN_FILENO ); + + std::vector< int > fd_list( n->fds() ); + for ( std::vector< int >::const_iterator it = fd_list.begin(); + it != fd_list.end(); + it++ ) { + sel.add_fd( *it ); + } + try { if ( sel.select( n->wait_time() ) < 0 ) { perror( "select" ); @@ -118,13 +145,28 @@ n->get_current_state().push_back( Parser::UserByte( x ) ); } - if ( sel.read( n->fd() ) ) { + bool network_ready_to_read = false; + for ( std::vector< int >::const_iterator it = fd_list.begin(); + it != fd_list.end(); + it++ ) { + if ( sel.read( *it ) ) { + /* packet received from the network */ + /* we only read one socket each run */ + network_ready_to_read = true; + } + + if ( sel.error( *it ) ) { + break; + } + } + + if ( network_ready_to_read ) { n->recv(); } - } catch ( NetworkException e ) { + } catch ( const NetworkException &e ) { fprintf( stderr, "%s: %s\r\n", e.function.c_str(), strerror( e.the_errno ) ); break; - } catch ( CryptoException e ) { + } catch ( const CryptoException &e ) { fprintf( stderr, "Cryptographic error: %s\n", e.text.c_str() ); } } diff -Nru mosh-1.2.2/src/examples/parse.cc mosh-1.2.4a/src/examples/parse.cc --- mosh-1.2.2/src/examples/parse.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/examples/parse.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "config.h" @@ -42,6 +56,7 @@ #include "swrite.h" #include "locale_utils.h" #include "fatal_assert.h" +#include "pty_compat.h" #include "select.h" const size_t buf_size = 1024; diff -Nru mosh-1.2.2/src/examples/termemu.cc mosh-1.2.4a/src/examples/termemu.cc --- mosh-1.2.2/src/examples/termemu.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/examples/termemu.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "config.h" @@ -48,6 +62,7 @@ #include "completeterminal.h" #include "swrite.h" #include "fatal_assert.h" +#include "pty_compat.h" #include "locale_utils.h" #include "select.h" @@ -217,7 +232,7 @@ sel.add_fd( fd ); sel.add_signal( SIGWINCH ); - swrite( STDOUT_FILENO, Terminal::Emulator::open().c_str() ); + swrite( STDOUT_FILENO, display.open().c_str() ); int timeout = -1; @@ -300,5 +315,5 @@ std::string update = display.new_frame( true, state, complete.get_fb() ); swrite( STDOUT_FILENO, update.c_str() ); - swrite( STDOUT_FILENO, Terminal::Emulator::close().c_str() ); + swrite( STDOUT_FILENO, display.close().c_str() ); } diff -Nru mosh-1.2.2/src/frontend/Makefile.am mosh-1.2.4a/src/frontend/Makefile.am --- mosh-1.2.2/src/frontend/Makefile.am 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/frontend/Makefile.am 2013-03-27 22:36:03.000000000 +0000 @@ -1,9 +1,9 @@ -AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(OPENSSL_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) AM_LDFLAGS = $(HARDEN_LDFLAGS) -LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) +LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(OPENSSL_LIBS) -mosh_server_LDADD = $(LDADD) -lutil +mosh_server_LDADD = $(LDADD) $(LIBUTIL) bin_PROGRAMS = diff -Nru mosh-1.2.2/src/frontend/mosh-client.cc mosh-1.2.4a/src/frontend/mosh-client.cc --- mosh-1.2.2/src/frontend/mosh-client.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/frontend/mosh-client.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,21 +14,61 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "config.h" #include #include -#include +#include #include "stmclient.h" #include "crypto.h" #include "locale_utils.h" +#include "fatal_assert.h" -/* these need to be included last because of conflicting defines */ -#include -#include +/* These need to be included last because of conflicting defines. */ +/* + * stmclient.h includes termios.h, and that will break termio/termios pull in on Solaris. + * The solution is to include termio.h also. + * But Mac OS X doesn't have termio.h, so this needs a guard. + */ +#ifdef HAVE_TERMIO_H +#include +#endif + +#if defined HAVE_NCURSESW_CURSES_H +# include +# include +#elif defined HAVE_NCURSESW_H +# include +# include +#elif defined HAVE_NCURSES_CURSES_H +# include +# include +#elif defined HAVE_NCURSES_H +# include +# include +#elif defined HAVE_CURSES_H +# include +# include +#else +# error "SysV or X/Open-compatible Curses header file required" +#endif void usage( const char *argv0 ) { fprintf( stderr, "mosh-client (%s)\n", PACKAGE_STRING ); @@ -58,6 +98,9 @@ /* For security, make sure we don't dump core */ Crypto::disable_dumping_core(); + /* Detect edge case */ + fatal_assert( argc > 0 ); + /* Get arguments */ int opt; while ( (opt = getopt( argc, argv, "c" )) != -1 ) { @@ -132,10 +175,10 @@ try { client.main(); - } catch ( Network::NetworkException e ) { + } catch ( const Network::NetworkException &e ) { fprintf( stderr, "Network exception: %s: %s\r\n", e.function.c_str(), strerror( e.the_errno ) ); - } catch ( Crypto::CryptoException e ) { + } catch ( const Crypto::CryptoException &e ) { fprintf( stderr, "Crypto exception: %s\r\n", e.text.c_str() ); } diff -Nru mosh-1.2.2/src/frontend/mosh-server.cc mosh-1.2.4a/src/frontend/mosh-server.cc --- mosh-1.2.2/src/frontend/mosh-server.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/frontend/mosh-server.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "config.h" @@ -21,8 +35,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -36,21 +52,17 @@ #include #include #include -#include #include #include +#ifdef HAVE_UTMPX_H +#include +#endif + #ifdef HAVE_PATHS_H #include #endif -#include "completeterminal.h" -#include "swrite.h" -#include "user.h" -#include "fatal_assert.h" -#include "locale_utils.h" -#include "select.h" - #if HAVE_PTY_H #include #elif HAVE_UTIL_H @@ -61,6 +73,16 @@ #include #endif +#include "completeterminal.h" +#include "swrite.h" +#include "user.h" +#include "fatal_assert.h" +#include "locale_utils.h" +#include "pty_compat.h" +#include "select.h" +#include "timestamp.h" +#include "fatal_assert.h" + #ifndef _PATH_BSHELL #define _PATH_BSHELL "/bin/sh" #endif @@ -81,12 +103,13 @@ void print_usage( const char *argv0 ) { - fprintf( stderr, "Usage: %s new [-s] [-v] [-i LOCALADDR] [-p PORT] [-c COLORS] [-l NAME=VALUE] [-- COMMAND...]\n", argv0 ); + fprintf( stderr, "Usage: %s new [-s] [-v] [-i LOCALADDR] [-p PORT[:PORT2]] [-c COLORS] [-l NAME=VALUE] [-- COMMAND...]\n", argv0 ); } void print_motd( void ); void chdir_homedir( void ); bool motd_hushed( void ); +void warn_unattached( const string & ignore_entry ); /* Simple spinloop */ void spin( void ) @@ -99,20 +122,34 @@ req.tv_sec = 0; req.tv_nsec = 100000000; /* 0.1 sec */ nanosleep( &req, NULL ); + freeze_timestamp(); } } string get_SSH_IP( void ) { const char *SSH_CONNECTION = getenv( "SSH_CONNECTION" ); - fatal_assert( SSH_CONNECTION ); - char *SSH_writable = strdup( SSH_CONNECTION ); - fatal_assert( SSH_writable ); - strtok( SSH_writable, " " ); - strtok( NULL, " " ); - const char *local_interface_IP = strtok( NULL, " " ); - fatal_assert( local_interface_IP ); - return string( local_interface_IP ); + if ( !SSH_CONNECTION ) { /* Older sshds don't set this */ + fprintf( stderr, "Warning: SSH_CONNECTION not found; binding to any interface.\n" ); + return string( "0.0.0.0" ); + } + istringstream ss( SSH_CONNECTION ); + string dummy, local_interface_IP; + ss >> dummy >> dummy >> local_interface_IP; + if ( !ss ) { + fprintf( stderr, "Warning: Could not parse SSH_CONNECTION; binding to any interface.\n" ); + return string( "0.0.0.0" ); + } + + /* Strip IPv6 prefix. */ + const char IPv6_prefix[] = "::ffff:"; + + if ( ( local_interface_IP.length() > strlen( IPv6_prefix ) ) + && ( 0 == strncasecmp( local_interface_IP.c_str(), IPv6_prefix, strlen( IPv6_prefix ) ) ) ) { + return local_interface_IP.substr( strlen( IPv6_prefix ) ); + } + + return local_interface_IP; } int main( int argc, char *argv[] ) @@ -120,8 +157,12 @@ /* For security, make sure we don't dump core */ Crypto::disable_dumping_core(); - char *desired_ip = NULL; - char *desired_port = NULL; + /* Detect edge case */ + fatal_assert( argc > 0 ); + + const char *desired_ip = NULL; + string desired_ip_str; + const char *desired_port = NULL; string command_path; char **command_argv = NULL; int colors = 0; @@ -154,7 +195,8 @@ desired_port = optarg; break; case 's': - desired_ip = strdup( get_SSH_IP().c_str() ); + desired_ip_str = get_SSH_IP(); + desired_ip = desired_ip_str.c_str(); fatal_assert( desired_ip ); break; case 'c': @@ -192,9 +234,9 @@ exit( 1 ); } - if ( desired_port - && ( strspn( desired_port, "0123456789" ) != strlen( desired_port ) ) ) { - fprintf( stderr, "%s: Bad UDP port (%s)\n", argv[ 0 ], desired_port ); + int dpl, dph; + if ( desired_port && ! Connection::parse_portrange( desired_port, dpl, dph ) ) { + fprintf( stderr, "%s: Bad UDP port range (%s)\n", argv[ 0 ], desired_port ); print_usage( argv[ 0 ] ); exit( 1 ); } @@ -203,6 +245,7 @@ /* Get shell */ char *my_argv[ 2 ]; + string shell_name; if ( !command_argv ) { /* get shell name */ struct passwd *pw = getpwuid( geteuid() ); @@ -218,8 +261,6 @@ command_path = shell_path; - string shell_name; - size_t shell_slash( shell_path.rfind('/') ); if ( shell_slash == string::npos ) { shell_name = shell_path; @@ -230,7 +271,7 @@ /* prepend '-' to make login shell */ shell_name = '-' + shell_name; - my_argv[ 0 ] = strdup( shell_name.c_str() ); + my_argv[ 0 ] = const_cast( shell_name.c_str() ); my_argv[ 1 ] = NULL; command_argv = my_argv; @@ -294,7 +335,7 @@ struct winsize window_size; if ( ioctl( STDIN_FILENO, TIOCGWINSZ, &window_size ) < 0 ) { perror( "ioctl TIOCGWINSZ" ); - fprintf( stderr, "If running with ssh, please use -t argument to provide a PTY.\n" ); + fprintf( stderr, "If running with ssh, please use ssh -t to provide a PTY.\n" ); exit( 1 ); } @@ -336,10 +377,6 @@ _exit( 0 ); } - if ( setsid() < 0 ) { - perror( "setsid" ); - } - fprintf( stderr, "\nmosh-server (%s)\n", PACKAGE_STRING ); fprintf( stderr, "Copyright 2012 Keith Winstein \n" ); fprintf( stderr, "License GPLv3+: GNU GPL version 3 or later .\nThis is free software: you are free to change and redistribute it.\nThere is NO WARRANTY, to the extent permitted by law.\n\n" ); @@ -361,11 +398,30 @@ /* close file descriptors */ if ( !verbose ) { /* Necessary to properly detach on old versions of sshd (e.g. RHEL/CentOS 5.0). */ - fclose( stdin ); - fclose( stdout ); - fclose( stderr ); + int nullfd; + + nullfd = open( "/dev/null", O_RDWR ); + if ( nullfd == -1 ) { + perror( "open" ); + exit( 1 ); + } + + if ( dup2 ( nullfd, STDIN_FILENO ) < 0 || + dup2 ( nullfd, STDOUT_FILENO ) < 0 || + dup2 ( nullfd, STDERR_FILENO ) < 0 ) { + perror( "dup2" ); + exit( 1 ); + } + + if ( close( nullfd ) < 0 ) { + perror( "close" ); + exit( 1 ); + } } + char utmp_entry[ 64 ] = { 0 }; + snprintf( utmp_entry, 64, "mosh [%d]", getpid() ); + /* Fork child process */ pid_t child = forkpty( &master, NULL, &child_termios, &window_size ); @@ -377,11 +433,6 @@ if ( child == 0 ) { /* child */ - /* reopen stdio */ - stdin = fdopen( STDIN_FILENO, "r" ); - stdout = fdopen( STDOUT_FILENO, "w" ); - stderr = fdopen( STDERR_FILENO, "w" ); - /* reenable signals */ struct sigaction sa; sa.sa_handler = SIG_DFL; @@ -418,6 +469,7 @@ if ( with_motd && (!motd_hushed()) ) { print_motd(); + warn_unattached( utmp_entry ); } Crypto::reenable_dumping_core(); @@ -429,12 +481,10 @@ } else { /* parent */ - #ifdef HAVE_UTEMPTER +#ifdef HAVE_UTEMPTER /* make utmp entry */ - char tmp[ 64 ]; - snprintf( tmp, 64, "mosh [%d]", getpid() ); - utempter_add_record( master, tmp ); - #endif + utempter_add_record( master, utmp_entry ); +#endif try { serve( master, terminal, *network ); @@ -467,8 +517,6 @@ { /* prepare to poll for events */ Select &sel = Select::get_instance(); - sel.add_fd( network.fd() ); - sel.add_fd( host_fd ); sel.add_signal( SIGTERM ); sel.add_signal( SIGINT ); @@ -487,8 +535,19 @@ const int timeout_if_no_client = 60000; int timeout = min( network.wait_time(), terminal.wait_time( now ) ); - if ( !network.has_remote_addr() ) { - timeout = min( timeout, timeout_if_no_client ); + if ( (!network.get_remote_state_num()) + || network.shutdown_in_progress() ) { + timeout = min( timeout, 5000 ); + } + + /* poll for events */ + sel.clear_fds(); + std::vector< int > fd_list( network.fds() ); + assert( fd_list.size() == 1 ); /* servers don't hop */ + int network_fd = fd_list.back(); + sel.add_fd( network_fd ); + if ( !network.shutdown_in_progress() ) { + sel.add_fd( host_fd ); } int active_fds = sel.select( timeout ); @@ -500,7 +559,7 @@ now = Network::timestamp(); uint64_t time_since_remote_state = now - network.get_latest_remote_state().timestamp; - if ( sel.read( network.fd() ) ) { + if ( sel.read( network_fd ) ) { /* packet received from the network */ network.recv(); @@ -565,7 +624,7 @@ } } - if ( sel.read( host_fd ) ) { + if ( (!network.shutdown_in_progress()) && sel.read( host_fd ) ) { /* input from the host needs to be fed to the terminal */ const int buf_size = 16384; char buf[ buf_size ]; @@ -576,24 +635,17 @@ /* If the pty slave is closed, reading from the master can fail with EIO (see #264). So we treat errors on read() like EOF. */ if ( bytes_read <= 0 ) { - bytes_read = 0; - if ( !network.has_remote_addr() ) { - spin(); /* let 60-second timer take care of this */ - } else if ( !network.shutdown_in_progress() ) { - network.start_shutdown(); - } - } - - string terminal_to_host = terminal.act( string( buf, bytes_read ) ); + network.start_shutdown(); + } else { + string terminal_to_host = terminal.act( string( buf, bytes_read ) ); - /* update client with new state of terminal */ - if ( !network.shutdown_in_progress() ) { + /* update client with new state of terminal */ network.set_current_state( terminal ); - } - /* write any writeback octets back to the host */ - if ( swrite( host_fd, terminal_to_host.c_str(), terminal_to_host.length() ) < 0 ) { - break; + /* write any writeback octets back to the host */ + if ( swrite( host_fd, terminal_to_host.c_str(), terminal_to_host.length() ) < 0 ) { + break; + } } } @@ -606,18 +658,14 @@ } } - if ( sel.error( network.fd() ) ) { + if ( sel.error( network_fd ) ) { /* network problem */ break; } - if ( sel.error( host_fd ) ) { + if ( (!network.shutdown_in_progress()) && sel.error( host_fd ) ) { /* host problem */ - if ( network.has_remote_addr() ) { - network.start_shutdown(); - } else { - spin(); /* let 60-second timer take care of this */ - } + network.start_shutdown(); } /* quit if our shutdown has been acknowledged */ @@ -636,9 +684,9 @@ } #ifdef HAVE_UTEMPTER - /* update utmp if has been more than 10 seconds since heard from client */ + /* update utmp if has been more than 30 seconds since heard from client */ if ( connected_utmp ) { - if ( time_since_remote_state > 10000 ) { + if ( time_since_remote_state > 30000 ) { utempter_remove_record( host_fd ); char tmp[ 64 ]; @@ -657,7 +705,7 @@ } } - if ( !network.has_remote_addr() + if ( !network.get_remote_state_num() && time_since_remote_state >= uint64_t( timeout_if_no_client ) ) { fprintf( stderr, "No connection within %d seconds.\n", timeout_if_no_client / 1000 ); @@ -708,7 +756,7 @@ struct passwd *pw = getpwuid( geteuid() ); if ( pw == NULL ) { perror( "getpwuid" ); - /* non-fatal */ + return; /* non-fatal */ } if ( chdir( pw->pw_dir ) < 0 ) { @@ -726,3 +774,75 @@ struct stat buf; return (0 == lstat( ".hushlogin", &buf )); } + +bool device_exists( const char *ut_line ) +{ + string device_name = string( "/dev/" ) + string( ut_line ); + struct stat buf; + return (0 == lstat( device_name.c_str(), &buf )); +} + +string mosh_read_line( FILE *file ) +{ + string ret; + while ( !feof( file ) ) { + char next = getc( file ); + if ( next == '\n' ) { + return ret; + } + ret.push_back( next ); + } + return ret; +} + +void warn_unattached( const string & ignore_entry ) +{ +#ifdef HAVE_UTMPX_H + /* get username */ + const struct passwd *pw = getpwuid( geteuid() ); + if ( pw == NULL ) { + perror( "getpwuid" ); + /* non-fatal */ + return; + } + + const string username( pw->pw_name ); + + /* look for unattached sessions */ + vector< string > unattached_mosh_servers; + + while ( struct utmpx *entry = getutxent() ) { + if ( (entry->ut_type == USER_PROCESS) + && (username == string( entry->ut_user )) ) { + /* does line show unattached mosh session */ + string text( entry->ut_host ); + if ( (text.size() >= 5) + && (text.substr( 0, 5 ) == "mosh ") + && (text[ text.size() - 1 ] == ']') + && (text != ignore_entry) + && device_exists( entry->ut_line ) ) { + unattached_mosh_servers.push_back( text ); + } + } + } + + /* print out warning if necessary */ + if ( unattached_mosh_servers.empty() ) { + return; + } else if ( unattached_mosh_servers.size() == 1 ) { + printf( "\033[37;44mMosh: You have a detached Mosh session on this server (%s).\033[m\n\n", + unattached_mosh_servers.front().c_str() ); + } else { + string pid_string; + + for ( vector< string >::const_iterator it = unattached_mosh_servers.begin(); + it != unattached_mosh_servers.end(); + it++ ) { + pid_string += " - " + *it + "\n"; + } + + printf( "\033[37;44mMosh: You have %d detached Mosh sessions on this server, with PIDs:\n%s\033[m\n", + (int)unattached_mosh_servers.size(), pid_string.c_str() ); + } +#endif /* HAVE_UTMPX_H */ +} diff -Nru mosh-1.2.2/src/frontend/stmclient.cc mosh-1.2.4a/src/frontend/stmclient.cc --- mosh-1.2.2/src/frontend/stmclient.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/frontend/stmclient.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "config.h" @@ -42,10 +56,27 @@ #include "user.h" #include "fatal_assert.h" #include "locale_utils.h" +#include "pty_compat.h" #include "select.h" +#include "timestamp.h" #include "networktransport.cc" +void STMClient::resume( void ) +{ + /* Restore termios state */ + if ( tcsetattr( STDIN_FILENO, TCSANOW, &raw_termios ) < 0 ) { + perror( "tcsetattr" ); + exit( 1 ); + } + + /* Put terminal in application-cursor-key mode */ + swrite( STDOUT_FILENO, display.open().c_str() ); + + /* Flag that outer terminal state is unknown */ + repaint_requested = true; +} + void STMClient::init( void ) { if ( !is_utf8_locale() ) { @@ -83,7 +114,7 @@ } /* Put terminal in application-cursor-key mode */ - swrite( STDOUT_FILENO, Terminal::Emulator::open().c_str() ); + swrite( STDOUT_FILENO, display.open().c_str() ); /* Add our name to window title */ if ( !getenv( "MOSH_TITLE_NOPREFIX" ) ) { @@ -104,7 +135,7 @@ output_new_frame(); /* Restore terminal and terminal-driver state */ - swrite( STDOUT_FILENO, Terminal::Emulator::close().c_str() ); + swrite( STDOUT_FILENO, display.close().c_str() ); if ( tcsetattr( STDIN_FILENO, TCSANOW, &saved_termios ) < 0 ) { perror( "tcsetattr" ); @@ -130,7 +161,6 @@ sel.add_signal( SIGINT ); sel.add_signal( SIGHUP ); sel.add_signal( SIGPIPE ); - sel.add_signal( SIGTSTP ); sel.add_signal( SIGCONT ); /* get initial window size */ @@ -225,6 +255,8 @@ overlays.get_prediction_engine().new_user_byte( the_byte, *local_framebuffer ); + const static wstring help_message( L"Commands: Ctrl-Z suspends, \".\" quits, \"^\" gives literal Ctrl-^" ); + if ( quit_sequence_started ) { if ( the_byte == '.' ) { /* Quit sequence is Ctrl-^ . */ if ( network->has_remote_addr() && (!network->shutdown_in_progress()) ) { @@ -234,6 +266,23 @@ } else { return false; } + } else if ( the_byte == 0x1a ) { /* Suspend sequence is Ctrl-^ Ctrl-Z */ + /* Restore terminal and terminal-driver state */ + swrite( STDOUT_FILENO, display.close().c_str() ); + + if ( tcsetattr( STDIN_FILENO, TCSANOW, &saved_termios ) < 0 ) { + perror( "tcsetattr" ); + exit( 1 ); + } + + printf( "\n\033[37;44m[mosh is suspended.]\033[m\n" ); + + fflush( NULL ); + + /* actually suspend */ + kill( 0, SIGSTOP ); + + resume(); } else if ( the_byte == '^' ) { /* Emulation sequence to type Ctrl-^ is Ctrl-^ ^ */ network->get_current_state().push_back( Parser::UserByte( 0x1E ) ); @@ -244,11 +293,17 @@ } quit_sequence_started = false; + + if ( overlays.get_notification_engine().get_notification_string() == help_message ) { + overlays.get_notification_engine().set_notification_string( L"" ); + } + continue; } quit_sequence_started = (the_byte == 0x1E); if ( quit_sequence_started ) { + overlays.get_notification_engine().set_notification_string( help_message, true, false ); continue; } @@ -293,8 +348,6 @@ /* prepare to poll for events */ Select &sel = Select::get_instance(); - sel.add_fd( network->fd() ); - sel.add_fd( STDIN_FILENO ); while ( 1 ) { try { @@ -307,14 +360,41 @@ wait_time = min( 250, wait_time ); } + /* poll for events */ + /* network->fd() can in theory change over time */ + sel.clear_fds(); + std::vector< int > fd_list( network->fds() ); + for ( std::vector< int >::const_iterator it = fd_list.begin(); + it != fd_list.end(); + it++ ) { + sel.add_fd( *it ); + } + sel.add_fd( STDIN_FILENO ); + int active_fds = sel.select( wait_time ); if ( active_fds < 0 ) { perror( "select" ); break; } - if ( sel.read( network->fd() ) ) { - /* packet received from the network */ + bool network_ready_to_read = false; + + for ( std::vector< int >::const_iterator it = fd_list.begin(); + it != fd_list.end(); + it++ ) { + if ( sel.read( *it ) ) { + /* packet received from the network */ + /* we only read one socket each run */ + network_ready_to_read = true; + } + + if ( sel.error( *it ) ) { + /* network problem */ + break; + } + } + + if ( network_ready_to_read ) { if ( !process_network_input() ) { return; } } @@ -335,12 +415,14 @@ if ( !process_resize() ) { return; } } + if ( sel.signal( SIGCONT ) ) { + resume(); + } + if ( sel.signal( SIGTERM ) || sel.signal( SIGINT ) || sel.signal( SIGHUP ) - || sel.signal( SIGPIPE ) - || sel.signal( SIGTSTP ) - || sel.signal( SIGCONT ) ) { + || sel.signal( SIGPIPE ) ) { /* shutdown signal */ if ( !network->has_remote_addr() ) { break; @@ -350,11 +432,6 @@ } } - if ( sel.error( network->fd() ) ) { - /* network problem */ - break; - } - if ( sel.error( STDIN_FILENO ) ) { /* user problem */ if ( !network->has_remote_addr() ) { @@ -408,7 +485,7 @@ } else { overlays.get_notification_engine().clear_network_exception(); } - } catch ( Network::NetworkException e ) { + } catch ( const Network::NetworkException &e ) { if ( !network->shutdown_in_progress() ) { overlays.get_notification_engine().set_network_exception( e ); } @@ -417,7 +494,8 @@ req.tv_sec = 0; req.tv_nsec = 200000000; /* 0.2 sec */ nanosleep( &req, NULL ); - } catch ( Crypto::CryptoException e ) { + freeze_timestamp(); + } catch ( const Crypto::CryptoException &e ) { if ( e.fatal ) { throw; } else { diff -Nru mosh-1.2.2/src/frontend/stmclient.h mosh-1.2.4a/src/frontend/stmclient.h --- mosh-1.2.2/src/frontend/stmclient.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/frontend/stmclient.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef STM_CLIENT_HPP @@ -54,12 +68,14 @@ void output_new_frame( void ); - bool still_connecting( void ) + bool still_connecting( void ) const { /* Initially, network == NULL */ return network && ( network->get_remote_state_num() == 0 ); } + void resume( void ); /* restore state after SIGCONT */ + public: STMClient( const char *s_ip, int s_port, const char *s_key, const char *predict_mode ) : ip( s_ip ), port( s_port ), key( s_key ), diff -Nru mosh-1.2.2/src/frontend/terminaloverlay.cc mosh-1.2.4a/src/frontend/terminaloverlay.cc --- mosh-1.2.2/src/frontend/terminaloverlay.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/frontend/terminaloverlay.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -154,9 +168,23 @@ last_acked_state( timestamp() ), message(), message_is_network_exception( false ), - message_expiration( -1 ) + message_expiration( -1 ), + show_quit_keystroke( true ) {} +static std::string human_readable_duration( int num_seconds, const std::string &seconds_abbr ) { + char tmp[ 128 ]; + if ( num_seconds < 60 ) { + snprintf( tmp, 128, "%d %s", num_seconds, seconds_abbr.c_str() ); + } else if ( num_seconds < 3600 ) { + snprintf( tmp, 128, "%d:%02d", num_seconds / 60, num_seconds % 60 ); + } else { + snprintf( tmp, 128, "%d:%02d:%02d", num_seconds / 3600, + (num_seconds / 60) % 60, num_seconds % 60 ); + } + return tmp; +} + void NotificationEngine::apply( Framebuffer &fb ) const { uint64_t now = timestamp(); @@ -205,15 +233,25 @@ explanation = reply_message; } + const static char quit_keystroke[] = " [To quit: Ctrl-^ .]"; + const static char blank[] = ""; + + const char *keystroke_str = show_quit_keystroke ? quit_keystroke : blank; + if ( message.empty() && (!time_expired) ) { return; } else if ( message.empty() && time_expired ) { - swprintf( tmp, 128, L"mosh: Last %s %.0f seconds ago. [To quit: Ctrl-^ .]", explanation, time_elapsed ); + swprintf( tmp, 128, L"mosh: Last %s %s ago.%s", explanation, + human_readable_duration( static_cast( time_elapsed ), + "seconds" ).c_str(), + keystroke_str ); } else if ( (!message.empty()) && (!time_expired) ) { - swprintf( tmp, 128, L"mosh: %ls [To quit: Ctrl-^ .]", message.c_str() ); + swprintf( tmp, 128, L"mosh: %ls%s", message.c_str(), keystroke_str ); } else { - swprintf( tmp, 128, L"mosh: %ls (%.0f s without %s.) [To quit: Ctrl-^ .]", message.c_str(), - time_elapsed, explanation ); + swprintf( tmp, 128, L"mosh: %ls (%s without %s.)%s", message.c_str(), + human_readable_duration( static_cast( time_elapsed ), + "s" ).c_str(), + explanation, keystroke_str ); } wstring string_to_draw( tmp ); @@ -520,6 +558,16 @@ } } + /* match rest of row to the actual renditions */ + { + const Renditions &actual_renditions = fb.get_cell( i->row_num, j->col )->renditions; + for ( overlay_cells_type::iterator k = j; + k != i->overlay_cells.end(); + k++ ) { + k->replacement.renditions = actual_renditions; + } + } + /* no break */ case CorrectNoCredit: j->reset(); @@ -728,6 +776,18 @@ cell.tentative_until_epoch = prediction_epoch; cell.expire( local_frame_sent + 1, now ); cell.replacement.renditions = fb.ds.get_renditions(); + + /* heuristic: match renditions of character to the left */ + if ( cursor().col > 0 ) { + ConditionalOverlayCell &prev_cell = the_row.overlay_cells[ cursor().col - 1 ]; + const Cell *prev_cell_actual = fb.get_cell( cursor().row, cursor().col - 1 ); + if ( prev_cell.active && (!prev_cell.unknown) ) { + cell.replacement.renditions = prev_cell.replacement.renditions; + } else { + cell.replacement.renditions = prev_cell_actual->renditions; + } + } + cell.replacement.contents.clear(); cell.replacement.contents.push_back( ch ); cell.original_contents.push_back( *fb.get_cell( cursor().row, cursor().col ) ); diff -Nru mosh-1.2.2/src/frontend/terminaloverlay.h mosh-1.2.4a/src/frontend/terminaloverlay.h --- mosh-1.2.2/src/frontend/terminaloverlay.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/frontend/terminaloverlay.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef TERMINAL_OVERLAY_HPP @@ -25,6 +39,7 @@ #include "parser.h" #include +#include namespace Overlay { using namespace Terminal; @@ -132,6 +147,7 @@ wstring message; bool message_is_network_exception; uint64_t message_expiration; + bool show_quit_keystroke; bool server_late( uint64_t ts ) const { return (ts - last_word_from_server) > 6500; } bool reply_late( uint64_t ts ) const { return (ts - last_acked_state) > 10000; } @@ -145,7 +161,7 @@ void server_acked( uint64_t s_last_acked ) { last_acked_state = s_last_acked; } int wait_time( void ) const; - void set_notification_string( const wstring &s_message, bool permanent = false ) + void set_notification_string( const wstring &s_message, bool permanent = false, bool s_show_quit_keystroke = true ) { message = s_message; if ( permanent ) { @@ -154,6 +170,7 @@ message_expiration = timestamp() + 1000; } message_is_network_exception = false; + show_quit_keystroke = s_show_quit_keystroke; } void set_network_exception( const NetworkException &e ) @@ -169,7 +186,7 @@ void clear_network_exception() { if ( message_is_network_exception ) { - set_notification_string( wstring( L"" ) ); + message_expiration = std::min( message_expiration, timestamp() + 1000 ); } } diff -Nru mosh-1.2.2/src/network/compressor.cc mosh-1.2.4a/src/network/compressor.cc --- mosh-1.2.2/src/network/compressor.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/compressor.cc 2013-03-27 22:36:03.000000000 +0000 @@ -1,3 +1,35 @@ +/* + Mosh: the mobile shell + Copyright 2012 Keith Winstein + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. +*/ + #include #include "compressor.h" diff -Nru mosh-1.2.2/src/network/compressor.h mosh-1.2.4a/src/network/compressor.h --- mosh-1.2.2/src/network/compressor.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/compressor.h 2013-03-27 22:36:03.000000000 +0000 @@ -1,3 +1,35 @@ +/* + Mosh: the mobile shell + Copyright 2012 Keith Winstein + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. +*/ + #ifndef COMPRESSOR_H #define COMPRESSOR_H diff -Nru mosh-1.2.2/src/network/network.cc mosh-1.2.4a/src/network/network.cc --- mosh-1.2.2/src/network/network.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/network.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,31 +14,46 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "config.h" #include #include +#ifdef HAVE_SYS_UIO_H +#include +#endif #include #include #include #include #include -#if HAVE_CLOCK_GETTIME - #include -#elif HAVE_MACH_ABSOLUTE_TIME - #include -#elif HAVE_GETTIMEOFDAY - #include -#endif - #include "dos_assert.h" #include "byteorder.h" #include "network.h" #include "crypto.h" +#include "timestamp.h" + +#ifndef MSG_DONTWAIT +#define MSG_DONTWAIT MSG_NONBLOCK +#endif + using namespace std; using namespace Network; using namespace Crypto; @@ -73,7 +88,8 @@ { uint64_t direction_seq = (uint64_t( direction == TO_CLIENT ) << 63) | (seq & SEQUENCE_MASK); - uint16_t ts_net[ 2 ] = { htobe16( timestamp ), htobe16( timestamp_reply ) }; + uint16_t ts_net[ 2 ] = { static_cast( htobe16( timestamp ) ), + static_cast( htobe16( timestamp_reply ) ) }; string timestamps = string( (char *)ts_net, 2 * sizeof( uint16_t ) ); @@ -98,11 +114,42 @@ return p; } -void Connection::setup( void ) +void Connection::hop_port( void ) { - /* create socket */ - sock = socket( AF_INET, SOCK_DGRAM, 0 ); - if ( sock < 0 ) { + assert( !server ); + + setup(); + + prune_sockets(); +} + +void Connection::prune_sockets( void ) +{ + /* don't keep old sockets if the new socket has been working for long enough */ + if ( socks.size() > 1 ) { + if ( timestamp() - last_port_choice > MAX_OLD_SOCKET_AGE ) { + int num_to_kill = socks.size() - 1; + for ( int i = 0; i < num_to_kill; i++ ) { + socks.pop_front(); + } + } + } else { + return; + } + + /* make sure we don't have too many receive sockets open */ + if ( socks.size() > MAX_PORTS_OPEN ) { + int num_to_kill = socks.size() - MAX_PORTS_OPEN; + for ( int i = 0; i < num_to_kill; i++ ) { + socks.pop_front(); + } + } +} + +Connection::Socket::Socket() + : _fd( socket( AF_INET, SOCK_DGRAM, 0 ) ) +{ + if ( _fd < 0 ) { throw NetworkException( "socket", errno ); } @@ -110,26 +157,54 @@ #ifdef HAVE_IP_MTU_DISCOVER char flag = IP_PMTUDISC_DONT; socklen_t optlen = sizeof( flag ); - if ( setsockopt( sock, IPPROTO_IP, IP_MTU_DISCOVER, &flag, optlen ) < 0 ) { + if ( setsockopt( _fd, IPPROTO_IP, IP_MTU_DISCOVER, &flag, optlen ) < 0 ) { throw NetworkException( "setsockopt", errno ); } #endif - /* set diffserv values to AF42 + ECT */ - /* - uint8_t dscp = 0x92; - if ( setsockopt( sock, IPPROTO_IP, IP_TOS, &dscp, 1) < 0 ) { + // int dscp = 0x92; /* OS X does not have IPTOS_DSCP_AF42 constant */ + int dscp = 0x02; /* ECN-capable transport only */ + if ( setsockopt( _fd, IPPROTO_IP, IP_TOS, &dscp, sizeof (dscp)) < 0 ) { // perror( "setsockopt( IP_TOS )" ); } - */ + + /* request explicit congestion notification on received datagrams */ +#ifdef HAVE_IP_RECVTOS + int tosflag = true; + socklen_t tosoptlen = sizeof( tosflag ); + if ( setsockopt( _fd, IPPROTO_IP, IP_RECVTOS, &tosflag, tosoptlen ) < 0 ) { + perror( "setsockopt( IP_RECVTOS )" ); + } +#endif +} + +void Connection::setup( void ) +{ + /* create socket */ + socks.push_back( Socket() ); + + last_port_choice = timestamp(); +} + +const std::vector< int > Connection::fds( void ) const +{ + std::vector< int > ret; + + for ( std::deque< Socket >::const_iterator it = socks.begin(); + it != socks.end(); + it++ ) { + ret.push_back( it->fd() ); + } + + return ret; } Connection::Connection( const char *desired_ip, const char *desired_port ) /* server */ - : sock( -1 ), + : socks(), has_remote_addr( false ), remote_addr(), server( true ), - MTU( SEND_MTU ), + MTU( DEFAULT_SEND_MTU ), key(), session( key ), direction( TO_CLIENT ), @@ -137,6 +212,9 @@ saved_timestamp( -1 ), saved_timestamp_received_at( 0 ), expected_receiver_seq( 0 ), + last_heard( -1 ), + last_port_choice( -1 ), + last_roundtrip_success( -1 ), RTT_hit( false ), SRTT( 1000 ), RTTVAR( 500 ), @@ -151,20 +229,12 @@ /* If an IP request is given, we try to bind to that IP, but we also try INADDR_ANY. If a port request is given, we bind only to that port. */ - /* convert port number */ - long int desired_port_no = 0; + /* convert port numbers */ + int desired_port_low = 0; + int desired_port_high = 0; - if ( desired_port ) { - char *end; - errno = 0; - desired_port_no = strtol( desired_port, &end, 10 ); - if ( (errno != 0) || (end != desired_port + strlen( desired_port )) ) { - throw NetworkException( "Invalid port number", errno ); - } - } - - if ( (desired_port_no < 0) || (desired_port_no > 65535) ) { - throw NetworkException( "Port number outside valid range [0..65535]", 0 ); + if ( desired_port && !parse_portrange( desired_port, desired_port_low, desired_port_high ) ) { + throw NetworkException("Invalid port range", 0); } /* convert desired IP */ @@ -181,7 +251,7 @@ /* try to bind to desired IP first */ if ( desired_ip_addr != INADDR_ANY ) { try { - if ( try_bind( sock, desired_ip_addr, desired_port_no ) ) { return; } + if ( try_bind( sock(), desired_ip_addr, desired_port_low, desired_port_high ) ) { return; } } catch ( const NetworkException& e ) { struct in_addr sin_addr; sin_addr.s_addr = desired_ip_addr; @@ -193,7 +263,7 @@ /* now try any local interface */ try { - if ( try_bind( sock, INADDR_ANY, desired_port_no ) ) { return; } + if ( try_bind( sock(), INADDR_ANY, desired_port_low, desired_port_high ) ) { return; } } catch ( const NetworkException& e ) { fprintf( stderr, "Error binding to any interface: %s: %s\n", e.function.c_str(), strerror( e.the_errno ) ); @@ -204,16 +274,19 @@ throw NetworkException( "Could not bind", errno ); } -bool Connection::try_bind( int socket, uint32_t s_addr, int port ) +bool Connection::try_bind( int socket, uint32_t addr, int port_low, int port_high ) { struct sockaddr_in local_addr; local_addr.sin_family = AF_INET; - local_addr.sin_addr.s_addr = s_addr; + local_addr.sin_addr.s_addr = addr; int search_low = PORT_RANGE_LOW, search_high = PORT_RANGE_HIGH; - if ( port != 0 ) { /* port preference */ - search_low = search_high = port; + if ( port_low != 0 ) { /* low port preference */ + search_low = port_low; + } + if ( port_high != 0 ) { /* high port preference */ + search_high = port_high; } for ( int i = search_low; i <= search_high; i++ ) { @@ -234,11 +307,11 @@ } Connection::Connection( const char *key_str, const char *ip, int port ) /* client */ - : sock( -1 ), + : socks(), has_remote_addr( false ), remote_addr(), server( false ), - MTU( SEND_MTU ), + MTU( DEFAULT_SEND_MTU ), key( key_str ), session( key ), direction( TO_SERVER ), @@ -246,6 +319,9 @@ saved_timestamp( -1 ), saved_timestamp_received_at( 0 ), expected_receiver_seq( 0 ), + last_heard( -1 ), + last_port_choice( -1 ), + last_roundtrip_success( -1 ), RTT_hit( false ), SRTT( 1000 ), RTTVAR( 500 ), @@ -269,13 +345,15 @@ void Connection::send( string s ) { - assert( has_remote_addr ); + if ( !has_remote_addr ) { + return; + } Packet px = new_packet( s ); string p = px.tostring( &session ); - ssize_t bytes_sent = sendto( sock, p.data(), p.size(), 0, + ssize_t bytes_sent = sendto( sock(), p.data(), p.size(), MSG_DONTWAIT, (sockaddr *)&remote_addr, sizeof( remote_addr ) ); if ( bytes_sent == static_cast( p.size() ) ) { @@ -286,31 +364,108 @@ flight anyway. */ have_send_exception = true; send_exception = NetworkException( "sendto", errno ); + + if ( errno == EMSGSIZE ) { + MTU = 500; /* payload MTU of last resort */ + } + } + + uint64_t now = timestamp(); + if ( server ) { + if ( now - last_heard > SERVER_ASSOCIATION_TIMEOUT ) { + has_remote_addr = false; + fprintf( stderr, "Server now detached from client.\n" ); + } + } else { /* client */ + if ( ( now - last_port_choice > PORT_HOP_INTERVAL ) + && ( now - last_roundtrip_success > PORT_HOP_INTERVAL ) ) { + hop_port(); + } } } string Connection::recv( void ) { + assert( !socks.empty() ); + for ( std::deque< Socket >::const_iterator it = socks.begin(); + it != socks.end(); + it++ ) { + bool islast = (it + 1) == socks.end(); + string payload; + try { + payload = recv_one( it->fd(), !islast ); + } catch ( NetworkException & e ) { + if ( (e.the_errno == EAGAIN) + || (e.the_errno == EWOULDBLOCK) ) { + assert( !islast ); + continue; + } else { + throw; + } + } + + /* succeeded */ + prune_sockets(); + return payload; + } + assert( false ); + return ""; +} + +string Connection::recv_one( int sock_to_recv, bool nonblocking ) +{ + /* receive source address, ECN, and payload in msghdr structure */ struct sockaddr_in packet_remote_addr; + struct msghdr header; + struct iovec msg_iovec; - char buf[ Session::RECEIVE_MTU ]; + char msg_payload[ Session::RECEIVE_MTU ]; + char msg_control[ Session::RECEIVE_MTU ]; - socklen_t addrlen = sizeof( packet_remote_addr ); + /* receive source address */ + header.msg_name = &packet_remote_addr; + header.msg_namelen = sizeof( packet_remote_addr ); + + /* receive payload */ + msg_iovec.iov_base = msg_payload; + msg_iovec.iov_len = Session::RECEIVE_MTU; + header.msg_iov = &msg_iovec; + header.msg_iovlen = 1; + + /* receive explicit congestion notification */ + header.msg_control = msg_control; + header.msg_controllen = Session::RECEIVE_MTU; - ssize_t received_len = recvfrom( sock, buf, Session::RECEIVE_MTU, 0, (sockaddr *)&packet_remote_addr, &addrlen ); + /* receive flags */ + header.msg_flags = 0; + + ssize_t received_len = recvmsg( sock_to_recv, &header, nonblocking ? MSG_DONTWAIT : 0 ); if ( received_len < 0 ) { - throw NetworkException( "recvfrom", errno ); + throw NetworkException( "recvmsg", errno ); } - if ( received_len > Session::RECEIVE_MTU ) { - char buffer[ 2048 ]; - snprintf( buffer, 2048, "Received oversize datagram (size %d) and limit is %d\n", - static_cast( received_len ), Session::RECEIVE_MTU ); - throw NetworkException( buffer, errno ); + if ( header.msg_flags & MSG_TRUNC ) { + throw NetworkException( "Received oversize datagram", errno ); + } + + /* receive ECN */ + bool congestion_experienced = false; + + struct cmsghdr *ecn_hdr = CMSG_FIRSTHDR( &header ); + if ( ecn_hdr + && (ecn_hdr->cmsg_level == IPPROTO_IP) + && (ecn_hdr->cmsg_type == IP_TOS) ) { + /* got one */ + uint8_t *ecn_octet_p = (uint8_t *)CMSG_DATA( ecn_hdr ); + assert( ecn_octet_p ); + + if ( (*ecn_octet_p & 0x03) == 0x03 ) { + congestion_experienced = true; + } } - Packet p( string( buf, received_len ), &session ); + Packet p( string( msg_payload, received_len ), &session ); dos_assert( p.direction == (server ? TO_SERVER : TO_CLIENT) ); /* prevent malicious playback to sender */ @@ -321,6 +476,15 @@ if ( p.timestamp != uint16_t(-1) ) { saved_timestamp = p.timestamp; saved_timestamp_received_at = timestamp(); + + if ( congestion_experienced ) { + /* signal counterparty to slow down */ + /* this will gradually slow the counterparty down to the minimum frame rate */ + saved_timestamp -= CONGESTION_TIMESTAMP_PENALTY; + if ( server ) { + fprintf( stderr, "Received explicit congestion notification.\n" ); + } + } } if ( p.timestamp_reply != uint16_t(-1) ) { @@ -344,6 +508,7 @@ /* auto-adjust to remote host */ has_remote_addr = true; + last_heard = timestamp(); if ( server ) { /* only client can roam */ if ( (remote_addr.sin_addr.s_addr != packet_remote_addr.sin_addr.s_addr) @@ -364,7 +529,7 @@ struct sockaddr_in local_addr; socklen_t addrlen = sizeof( local_addr ); - if ( getsockname( sock, (sockaddr *)&local_addr, &addrlen ) < 0 ) { + if ( getsockname( sock(), (sockaddr *)&local_addr, &addrlen ) < 0 ) { throw NetworkException( "getsockname", errno ); } @@ -373,41 +538,7 @@ uint64_t Network::timestamp( void ) { -#if HAVE_CLOCK_GETTIME - struct timespec tp; - - if ( clock_gettime( CLOCK_MONOTONIC, &tp ) < 0 ) { - throw NetworkException( "clock_gettime", errno ); - } - - uint64_t millis = tp.tv_nsec / 1000000; - millis += uint64_t( tp.tv_sec ) * 1000; - - return millis; -#elif HAVE_MACH_ABSOLUTE_TIME - static mach_timebase_info_data_t s_timebase_info; - - if (s_timebase_info.denom == 0) { - mach_timebase_info(&s_timebase_info); - } - - // NB: mach_absolute_time() returns "absolute time units" - // We need to apply a conversion to get milliseconds. - return ((mach_absolute_time() * s_timebase_info.numer) / (1000000 * s_timebase_info.denom)); -#elif HAVE_GETTIMEOFDAY - // NOTE: If time steps backwards, timeouts may be confused. - struct timeval tv; - if ( gettimeofday(&tv, NULL) ) { - throw NetworkException( "gettimeofday", errno ); - } - - uint64_t millis = tv.tv_usec / 1000; - millis += uint64_t( tv.tv_sec ) * 1000; - - return millis; -#else -# error "Don't know how to get a timestamp on this platform" -#endif + return frozen_timestamp(); } uint16_t Network::timestamp16( void ) @@ -443,9 +574,75 @@ return RTO; } -Connection::~Connection() +Connection::Socket::~Socket() { - if ( close( sock ) < 0 ) { + if ( close( _fd ) < 0 ) { throw NetworkException( "close", errno ); } } + +Connection::Socket::Socket( const Socket & other ) + : _fd( dup( other._fd ) ) +{ + if ( _fd < 0 ) { + throw NetworkException( "socket", errno ); + } +} + +Connection::Socket & Connection::Socket::operator=( const Socket & other ) +{ + _fd = dup( other._fd ); + + if ( _fd < 0 ) { + throw NetworkException( "socket", errno ); + } + + return *this; +} + +bool Connection::parse_portrange( const char * desired_port, int & desired_port_low, int & desired_port_high ) +{ + /* parse "port" or "portlow:porthigh" */ + desired_port_low = desired_port_high = 0; + char *end; + long value; + + /* parse first (only?) port */ + errno = 0; + value = strtol( desired_port, &end, 10 ); + if ( (errno != 0) || (*end != '\0' && *end != ':') ) { + fprintf( stderr, "Invalid (low) port number (%s)\n", desired_port ); + return false; + } + if ( (value < 0) || (value > 65535) ) { + fprintf( stderr, "(Low) port number %ld outside valid range [0..65535]\n", value ); + return false; + } + + desired_port_low = (int)value; + if (*end == '\0') { /* not a port range */ + desired_port_high = desired_port_low; + return true; + } + + /* port range; parse high port */ + const char * cp = end + 1; + errno = 0; + value = strtol( cp, &end, 10 ); + if ( (errno != 0) || (*end != '\0') ) { + fprintf( stderr, "Invalid high port number (%s)\n", cp ); + return false; + } + if ( (value < 0) || (value > 65535) ) { + fprintf( stderr, "High port number %ld outside valid range [0..65535]\n", value ); + return false; + } + + desired_port_high = (int)value; + if ( desired_port_low > desired_port_high ) { + fprintf( stderr, "Low port %d greater than high port %d\n", desired_port_low, desired_port_high ); + return false; + } + + return true; +} diff -Nru mosh-1.2.2/src/network/network.h mosh-1.2.4a/src/network/network.h --- mosh-1.2.2/src/network/network.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/network.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef NETWORK_HPP @@ -25,6 +39,8 @@ #include #include #include +#include +#include #include "crypto.h" @@ -70,16 +86,38 @@ class Connection { private: - static const int SEND_MTU = 1400; + static const int DEFAULT_SEND_MTU = 1300; static const uint64_t MIN_RTO = 50; /* ms */ static const uint64_t MAX_RTO = 1000; /* ms */ static const int PORT_RANGE_LOW = 60001; static const int PORT_RANGE_HIGH = 60999; - static bool try_bind( int socket, uint32_t s_addr, int port ); + static const unsigned int SERVER_ASSOCIATION_TIMEOUT = 40000; + static const unsigned int PORT_HOP_INTERVAL = 10000; + + static const unsigned int MAX_PORTS_OPEN = 10; + static const unsigned int MAX_OLD_SOCKET_AGE = 60000; + + static const int CONGESTION_TIMESTAMP_PENALTY = 500; /* ms */ + + static bool try_bind( int socket, uint32_t addr, int port_low, int port_high ); + + class Socket + { + private: + int _fd; + + public: + int fd( void ) const { return _fd; } + Socket(); + ~Socket(); + + Socket( const Socket & other ); + Socket & operator=( const Socket & other ); + }; - int sock; + std::deque< Socket > socks; bool has_remote_addr; struct sockaddr_in remote_addr; @@ -98,6 +136,10 @@ uint64_t saved_timestamp_received_at; uint64_t expected_receiver_seq; + uint64_t last_heard; + uint64_t last_port_choice; + uint64_t last_roundtrip_success; /* transport layer needs to tell us this */ + bool RTT_hit; double SRTT; double RTTVAR; @@ -109,14 +151,21 @@ Packet new_packet( string &s_payload ); + void hop_port( void ); + + int sock( void ) const { assert( !socks.empty() ); return socks.back().fd(); } + + void prune_sockets( void ); + + string recv_one( int sock_to_recv, bool nonblocking ); + public: Connection( const char *desired_ip, const char *desired_port ); /* server */ Connection( const char *key_str, const char *ip, int port ); /* client */ - ~Connection(); void send( string s ); string recv( void ); - int fd( void ) const { return sock; } + const std::vector< int > fds( void ) const; int get_MTU( void ) const { return MTU; } int port( void ) const; @@ -132,6 +181,10 @@ { return have_send_exception ? &send_exception : NULL; } + + void set_last_roundtrip_success( uint64_t s_success ) { last_roundtrip_success = s_success; } + + static bool parse_portrange( const char * desired_port_range, int & desired_port_low, int & desired_port_high ); }; } diff -Nru mosh-1.2.2/src/network/networktransport.cc mosh-1.2.4a/src/network/networktransport.cc --- mosh-1.2.2/src/network/networktransport.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/networktransport.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -31,6 +45,7 @@ : connection( desired_ip, desired_port ), sender( &connection, initial_state ), received_states( 1, TimestampedState( timestamp(), 0, initial_remote ) ), + receiver_quench_timer( 0 ), last_receiver_state( initial_remote ), fragments(), verbose( false ) @@ -44,6 +59,7 @@ : connection( key_str, ip, port ), sender( &connection, initial_state ), received_states( 1, TimestampedState( timestamp(), 0, initial_remote ) ), + receiver_quench_timer( 0 ), last_receiver_state( initial_remote ), fragments(), verbose( false ) @@ -66,6 +82,9 @@ sender.process_acknowledgment_through( inst.ack_num() ); + /* inform network layer of roundtrip (end-to-end-to-end) connectivity */ + connection.set_last_roundtrip_success( sender.get_sent_state_acked_timestamp() ); + /* first, make sure we don't already have the new state */ for ( typename list< TimestampedState >::iterator i = received_states.begin(); i != received_states.end(); @@ -99,11 +118,16 @@ process_throwaway_until( inst.throwaway_num() ); if ( received_states.size() > 1024 ) { /* limit on state queue */ - if ( verbose ) { - fprintf( stderr, "[%u] Receiver queue full, discarding %d (malicious sender or long-unidirectional connectivity?)\n", - (unsigned int)(timestamp() % 100000), (int)inst.new_num() ); + uint64_t now = timestamp(); + if ( now < receiver_quench_timer ) { /* deny letting state grow further */ + if ( verbose ) { + fprintf( stderr, "[%u] Receiver queue full, discarding %d (malicious sender or long-unidirectional connectivity?)\n", + (unsigned int)(timestamp() % 100000), (int)inst.new_num() ); + } + return; + } else { + receiver_quench_timer = now + 15000; } - return; } /* apply diff to reference state */ diff -Nru mosh-1.2.2/src/network/networktransport.h mosh-1.2.4a/src/network/networktransport.h --- mosh-1.2.2/src/network/networktransport.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/networktransport.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef NETWORK_TRANSPORT_HPP @@ -46,6 +60,7 @@ /* simple receiver */ list< TimestampedState > received_states; + uint64_t receiver_quench_timer; RemoteState last_receiver_state; /* the state we were in when user last queried state */ FragmentAssembly fragments; bool verbose; @@ -89,7 +104,7 @@ const TimestampedState & get_latest_remote_state( void ) const { return received_states.back(); } - int fd( void ) const { return connection.fd(); } + const std::vector< int > fds( void ) const { return connection.fds(); } void set_verbose( void ) { sender.set_verbose(); verbose = true; } diff -Nru mosh-1.2.2/src/network/transportfragment.cc mosh-1.2.4a/src/network/transportfragment.cc --- mosh-1.2.2/src/network/transportfragment.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/transportfragment.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -60,13 +74,15 @@ Fragment::Fragment( string &x ) : id( -1 ), fragment_num( -1 ), final( false ), initialized( true ), - contents( x.begin() + frag_header_len, x.end() ) + contents() { - assert( x.size() >= frag_header_len ); + fatal_assert( x.size() >= frag_header_len ); + contents = string( x.begin() + frag_header_len, x.end() ); - uint64_t *data64 = (uint64_t *)x.data(); + uint64_t data64; uint16_t *data16 = (uint16_t *)x.data(); - id = be64toh( data64[ 0 ] ); + memcpy( &data64, x.data(), sizeof( data64 ) ); + id = be64toh( data64 ); fragment_num = be16toh( data16[ 4 ] ); final = ( fragment_num & 0x8000 ) >> 15; fragment_num &= 0x7FFF; diff -Nru mosh-1.2.2/src/network/transportfragment.h mosh-1.2.4a/src/network/transportfragment.h --- mosh-1.2.2/src/network/transportfragment.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/transportfragment.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef TRANSPORT_FRAGMENT_HPP diff -Nru mosh-1.2.2/src/network/transportsender.cc mosh-1.2.4a/src/network/transportsender.cc --- mosh-1.2.2/src/network/transportsender.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/transportsender.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -25,6 +39,8 @@ #include "transportsender.h" #include "transportfragment.h" +#include + using namespace Network; using namespace std; @@ -40,6 +56,7 @@ verbose( false ), shutdown_in_progress( false ), shutdown_tries( 0 ), + shutdown_start( -1 ), ack_num( 0 ), pending_data_ack( false ), SEND_MINDELAY( 8 ), @@ -341,7 +358,15 @@ template bool TransportSender::shutdown_ack_timed_out( void ) const { - return shutdown_tries >= SHUTDOWN_RETRIES; + if ( shutdown_in_progress ) { + if ( shutdown_tries >= SHUTDOWN_RETRIES ) { + return true; + } else if ( timestamp() - shutdown_start >= uint64_t( ACTIVE_RETRY_TIMEOUT ) ) { + return true; + } + } + + return false; } /* Executed upon entry to new receiver state */ diff -Nru mosh-1.2.2/src/network/transportsender.h mosh-1.2.4a/src/network/transportsender.h --- mosh-1.2.2/src/network/transportsender.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/transportsender.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ @@ -80,6 +94,7 @@ bool verbose; bool shutdown_in_progress; int shutdown_tries; + uint64_t shutdown_start; /* information about receiver state */ uint64_t ack_num; @@ -118,7 +133,7 @@ void remote_heard( uint64_t ts ) { last_heard = ts; } /* Starts shutdown sequence */ - void start_shutdown( void ) { shutdown_in_progress = true; } + void start_shutdown( void ) { if ( !shutdown_in_progress ) { shutdown_start = timestamp(); shutdown_in_progress = true; } } /* Misc. getters and setters */ /* Cannot modify current_state while shutdown in progress */ diff -Nru mosh-1.2.2/src/network/transportstate.h mosh-1.2.4a/src/network/transportstate.h --- mosh-1.2.2/src/network/transportstate.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/network/transportstate.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef TRANSPORT_STATE_HPP diff -Nru mosh-1.2.2/src/statesync/completeterminal.cc mosh-1.2.4a/src/statesync/completeterminal.cc --- mosh-1.2.2/src/statesync/completeterminal.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/statesync/completeterminal.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "completeterminal.h" @@ -21,6 +35,8 @@ #include "hostinput.pb.h" +#include + using namespace std; using namespace Parser; using namespace Terminal; diff -Nru mosh-1.2.2/src/statesync/completeterminal.h mosh-1.2.4a/src/statesync/completeterminal.h --- mosh-1.2.2/src/statesync/completeterminal.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/statesync/completeterminal.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef COMPLETE_TERMINAL_HPP diff -Nru mosh-1.2.2/src/statesync/user.cc mosh-1.2.4a/src/statesync/user.cc --- mosh-1.2.2/src/statesync/user.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/statesync/user.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -29,9 +43,15 @@ void UserStream::subtract( const UserStream *prefix ) { + // if we are subtracting ourself from ourself, just clear the deque + if ( this == prefix ) { + actions.clear(); + return; + } for ( deque::const_iterator i = prefix->actions.begin(); i != prefix->actions.end(); i++ ) { + assert( this != prefix ); assert( !actions.empty() ); assert( *i == actions.front() ); actions.pop_front(); diff -Nru mosh-1.2.2/src/statesync/user.h mosh-1.2.4a/src/statesync/user.h --- mosh-1.2.2/src/statesync/user.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/statesync/user.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef USER_HPP diff -Nru mosh-1.2.2/src/terminal/parser.cc mosh-1.2.4a/src/terminal/parser.cc --- mosh-1.2.2/src/terminal/parser.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/parser.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -24,6 +38,8 @@ #include "parser.h" +const Parser::StateFamily Parser::family; + static void append_or_delete( Parser::Action *act, std::list&vec ) { diff -Nru mosh-1.2.2/src/terminal/parser.h mosh-1.2.4a/src/terminal/parser.h --- mosh-1.2.2/src/terminal/parser.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/parser.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef PARSER_HPP @@ -32,7 +46,7 @@ #include "parserstatefamily.h" namespace Parser { - static const StateFamily family; + extern const StateFamily family; class Parser { private: diff -Nru mosh-1.2.2/src/terminal/parseraction.cc mosh-1.2.4a/src/terminal/parseraction.cc --- mosh-1.2.2/src/terminal/parseraction.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/parseraction.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include diff -Nru mosh-1.2.2/src/terminal/parseraction.h mosh-1.2.4a/src/terminal/parseraction.h --- mosh-1.2.2/src/terminal/parseraction.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/parseraction.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef PARSERACTION_HPP diff -Nru mosh-1.2.2/src/terminal/parserstate.cc mosh-1.2.4a/src/terminal/parserstate.cc --- mosh-1.2.2/src/terminal/parserstate.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/parserstate.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "parserstate.h" diff -Nru mosh-1.2.2/src/terminal/parserstate.h mosh-1.2.4a/src/terminal/parserstate.h --- mosh-1.2.2/src/terminal/parserstate.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/parserstate.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef PARSERSTATE_HPP diff -Nru mosh-1.2.2/src/terminal/parserstatefamily.h mosh-1.2.4a/src/terminal/parserstatefamily.h --- mosh-1.2.2/src/terminal/parserstatefamily.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/parserstatefamily.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef PARSERSTATEFAMILY_HPP diff -Nru mosh-1.2.2/src/terminal/parsertransition.h mosh-1.2.4a/src/terminal/parsertransition.h --- mosh-1.2.2/src/terminal/parsertransition.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/parsertransition.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef PARSERTRANSITION_HPP diff -Nru mosh-1.2.2/src/terminal/terminal.cc mosh-1.2.4a/src/terminal/terminal.cc --- mosh-1.2.2/src/terminal/terminal.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminal.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -149,17 +163,6 @@ } } -std::string Emulator::open( void ) -{ - char appmode[ 6 ] = { 0x1b, '[', '?', '1', 'h', 0 }; - return std::string( appmode ); -} - -std::string Emulator::close( void ) -{ - return std::string( "\033[?1l\033[0m\033[?25h" ); -} - void Emulator::resize( size_t s_width, size_t s_height ) { fb.resize( s_width, s_height ); diff -Nru mosh-1.2.2/src/terminal/terminal.h mosh-1.2.4a/src/terminal/terminal.h --- mosh-1.2.2/src/terminal/terminal.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminal.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef TERMINAL_CPP @@ -64,9 +78,6 @@ std::string read_octets_to_host( void ); - static std::string open( void ); /* put user cursor keys in application mode */ - static std::string close( void ); /* restore user cursor keys */ - const Framebuffer & get_fb( void ) const { return fb; } bool operator==( Emulator const &x ) const; diff -Nru mosh-1.2.2/src/terminal/terminaldispatcher.cc mosh-1.2.4a/src/terminal/terminaldispatcher.cc --- mosh-1.2.2/src/terminal/terminaldispatcher.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminaldispatcher.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include diff -Nru mosh-1.2.2/src/terminal/terminaldispatcher.h mosh-1.2.4a/src/terminal/terminaldispatcher.h --- mosh-1.2.2/src/terminal/terminaldispatcher.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminaldispatcher.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef TERMINALDISPATCHER_HPP @@ -93,8 +107,8 @@ std::string str( void ); void dispatch( Function_Type type, const Parser::Action *act, Framebuffer *fb ); - std::string get_dispatch_chars( void ) { return dispatch_chars; } - std::vector get_OSC_string( void ) { return OSC_string; } + std::string get_dispatch_chars( void ) const { return dispatch_chars; } + std::vector get_OSC_string( void ) const { return OSC_string; } void OSC_put( const Parser::OSC_Put *act ); void OSC_start( const Parser::OSC_Start *act ); diff -Nru mosh-1.2.2/src/terminal/terminaldisplay.cc mosh-1.2.4a/src/terminal/terminaldisplay.cc --- mosh-1.2.2/src/terminal/terminaldisplay.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminaldisplay.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -30,6 +44,16 @@ return blank; } +std::string Display::open() const +{ + return std::string( smcup ? smcup : "" ) + std::string( "\033[?1h" ); +} + +std::string Display::close() const +{ + return std::string( "\033[?1l\033[0m\033[?25h" ) + std::string( rmcup ? rmcup : "" ); +} + std::string Display::new_frame( bool initialized, const Framebuffer &last, const Framebuffer &f ) const { FrameState frame( last ); @@ -42,7 +66,7 @@ } /* has icon name or window title changed? */ - if ( has_title && + if ( has_title && f.is_title_initialized() && ( (!initialized) || (f.get_icon_name() != frame.last_frame.get_icon_name()) || (f.get_window_title() != frame.last_frame.get_window_title()) ) ) { @@ -57,7 +81,8 @@ snprintf( tmp, 64, "%lc", *i ); frame.append( tmp ); } - frame.append( "\033\\" ); + frame.append( "\007" ); + /* ST is more correct, but BEL more widely supported */ } else { /* write Icon Name */ frame.append( "\033]1;" ); @@ -68,7 +93,7 @@ snprintf( tmp, 64, "%lc", *i ); frame.append( tmp ); } - frame.append( "\033\\" ); + frame.append( "\007" ); frame.append( "\033]2;" ); const std::deque &window_title( f.get_window_title() ); @@ -78,7 +103,7 @@ snprintf( tmp, 64, "%lc", *i ); frame.append( tmp ); } - frame.append( "\033\\" ); + frame.append( "\007" ); } } diff -Nru mosh-1.2.2/src/terminal/terminaldisplay.h mosh-1.2.4a/src/terminal/terminaldisplay.h --- mosh-1.2.2/src/terminal/terminaldisplay.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminaldisplay.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef TERMINALDISPLAY_HPP @@ -44,13 +58,17 @@ } void append( const char * s ) { str.append( s ); } - void appendstring( const std::string s ) { str.append( s ); } + void appendstring( const std::string &s ) { str.append( s ); } void append_silent_move( int y, int x ); }; class Display { private: + bool ti_flag( const char *capname ) const; + int ti_num( const char *capname ) const; + const char *ti_str( const char *capname ) const; + bool has_ech; /* erase character is part of vt200 but not supported by tmux (or by "screen" terminfo entry, which is what tmux advertises) */ @@ -60,11 +78,16 @@ int posterize_colors; /* downsample input colors >8 to [0..7] */ + const char *smcup, *rmcup; /* enter and exit alternate screen mode */ + void put_cell( bool initialized, FrameState &frame, const Framebuffer &f ) const; public: void downgrade( Framebuffer &f ) const { if ( posterize_colors ) { f.posterize(); } } + std::string open() const; + std::string close() const; + std::string new_frame( bool initialized, const Framebuffer &last, const Framebuffer &f ) const; Display( bool use_environment ); diff -Nru mosh-1.2.2/src/terminal/terminaldisplayinit.cc mosh-1.2.4a/src/terminal/terminaldisplayinit.cc --- mosh-1.2.2/src/terminal/terminaldisplayinit.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminaldisplayinit.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,24 +14,82 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ /* This is in its own file because otherwise the ncurses #defines alias our own variable names. */ +#include "config.h" #include "terminaldisplay.h" #include -#include -#include +#if defined HAVE_NCURSESW_CURSES_H +# include +# include +#elif defined HAVE_NCURSESW_H +# include +# include +#elif defined HAVE_NCURSES_CURSES_H +# include +# include +#elif defined HAVE_NCURSES_H +# include +# include +#elif defined HAVE_CURSES_H +# include +# include +#else +# error "SysV or X/Open-compatible Curses header file required" +#endif #include #include using namespace Terminal; +bool Display::ti_flag( const char *capname ) const +{ + int val = tigetflag( const_cast( capname ) ); + if ( val == -1 ) { + throw std::string( "Invalid terminfo boolean capability " ) + capname; + } + return val; +} + +int Display::ti_num( const char *capname ) const +{ + int val = tigetnum( const_cast( capname ) ); + if ( val == -2 ) { + throw std::string( "Invalid terminfo numeric capability " ) + capname; + } + return val; +} + +const char *Display::ti_str( const char *capname ) const +{ + const char *val = tigetstr( const_cast( capname ) ); + if ( val == (const char *)-1 ) { + throw std::string( "Invalid terminfo string capability " ) + capname; + } + return val; +} + Display::Display( bool use_environment ) - : has_ech( true ), has_bce( true ), has_title( true ), posterize_colors( false ) + : has_ech( true ), has_bce( true ), has_title( true ), posterize_colors( false ), smcup( NULL ), rmcup( NULL ) { if ( use_environment ) { int errret = -2; @@ -55,22 +113,10 @@ } /* check for ECH */ - char ech_name[] = "ech"; - char *val = tigetstr( ech_name ); - if ( val == (char *)-1 ) { - throw std::string( "Invalid terminfo string capability " ) + ech_name; - } else if ( val == 0 ) { - has_ech = false; - } + has_ech = ti_str( "ech" ); /* check for BCE */ - char bce_name[] = "bce"; - int bce_val = tigetflag( bce_name ); - if ( bce_val == -1 ) { - throw std::string( "Invalid terminfo boolean capability " ) + bce_name; - } else if ( bce_val == 0 ) { - has_bce = false; - } + has_bce = ti_flag( "bce" ); /* Check if we can set the window title and icon name. terminfo does not have reliable information on this, so we hardcode a whitelist of @@ -97,13 +143,12 @@ /* posterization disabled because server now only advertises xterm-256color when client has colors = 256 */ /* - char colors_name[] = "colors"; - int color_val = tigetnum( colors_name ); - if ( color_val == -2 ) { - throw std::string( "Invalid terminfo numeric capability " ) + colors_name; - } else if ( color_val < 256 ) { - posterize_colors = true; - } + posterize_colors = ti_num( "colors" ) < 256; */ + + if ( !getenv( "MOSH_NO_TERM_INIT" ) ) { + smcup = ti_str("smcup"); + rmcup = ti_str("rmcup"); + } } } diff -Nru mosh-1.2.2/src/terminal/terminalframebuffer.cc mosh-1.2.4a/src/terminal/terminalframebuffer.cc --- mosh-1.2.2/src/terminal/terminalframebuffer.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminalframebuffer.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -54,7 +68,7 @@ } Framebuffer::Framebuffer( int s_width, int s_height ) - : rows( s_height, Row( s_width, 0 ) ), icon_name(), window_title(), bell_count( 0 ), ds( s_width, s_height ) + : rows( s_height, Row( s_width, 0 ) ), icon_name(), window_title(), bell_count( 0 ), title_initialized( false ), ds( s_width, s_height ) { assert( s_height > 0 ); assert( s_width > 0 ); diff -Nru mosh-1.2.2/src/terminal/terminalframebuffer.h mosh-1.2.4a/src/terminal/terminalframebuffer.h --- mosh-1.2.2/src/terminal/terminalframebuffer.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminalframebuffer.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef TERMINALFB_HPP @@ -234,6 +248,7 @@ std::deque icon_name; std::deque window_title; unsigned int bell_count; + bool title_initialized; /* true if the window title has been set via an OSC */ Row newrow( void ) { return Row( ds.get_width(), ds.get_background_rendition() ); } @@ -297,6 +312,8 @@ void reset( void ); void soft_reset( void ); + void set_title_initialized( void ) { title_initialized = true; } + bool is_title_initialized( void ) const { return title_initialized; } void set_icon_name( const std::deque &s ) { icon_name = s; } void set_window_title( const std::deque &s ) { window_title = s; } const std::deque & get_icon_name( void ) const { return icon_name; } diff -Nru mosh-1.2.2/src/terminal/terminalfunctions.cc mosh-1.2.4a/src/terminal/terminalfunctions.cc --- mosh-1.2.2/src/terminal/terminalfunctions.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminalfunctions.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include @@ -512,29 +526,28 @@ /* xterm uses an Operating System Command to set the window title */ void Dispatcher::OSC_dispatch( const Parser::OSC_End *act, Framebuffer *fb ) { - if ( OSC_string.size() >= 2 ) { - if ( ( (OSC_string[ 0 ] == L'0') - || (OSC_string[ 0 ] == L'1') - || (OSC_string[ 0 ] == L'2') ) - && (OSC_string[ 1 ] == L';') ) { - std::deque newtitle( OSC_string.begin(), OSC_string.end() ); - newtitle.erase( newtitle.begin() ); - newtitle.erase( newtitle.begin() ); - - switch ( OSC_string[ 0 ] ) { - case L'0': - fb->set_icon_name( newtitle ); - fb->set_window_title( newtitle ); - break; - case L'1': - fb->set_icon_name( newtitle ); - break; - case L'2': - fb->set_window_title( newtitle ); - break; - default: - break; - } + if ( OSC_string.size() >= 1 ) { + long cmd_num = -1; + int offset = 0; + if ( OSC_string[ 0 ] == L';' ) { + /* OSC of the form "\033];\007" */ + cmd_num = 0; /* treat it as as a zero */ + offset = 1; + } else if ( (OSC_string.size() >= 2) && (OSC_string[ 1 ] == L';') ) { + /* OSC of the form "\033]X;<title>\007" where X can be: + * 0: set icon name and window title + * 1: set icon name + * 2: set window title */ + cmd_num = OSC_string[ 0 ] - L'0'; + offset = 2; + } + bool set_icon = (cmd_num == 0 || cmd_num == 1); + bool set_title = (cmd_num == 0 || cmd_num == 2); + if ( set_icon || set_title ) { + fb->set_title_initialized(); + std::deque<wchar_t> newtitle( OSC_string.begin() + offset, OSC_string.end() ); + if ( set_icon ) { fb->set_icon_name( newtitle ); } + if ( set_title ) { fb->set_window_title( newtitle ); } act->handled = true; } diff -Nru mosh-1.2.2/src/terminal/terminaluserinput.cc mosh-1.2.4a/src/terminal/terminaluserinput.cc --- mosh-1.2.2/src/terminal/terminaluserinput.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminaluserinput.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include <assert.h> diff -Nru mosh-1.2.2/src/terminal/terminaluserinput.h mosh-1.2.4a/src/terminal/terminaluserinput.h --- mosh-1.2.2/src/terminal/terminaluserinput.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/terminal/terminaluserinput.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef TERMINALUSERINPUT_HPP diff -Nru mosh-1.2.2/src/tests/Makefile.am mosh-1.2.4a/src/tests/Makefile.am --- mosh-1.2.2/src/tests/Makefile.am 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/tests/Makefile.am 2013-03-27 22:36:03.000000000 +0000 @@ -1,14 +1,13 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) AM_LDFLAGS = $(HARDEN_LDFLAGS) -if BUILD_TESTS - noinst_PROGRAMS = ocb-aes encrypt-decrypt -endif +check_PROGRAMS = ocb-aes encrypt-decrypt +TESTS = ocb-aes encrypt-decrypt ocb_aes_SOURCES = ocb-aes.cc test_utils.cc test_utils.h ocb_aes_CPPFLAGS = -I$(srcdir)/../crypto -I$(srcdir)/../util -ocb_aes_LDADD = ../crypto/libmoshcrypto.a ../util/libmoshutil.a +ocb_aes_LDADD = ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(OPENSSL_LIBS) encrypt_decrypt_SOURCES = encrypt-decrypt.cc test_utils.cc test_utils.h encrypt_decrypt_CPPFLAGS = -I$(srcdir)/../crypto -I$(srcdir)/../util -encrypt_decrypt_LDADD = ../crypto/libmoshcrypto.a ../util/libmoshutil.a +encrypt_decrypt_LDADD = ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(OPENSSL_LIBS) diff -Nru mosh-1.2.2/src/tests/encrypt-decrypt.cc mosh-1.2.4a/src/tests/encrypt-decrypt.cc --- mosh-1.2.2/src/tests/encrypt-decrypt.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/tests/encrypt-decrypt.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ /* Tests the Mosh crypto layer by encrypting and decrypting a bunch of random @@ -38,7 +52,7 @@ const size_t MESSAGES_PER_SESSION = 256; const size_t NUM_SESSIONS = 64; -bool verbose = true; +bool verbose = false; #define NONCE_FMT "%016"PRIx64 @@ -121,8 +135,8 @@ } int main( int argc, char *argv[] ) { - if ( ( argc >= 2 ) && !strcmp( argv[ 1 ], "-q" ) ) { - verbose = false; + if ( argc >= 2 && strcmp( argv[ 1 ], "-v" ) == 0 ) { + verbose = true; } for ( size_t i=0; i<NUM_SESSIONS; i++ ) { diff -Nru mosh-1.2.2/src/tests/ocb-aes.cc mosh-1.2.4a/src/tests/ocb-aes.cc --- mosh-1.2.2/src/tests/ocb-aes.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/tests/ocb-aes.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ /* Test suite for the OCB-AES reference implementation included with Mosh. @@ -39,7 +53,7 @@ using Crypto::AlignedBuffer; -bool verbose = true; +bool verbose = false; bool equal( const AlignedBuffer &a, const AlignedBuffer &b ) { return ( a.len() == b.len() ) @@ -526,8 +540,8 @@ int main( int argc, char *argv[] ) { - if ( ( argc >= 2 ) && !strcmp( argv[ 1 ], "-q" ) ) { - verbose = false; + if ( argc >= 2 && strcmp( argv[ 1 ], "-v" ) == 0 ) { + verbose = true; } test_all_vectors(); diff -Nru mosh-1.2.2/src/tests/test_utils.cc mosh-1.2.4a/src/tests/test_utils.cc --- mosh-1.2.2/src/tests/test_utils.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/tests/test_utils.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include <stdio.h> diff -Nru mosh-1.2.2/src/tests/test_utils.h mosh-1.2.4a/src/tests/test_utils.h --- mosh-1.2.2/src/tests/test_utils.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/tests/test_utils.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef TEST_UTILS_HPP diff -Nru mosh-1.2.2/src/util/Makefile.am mosh-1.2.4a/src/util/Makefile.am --- mosh-1.2.2/src/util/Makefile.am 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/util/Makefile.am 2013-03-27 22:36:03.000000000 +0000 @@ -2,4 +2,4 @@ noinst_LIBRARIES = libmoshutil.a -libmoshutil_a_SOURCES = locale_utils.cc locale_utils.h swrite.cc swrite.h dos_assert.h fatal_assert.h select.h select.cc +libmoshutil_a_SOURCES = locale_utils.cc locale_utils.h swrite.cc swrite.h dos_assert.h fatal_assert.h select.h select.cc timestamp.h timestamp.cc pty_compat.cc pty_compat.h diff -Nru mosh-1.2.2/src/util/dos_assert.h mosh-1.2.4a/src/util/dos_assert.h --- mosh-1.2.2/src/util/dos_assert.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/util/dos_assert.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef DOS_ASSERT_HPP @@ -35,6 +49,6 @@ #define dos_assert(expr) \ ((expr) \ ? (void)0 \ - : dos_detected (__STRING(expr), __FILE__, __LINE__, __PRETTY_FUNCTION__ )) + : dos_detected (#expr, __FILE__, __LINE__, __func__ )) #endif diff -Nru mosh-1.2.2/src/util/fatal_assert.h mosh-1.2.4a/src/util/fatal_assert.h --- mosh-1.2.2/src/util/fatal_assert.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/util/fatal_assert.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef FATAL_ASSERT_HPP @@ -26,12 +40,12 @@ { fprintf( stderr, "Fatal assertion failure in function %s at %s:%d\nFailed test: %s\n", function, file, line, expression ); - exit( 2 ); + abort(); } #define fatal_assert(expr) \ ((expr) \ ? (void)0 \ - : fatal_error (__STRING(expr), __FILE__, __LINE__, __PRETTY_FUNCTION__ )) + : fatal_error (#expr, __FILE__, __LINE__, __func__ )) #endif diff -Nru mosh-1.2.2/src/util/locale_utils.cc mosh-1.2.4a/src/util/locale_utils.cc --- mosh-1.2.2/src/util/locale_utils.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/util/locale_utils.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "config.h" diff -Nru mosh-1.2.2/src/util/locale_utils.h mosh-1.2.4a/src/util/locale_utils.h --- mosh-1.2.2/src/util/locale_utils.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/util/locale_utils.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef LOCALE_UTILS_HPP diff -Nru mosh-1.2.2/src/util/pty_compat.cc mosh-1.2.4a/src/util/pty_compat.cc --- mosh-1.2.2/src/util/pty_compat.cc 1970-01-01 00:00:00.000000000 +0000 +++ mosh-1.2.4a/src/util/pty_compat.cc 2013-03-27 22:36:03.000000000 +0000 @@ -0,0 +1,175 @@ +/* + Mosh: the mobile shell + Copyright 2012 Keith Winstein + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. +*/ + +#include "config.h" + +#if !defined(HAVE_FORKPTY) || !defined(HAVE_CFMAKERAW) +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <fcntl.h> +#include <sys/ioctl.h> +#include <sys/stropts.h> +#include <termios.h> + +#include "pty_compat.h" + +#ifndef HAVE_FORKPTY +pid_t my_forkpty( int *amaster, char *name, + const struct termios *termp, + const struct winsize *winp ) +{ + /* For Solaris and AIX */ + int master, slave; + char *slave_name; + pid_t pid; + +#ifdef _AIX +#define PTY_DEVICE "/dev/ptc" +#else +#define PTY_DEVICE "/dev/ptmx" +#endif + + master = open( PTY_DEVICE, O_RDWR | O_NOCTTY ); + if ( master < 0 ) { + perror( "open("PTY_DEVICE")" ); + return -1; + } + + if ( grantpt( master ) < 0 ) { + perror( "grantpt" ); + close( master ); + return -1; + } + + if ( unlockpt(master) < 0 ) { + perror( "unlockpt" ); + close( master ); + return -1; + } + + slave_name = ptsname( master ); + if ( slave_name == NULL ) { + perror( "ptsname" ); + close( master ); + return -1; + } + + slave = open( slave_name, O_RDWR | O_NOCTTY ); + if ( slave < 0 ) { + perror( "open(slave)" ); + close( master ); + return -1; + } + +#ifndef _AIX + if ( ioctl(slave, I_PUSH, "ptem") < 0 || + ioctl(slave, I_PUSH, "ldterm") < 0 ) { + perror( "ioctl(I_PUSH)" ); + close( slave ); + close( master ); + return -1; + } +#endif + + if ( amaster != NULL ) + *amaster = master; + + if ( name != NULL) + strcpy( name, slave_name ); + + if ( termp != NULL ) { + if ( tcsetattr( slave, TCSAFLUSH, termp ) < 0 ) { + perror( "tcsetattr" ); + exit( 1 ); + } + } + + // we need to set initial window size, or TIOCGWINSZ fails + struct winsize w; + w.ws_row = 25; + w.ws_col = 80; + w.ws_xpixel = 0; + w.ws_ypixel = 0; + if ( ioctl( slave, TIOCSWINSZ, &w) < 0 ) { + perror( "ioctl TIOCSWINSZ" ); + exit( 1 ); + } + if ( winp != NULL ) { + if ( ioctl( slave, TIOCGWINSZ, winp ) < 0 ) { + perror( "ioctl TIOCGWINSZ" ); + exit( 1 ); + } + } + + pid = fork(); + switch ( pid ) { + case -1: /* Error */ + perror( "fork()" ); + return -1; + case 0: /* Child */ + if ( setsid() < 0 ) + perror( "setsid" ); +#ifndef _AIX + if ( ioctl( slave, TIOCSCTTY, NULL ) < 0 ) { + perror( "ioctl" ); + return -1; + } +#endif + close( master ); + dup2( slave, STDIN_FILENO ); + dup2( slave, STDOUT_FILENO ); + dup2( slave, STDERR_FILENO ); + return 0; + default: /* Parent */ + close( slave ); + return pid; + } +} +#endif + +#ifndef HAVE_CFMAKERAW +void my_cfmakeraw( struct termios *termios_p ) +{ + termios_p->c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP + | INLCR | IGNCR | ICRNL | IXON); + termios_p->c_oflag &= ~OPOST; + termios_p->c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN); + termios_p->c_cflag &= ~(CSIZE | PARENB); + termios_p->c_cflag |= CS8; + + termios_p->c_cc[VMIN] = 1; // read() is satisfied after 1 char + termios_p->c_cc[VTIME] = 0; // No timer +} +#endif +#endif diff -Nru mosh-1.2.2/src/util/pty_compat.h mosh-1.2.4a/src/util/pty_compat.h --- mosh-1.2.2/src/util/pty_compat.h 1970-01-01 00:00:00.000000000 +0000 +++ mosh-1.2.4a/src/util/pty_compat.h 2013-03-27 22:36:03.000000000 +0000 @@ -0,0 +1,51 @@ +/* + Mosh: the mobile shell + Copyright 2012 Keith Winstein + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. +*/ + +#ifndef PTY_COMPAT_HPP +#define PTY_COMPAT_HPP + +#include "config.h" + +#ifndef HAVE_FORKPTY +# define forkpty my_forkpty +#endif +#ifndef HAVE_CFMAKERAW +# define cfmakeraw my_cfmakeraw +#endif + +pid_t my_forkpty( int *amaster, char *name, + const struct termios *termp, + const struct winsize *winp ); + +void my_cfmakeraw( struct termios *termios_p ); + +#endif diff -Nru mosh-1.2.2/src/util/select.cc mosh-1.2.4a/src/util/select.cc --- mosh-1.2.2/src/util/select.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/util/select.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include "select.h" diff -Nru mosh-1.2.2/src/util/select.h mosh-1.2.4a/src/util/select.h --- mosh-1.2.2/src/util/select.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/util/select.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef SELECT_HPP @@ -23,8 +37,10 @@ #include <errno.h> #include <signal.h> #include <sys/select.h> +#include <assert.h> #include "fatal_assert.h" +#include "timestamp.h" /* Convenience wrapper for pselect(2). @@ -77,6 +93,11 @@ FD_SET( fd, &all_fds ); } + void clear_fds( void ) + { + FD_ZERO( &all_fds ); + } + void add_signal( int signum ) { fatal_assert( signum >= 0 ); @@ -124,6 +145,8 @@ ret = 0; } + freeze_timestamp(); + return ret; } @@ -132,6 +155,7 @@ const #endif { + assert( FD_ISSET( fd, &all_fds ) ); return FD_ISSET( fd, &read_fds ); } @@ -140,6 +164,7 @@ const #endif { + assert( FD_ISSET( fd, &all_fds ) ); return FD_ISSET( fd, &error_fds ); } diff -Nru mosh-1.2.2/src/util/swrite.cc mosh-1.2.4a/src/util/swrite.cc --- mosh-1.2.2/src/util/swrite.cc 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/util/swrite.cc 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #include <unistd.h> diff -Nru mosh-1.2.2/src/util/swrite.h mosh-1.2.4a/src/util/swrite.h --- mosh-1.2.2/src/util/swrite.h 2012-06-12 19:15:10.000000000 +0000 +++ mosh-1.2.4a/src/util/swrite.h 2013-03-27 22:36:03.000000000 +0000 @@ -14,6 +14,20 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. */ #ifndef SWRITE_HPP diff -Nru mosh-1.2.2/src/util/timestamp.cc mosh-1.2.4a/src/util/timestamp.cc --- mosh-1.2.2/src/util/timestamp.cc 1970-01-01 00:00:00.000000000 +0000 +++ mosh-1.2.4a/src/util/timestamp.cc 2013-03-27 22:36:03.000000000 +0000 @@ -0,0 +1,99 @@ +/* + Mosh: the mobile shell + Copyright 2012 Keith Winstein + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. +*/ + +#include "config.h" + +#include "timestamp.h" + +#include <errno.h> + +#if HAVE_CLOCK_GETTIME + #include <time.h> +#elif HAVE_MACH_ABSOLUTE_TIME + #include <mach/mach_time.h> +#elif HAVE_GETTIMEOFDAY + #include <sys/time.h> + #include <stdio.h> +#endif + +static uint64_t millis_cache = -1; + +uint64_t frozen_timestamp( void ) +{ + if ( millis_cache == uint64_t( -1 ) ) { + freeze_timestamp(); + } + + return millis_cache; +} + +void freeze_timestamp( void ) +{ +#if HAVE_CLOCK_GETTIME + struct timespec tp; + + if ( clock_gettime( CLOCK_MONOTONIC, &tp ) < 0 ) { + /* did not succeed */ + } else { + uint64_t millis = tp.tv_nsec / 1000000; + millis += uint64_t( tp.tv_sec ) * 1000; + + millis_cache = millis; + return; + } +#elif HAVE_MACH_ABSOLUTE_TIME + static mach_timebase_info_data_t s_timebase_info; + + if (s_timebase_info.denom == 0) { + mach_timebase_info(&s_timebase_info); + } + + // NB: mach_absolute_time() returns "absolute time units" + // We need to apply a conversion to get milliseconds. + millis_cache = ((mach_absolute_time() * s_timebase_info.numer) / (1000000 * s_timebase_info.denom)); + return; +#elif HAVE_GETTIMEOFDAY + // NOTE: If time steps backwards, timeouts may be confused. + struct timeval tv; + if ( gettimeofday(&tv, NULL) ) { + perror( "gettimeofday" ); + } else { + uint64_t millis = tv.tv_usec / 1000; + millis += uint64_t( tv.tv_sec ) * 1000; + + millis_cache = millis; + return; + } +#else +# error "Don't know how to get a timestamp on this platform" +#endif +} diff -Nru mosh-1.2.2/src/util/timestamp.h mosh-1.2.4a/src/util/timestamp.h --- mosh-1.2.2/src/util/timestamp.h 1970-01-01 00:00:00.000000000 +0000 +++ mosh-1.2.4a/src/util/timestamp.h 2013-03-27 22:36:03.000000000 +0000 @@ -0,0 +1,41 @@ +/* + Mosh: the mobile shell + Copyright 2012 Keith Winstein + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations including + the two. + + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. If you delete + this exception statement from all source files in the program, then + also delete it here. +*/ + +#ifndef TIMESTAMP_HPP +#define TIMESTAMP_HPP + +#include <stdint.h> + +void freeze_timestamp( void ); +uint64_t frozen_timestamp( void ); + +#endif