From 24e2cf96acf5155d4ed704141e65a8732cb1ecc3 Mon Sep 17 00:00:00 2001 From: des Date: Mon, 2 Oct 2006 13:29:41 +0000 Subject: Dead files. --- crypto/openssh/.cvsignore | 24 - crypto/openssh/acconfig.h | 458 -------- crypto/openssh/contrib/Makefile | 15 - crypto/openssh/contrib/README | 60 - crypto/openssh/contrib/aix/README | 50 - crypto/openssh/contrib/aix/buildbff.sh | 383 ------- crypto/openssh/contrib/aix/inventory.sh | 63 -- crypto/openssh/contrib/aix/pam.conf | 20 - crypto/openssh/contrib/caldera/openssh.spec | 366 ------ crypto/openssh/contrib/caldera/ssh-host-keygen | 36 - crypto/openssh/contrib/caldera/sshd.init | 125 -- crypto/openssh/contrib/caldera/sshd.pam | 8 - crypto/openssh/contrib/cygwin/Makefile | 56 - crypto/openssh/contrib/cygwin/README | 224 ---- crypto/openssh/contrib/cygwin/ssh-host-config | 592 ---------- crypto/openssh/contrib/cygwin/ssh-user-config | 250 ---- crypto/openssh/contrib/findssl.sh | 159 --- crypto/openssh/contrib/gnome-ssh-askpass1.c | 171 --- crypto/openssh/contrib/gnome-ssh-askpass2.c | 220 ---- crypto/openssh/contrib/hpux/README | 45 - crypto/openssh/contrib/hpux/egd | 15 - crypto/openssh/contrib/hpux/egd.rc | 98 -- crypto/openssh/contrib/hpux/sshd | 5 - crypto/openssh/contrib/hpux/sshd.rc | 90 -- .../openssh/contrib/redhat/gnome-ssh-askpass.csh | 1 - crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh | 2 - crypto/openssh/contrib/redhat/openssh.spec | 804 ------------- crypto/openssh/contrib/redhat/sshd.init | 154 --- crypto/openssh/contrib/redhat/sshd.pam | 8 - crypto/openssh/contrib/solaris/README | 24 - crypto/openssh/contrib/solaris/buildpkg.sh | 386 ------- crypto/openssh/contrib/solaris/opensshd.in | 82 -- crypto/openssh/contrib/ssh-copy-id | 50 - crypto/openssh/contrib/ssh-copy-id.1 | 67 -- crypto/openssh/contrib/sshd.pam.freebsd | 5 - crypto/openssh/contrib/sshd.pam.generic | 8 - crypto/openssh/contrib/suse/openssh.spec | 199 ---- crypto/openssh/contrib/suse/rc.config.sshd | 5 - crypto/openssh/contrib/suse/rc.sshd | 80 -- crypto/openssh/envpass.sh | 44 - crypto/openssh/getput.h | 58 - crypto/openssh/moduli.h | 23 - crypto/openssh/mpaux.c | 46 - crypto/openssh/mpaux.h | 22 - crypto/openssh/openbsd-compat/.cvsignore | 1 - crypto/openssh/readpass.h | 19 - crypto/openssh/scard/.cvsignore | 2 - crypto/openssh/sftp-glob.h | 37 - crypto/openssh/sftp-int.c | 1191 -------------------- crypto/openssh/sftp-int.h | 27 - crypto/openssh/sshtty.h | 47 - crypto/openssh/tildexpand.c | 73 -- crypto/openssh/tildexpand.h | 15 - 53 files changed, 7013 deletions(-) delete mode 100644 crypto/openssh/.cvsignore delete mode 100644 crypto/openssh/acconfig.h delete mode 100644 crypto/openssh/contrib/Makefile delete mode 100644 crypto/openssh/contrib/README delete mode 100644 crypto/openssh/contrib/aix/README delete mode 100755 crypto/openssh/contrib/aix/buildbff.sh delete mode 100755 crypto/openssh/contrib/aix/inventory.sh delete mode 100644 crypto/openssh/contrib/aix/pam.conf delete mode 100644 crypto/openssh/contrib/caldera/openssh.spec delete mode 100755 crypto/openssh/contrib/caldera/ssh-host-keygen delete mode 100755 crypto/openssh/contrib/caldera/sshd.init delete mode 100644 crypto/openssh/contrib/caldera/sshd.pam delete mode 100644 crypto/openssh/contrib/cygwin/Makefile delete mode 100644 crypto/openssh/contrib/cygwin/README delete mode 100644 crypto/openssh/contrib/cygwin/ssh-host-config delete mode 100644 crypto/openssh/contrib/cygwin/ssh-user-config delete mode 100644 crypto/openssh/contrib/findssl.sh delete mode 100644 crypto/openssh/contrib/gnome-ssh-askpass1.c delete mode 100644 crypto/openssh/contrib/gnome-ssh-askpass2.c delete mode 100644 crypto/openssh/contrib/hpux/README delete mode 100644 crypto/openssh/contrib/hpux/egd delete mode 100755 crypto/openssh/contrib/hpux/egd.rc delete mode 100644 crypto/openssh/contrib/hpux/sshd delete mode 100755 crypto/openssh/contrib/hpux/sshd.rc delete mode 100644 crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh delete mode 100644 crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh delete mode 100644 crypto/openssh/contrib/redhat/openssh.spec delete mode 100755 crypto/openssh/contrib/redhat/sshd.init delete mode 100644 crypto/openssh/contrib/redhat/sshd.pam delete mode 100755 crypto/openssh/contrib/solaris/README delete mode 100755 crypto/openssh/contrib/solaris/buildpkg.sh delete mode 100755 crypto/openssh/contrib/solaris/opensshd.in delete mode 100644 crypto/openssh/contrib/ssh-copy-id delete mode 100644 crypto/openssh/contrib/ssh-copy-id.1 delete mode 100644 crypto/openssh/contrib/sshd.pam.freebsd delete mode 100644 crypto/openssh/contrib/sshd.pam.generic delete mode 100644 crypto/openssh/contrib/suse/openssh.spec delete mode 100644 crypto/openssh/contrib/suse/rc.config.sshd delete mode 100644 crypto/openssh/contrib/suse/rc.sshd delete mode 100644 crypto/openssh/envpass.sh delete mode 100644 crypto/openssh/getput.h delete mode 100644 crypto/openssh/moduli.h delete mode 100644 crypto/openssh/mpaux.c delete mode 100644 crypto/openssh/mpaux.h delete mode 100644 crypto/openssh/openbsd-compat/.cvsignore delete mode 100644 crypto/openssh/readpass.h delete mode 100644 crypto/openssh/scard/.cvsignore delete mode 100644 crypto/openssh/sftp-glob.h delete mode 100644 crypto/openssh/sftp-int.c delete mode 100644 crypto/openssh/sftp-int.h delete mode 100644 crypto/openssh/sshtty.h delete mode 100644 crypto/openssh/tildexpand.c delete mode 100644 crypto/openssh/tildexpand.h (limited to 'crypto') diff --git a/crypto/openssh/.cvsignore b/crypto/openssh/.cvsignore deleted file mode 100644 index 12de9ef..0000000 --- a/crypto/openssh/.cvsignore +++ /dev/null @@ -1,24 +0,0 @@ -ssh -scp -sshd -ssh-add -ssh-keygen -ssh-keyscan -ssh-keysign -ssh-agent -sftp-server -sftp -configure -config.h.in -config.h -config.status -config.cache -config.log -stamp-h.in -Makefile -ssh_prng_cmds -*.out -*.0 -buildit.sh -autom4te.cache -ssh-rand-helper diff --git a/crypto/openssh/acconfig.h b/crypto/openssh/acconfig.h deleted file mode 100644 index 79b5e81..0000000 --- a/crypto/openssh/acconfig.h +++ /dev/null @@ -1,458 +0,0 @@ -/* $Id: acconfig.h,v 1.183 2005/07/07 10:33:36 dtucker Exp $ */ - -/* - * Copyright (c) 1999-2003 Damien Miller. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _CONFIG_H -#define _CONFIG_H - -/* Generated automatically from acconfig.h by autoheader. */ -/* Please make your changes there */ - -@TOP@ - -/* Define if your platform breaks doing a seteuid before a setuid */ -#undef SETEUID_BREAKS_SETUID - -/* Define if your setreuid() is broken */ -#undef BROKEN_SETREUID - -/* Define if your setregid() is broken */ -#undef BROKEN_SETREGID - -/* Define if your setresuid() is broken */ -#undef BROKEN_SETRESUID - -/* Define if your setresgid() is broken */ -#undef BROKEN_SETRESGID - -/* Define to a Set Process Title type if your system is */ -/* supported by bsd-setproctitle.c */ -#undef SPT_TYPE -#undef SPT_PADCHAR - -/* SCO workaround */ -#undef BROKEN_SYS_TERMIO_H - -/* Define if you have SecureWare-based protected password database */ -#undef HAVE_SECUREWARE - -/* If your header files don't define LOGIN_PROGRAM, then use this (detected) */ -/* from environment and PATH */ -#undef LOGIN_PROGRAM_FALLBACK - -/* Full path of your "passwd" program */ -#undef _PATH_PASSWD_PROG - -/* Define if your password has a pw_class field */ -#undef HAVE_PW_CLASS_IN_PASSWD - -/* Define if your password has a pw_expire field */ -#undef HAVE_PW_EXPIRE_IN_PASSWD - -/* Define if your password has a pw_change field */ -#undef HAVE_PW_CHANGE_IN_PASSWD - -/* Define if your system uses access rights style file descriptor passing */ -#undef HAVE_ACCRIGHTS_IN_MSGHDR - -/* Define if your system uses ancillary data style file descriptor passing */ -#undef HAVE_CONTROL_IN_MSGHDR - -/* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */ -#undef BROKEN_INET_NTOA - -/* Define if your system defines sys_errlist[] */ -#undef HAVE_SYS_ERRLIST - -/* Define if your system defines sys_nerr */ -#undef HAVE_SYS_NERR - -/* Define if your system choked on IP TOS setting */ -#undef IP_TOS_IS_BROKEN - -/* Define if you have the getuserattr function. */ -#undef HAVE_GETUSERATTR - -/* Define if you have the basename function. */ -#undef HAVE_BASENAME - -/* Work around problematic Linux PAM modules handling of PAM_TTY */ -#undef PAM_TTY_KLUDGE - -/* Define if pam_chauthtok wants real uid set to the unpriv'ed user */ -#undef SSHPAM_CHAUTHTOK_NEEDS_RUID - -/* Use PIPES instead of a socketpair() */ -#undef USE_PIPES - -/* Define if your snprintf is busted */ -#undef BROKEN_SNPRINTF - -/* Define if you are on Cygwin */ -#undef HAVE_CYGWIN - -/* Define if you have a broken realpath. */ -#undef BROKEN_REALPATH - -/* Define if you are on NeXT */ -#undef HAVE_NEXT - -/* Define if you want to enable PAM support */ -#undef USE_PAM - -/* Define if you want to enable AIX4's authenticate function */ -#undef WITH_AIXAUTHENTICATE - -/* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */ -#undef AIX_LOGINFAILED_4ARG - -/* Define if your skeychallenge() function takes 4 arguments (eg NetBSD) */ -#undef SKEYCHALLENGE_4ARG - -/* Define if you have/want arrays (cluster-wide session managment, not C arrays) */ -#undef WITH_IRIX_ARRAY - -/* Define if you want IRIX project management */ -#undef WITH_IRIX_PROJECT - -/* Define if you want IRIX audit trails */ -#undef WITH_IRIX_AUDIT - -/* Define if you want IRIX kernel jobs */ -#undef WITH_IRIX_JOBS - -/* Location of PRNGD/EGD random number socket */ -#undef PRNGD_SOCKET - -/* Port number of PRNGD/EGD random number socket */ -#undef PRNGD_PORT - -/* Builtin PRNG command timeout */ -#undef ENTROPY_TIMEOUT_MSEC - -/* non-privileged user for privilege separation */ -#undef SSH_PRIVSEP_USER - -/* Define if you want to install preformatted manpages.*/ -#undef MANTYPE - -/* Define if your ssl headers are included with #include */ -#undef HAVE_OPENSSL - -/* Define if you are linking against RSAref. Used only to print the right - * message at run-time. */ -#undef RSAREF - -/* struct timeval */ -#undef HAVE_STRUCT_TIMEVAL - -/* struct utmp and struct utmpx fields */ -#undef HAVE_HOST_IN_UTMP -#undef HAVE_HOST_IN_UTMPX -#undef HAVE_ADDR_IN_UTMP -#undef HAVE_ADDR_IN_UTMPX -#undef HAVE_ADDR_V6_IN_UTMP -#undef HAVE_ADDR_V6_IN_UTMPX -#undef HAVE_SYSLEN_IN_UTMPX -#undef HAVE_PID_IN_UTMP -#undef HAVE_TYPE_IN_UTMP -#undef HAVE_TYPE_IN_UTMPX -#undef HAVE_TV_IN_UTMP -#undef HAVE_TV_IN_UTMPX -#undef HAVE_ID_IN_UTMP -#undef HAVE_ID_IN_UTMPX -#undef HAVE_EXIT_IN_UTMP -#undef HAVE_TIME_IN_UTMP -#undef HAVE_TIME_IN_UTMPX - -/* Define if you don't want to use your system's login() call */ -#undef DISABLE_LOGIN - -/* Define if you don't want to use pututline() etc. to write [uw]tmp */ -#undef DISABLE_PUTUTLINE - -/* Define if you don't want to use pututxline() etc. to write [uw]tmpx */ -#undef DISABLE_PUTUTXLINE - -/* Define if you don't want to use lastlog */ -#undef DISABLE_LASTLOG - -/* Define if you don't want to use lastlog in session.c */ -#undef NO_SSH_LASTLOG - -/* Define if you don't want to use utmp */ -#undef DISABLE_UTMP - -/* Define if you don't want to use utmpx */ -#undef DISABLE_UTMPX - -/* Define if you don't want to use wtmp */ -#undef DISABLE_WTMP - -/* Define if you don't want to use wtmpx */ -#undef DISABLE_WTMPX - -/* Some systems need a utmpx entry for /bin/login to work */ -#undef LOGIN_NEEDS_UTMPX - -/* Some versions of /bin/login need the TERM supplied on the commandline */ -#undef LOGIN_NEEDS_TERM - -/* Define if your login program cannot handle end of options ("--") */ -#undef LOGIN_NO_ENDOPT - -/* Define if you want to specify the path to your lastlog file */ -#undef CONF_LASTLOG_FILE - -/* Define if you want to specify the path to your utmp file */ -#undef CONF_UTMP_FILE - -/* Define if you want to specify the path to your wtmp file */ -#undef CONF_WTMP_FILE - -/* Define if you want to specify the path to your utmpx file */ -#undef CONF_UTMPX_FILE - -/* Define if you want to specify the path to your wtmpx file */ -#undef CONF_WTMPX_FILE - -/* Define if you want external askpass support */ -#undef USE_EXTERNAL_ASKPASS - -/* Define if libc defines __progname */ -#undef HAVE___PROGNAME - -/* Define if compiler implements __FUNCTION__ */ -#undef HAVE___FUNCTION__ - -/* Define if compiler implements __func__ */ -#undef HAVE___func__ - -/* Define this is you want GSSAPI support in the version 2 protocol */ -#undef GSSAPI - -/* Define if you want Kerberos 5 support */ -#undef KRB5 - -/* Define this if you are using the Heimdal version of Kerberos V5 */ -#undef HEIMDAL - -/* Define this if you want to use libkafs' AFS support */ -#undef USE_AFS - -/* Define if you want S/Key support */ -#undef SKEY - -/* Define if you want TCP Wrappers support */ -#undef LIBWRAP - -/* Define if your libraries define login() */ -#undef HAVE_LOGIN - -/* Define if your libraries define daemon() */ -#undef HAVE_DAEMON - -/* Define if your libraries define getpagesize() */ -#undef HAVE_GETPAGESIZE - -/* Define if xauth is found in your path */ -#undef XAUTH_PATH - -/* Define if you want to allow MD5 passwords */ -#undef HAVE_MD5_PASSWORDS - -/* Define if you want to disable shadow passwords */ -#undef DISABLE_SHADOW - -/* Define if you want to use shadow password expire field */ -#undef HAS_SHADOW_EXPIRE - -/* Define if you have Digital Unix Security Integration Architecture */ -#undef HAVE_OSF_SIA - -/* Define if you have getpwanam(3) [SunOS 4.x] */ -#undef HAVE_GETPWANAM - -/* Define if you have an old version of PAM which takes only one argument */ -/* to pam_strerror */ -#undef HAVE_OLD_PAM - -/* Define if you are using Solaris-derived PAM which passes pam_messages */ -/* to the conversation function with an extra level of indirection */ -#undef PAM_SUN_CODEBASE - -/* Set this to your mail directory if you don't have maillock.h */ -#undef MAIL_DIRECTORY - -/* Data types */ -#undef HAVE_U_INT -#undef HAVE_INTXX_T -#undef HAVE_U_INTXX_T -#undef HAVE_UINTXX_T -#undef HAVE_INT64_T -#undef HAVE_U_INT64_T -#undef HAVE_U_CHAR -#undef HAVE_SIZE_T -#undef HAVE_SSIZE_T -#undef HAVE_CLOCK_T -#undef HAVE_MODE_T -#undef HAVE_PID_T -#undef HAVE_SA_FAMILY_T -#undef HAVE_STRUCT_SOCKADDR_STORAGE -#undef HAVE_STRUCT_ADDRINFO -#undef HAVE_STRUCT_IN6_ADDR -#undef HAVE_STRUCT_SOCKADDR_IN6 - -/* Fields in struct sockaddr_storage */ -#undef HAVE_SS_FAMILY_IN_SS -#undef HAVE___SS_FAMILY_IN_SS - -/* Define if you have /dev/ptmx */ -#undef HAVE_DEV_PTMX - -/* Define if you have /dev/ptc */ -#undef HAVE_DEV_PTS_AND_PTC - -/* Define if you need to use IP address instead of hostname in $DISPLAY */ -#undef IPADDR_IN_DISPLAY - -/* Specify default $PATH */ -#undef USER_PATH - -/* Specify location of ssh.pid */ -#undef _PATH_SSH_PIDDIR - -/* getaddrinfo is broken (if present) */ -#undef BROKEN_GETADDRINFO - -/* updwtmpx is broken (if present) */ -#undef BROKEN_UPDWTMPX - -/* Workaround more Linux IPv6 quirks */ -#undef DONT_TRY_OTHER_AF - -/* Detect IPv4 in IPv6 mapped addresses and treat as IPv4 */ -#undef IPV4_IN_IPV6 - -/* Define if you have BSD auth support */ -#undef BSD_AUTH - -/* Define if X11 doesn't support AF_UNIX sockets on that system */ -#undef NO_X11_UNIX_SOCKETS - -/* Define if the concept of ports only accessible to superusers isn't known */ -#undef NO_IPPORT_RESERVED_CONCEPT - -/* Needed for SCO and NeXT */ -#undef BROKEN_SAVED_UIDS - -/* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */ -#undef GLOB_HAS_ALTDIRFUNC - -/* Define if your system glob() function has gl_matchc options in glob_t */ -#undef GLOB_HAS_GL_MATCHC - -/* Define in your struct dirent expects you to allocate extra space for d_name */ -#undef BROKEN_ONE_BYTE_DIRENT_D_NAME - -/* Define if your system has /etc/default/login */ -#undef HAVE_ETC_DEFAULT_LOGIN - -/* Define if your getopt(3) defines and uses optreset */ -#undef HAVE_GETOPT_OPTRESET - -/* Define on *nto-qnx systems */ -#undef MISSING_NFDBITS - -/* Define on *nto-qnx systems */ -#undef MISSING_HOWMANY - -/* Define on *nto-qnx systems */ -#undef MISSING_FD_MASK - -/* Define if you want smartcard support */ -#undef SMARTCARD - -/* Define if you want smartcard support using sectok */ -#undef USE_SECTOK - -/* Define if you want smartcard support using OpenSC */ -#undef USE_OPENSC - -/* Define if you want to use OpenSSL's internally seeded PRNG only */ -#undef OPENSSL_PRNG_ONLY - -/* Define if you shouldn't strip 'tty' from your ttyname in [uw]tmp */ -#undef WITH_ABBREV_NO_TTY - -/* Define if you want a different $PATH for the superuser */ -#undef SUPERUSER_PATH - -/* Path that unprivileged child will chroot() to in privep mode */ -#undef PRIVSEP_PATH - -/* Define if your platform needs to skip post auth file descriptor passing */ -#undef DISABLE_FD_PASSING - -/* Silly mkstemp() */ -#undef HAVE_STRICT_MKSTEMP - -/* Some systems put this outside of libc */ -#undef HAVE_NANOSLEEP - -/* Define if sshd somehow reacquires a controlling TTY after setsid() */ -#undef SSHD_ACQUIRES_CTTY - -/* Define if cmsg_type is not passed correctly */ -#undef BROKEN_CMSG_TYPE - -/* - * Define to whatever link() returns for "not supported" if it doesn't - * return EOPNOTSUPP. - */ -#undef LINK_OPNOTSUPP_ERRNO - -/* Strings used in /etc/passwd to denote locked account */ -#undef LOCKED_PASSWD_STRING -#undef LOCKED_PASSWD_PREFIX -#undef LOCKED_PASSWD_SUBSTR - -/* Define if getrrsetbyname() exists */ -#undef HAVE_GETRRSETBYNAME - -/* Define if HEADER.ad exists in arpa/nameser.h */ -#undef HAVE_HEADER_AD - -/* Define if your resolver libs need this for getrrsetbyname */ -#undef BIND_8_COMPAT - -/* Define if you have /proc/$pid/fd */ -#undef HAVE_PROC_PID - -@BOTTOM@ - -/* ******************* Shouldn't need to edit below this line ************** */ - -#endif /* _CONFIG_H */ diff --git a/crypto/openssh/contrib/Makefile b/crypto/openssh/contrib/Makefile deleted file mode 100644 index 2cef46f..0000000 --- a/crypto/openssh/contrib/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -all: - @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2" - -gnome-ssh-askpass1: gnome-ssh-askpass1.c - $(CC) `gnome-config --cflags gnome gnomeui` \ - gnome-ssh-askpass1.c -o gnome-ssh-askpass1 \ - `gnome-config --libs gnome gnomeui` - -gnome-ssh-askpass2: gnome-ssh-askpass2.c - $(CC) `pkg-config --cflags gtk+-2.0` \ - gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ - `pkg-config --libs gtk+-2.0` - -clean: - rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass diff --git a/crypto/openssh/contrib/README b/crypto/openssh/contrib/README deleted file mode 100644 index 9de3d96..0000000 --- a/crypto/openssh/contrib/README +++ /dev/null @@ -1,60 +0,0 @@ -Other patches and addons for OpenSSH. Please send submissions to -djm@mindrot.org - -Externally maintained ---------------------- - -SSH Proxy Command -- connect.c - -Shun-ichi GOTO has written a very useful ProxyCommand -which allows the use of outbound SSH from behind a SOCKS4, SOCKS5 or -https CONNECT style proxy server. His page for connect.c has extensive -documentation on its use as well as compiled versions for Win32. - -http://www.taiyo.co.jp/~gotoh/ssh/connect.html - - -X11 SSH Askpass: - -Jim Knoble has written an excellent X11 -passphrase requester. This is highly recommended: - -http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/index.html - - -In this directory ------------------ - -ssh-copy-id: - -Phil Hands' shell script to automate the process of adding -your public key to a remote machine's ~/.ssh/authorized_keys file. - -gnome-ssh-askpass[12]: - -A GNOME and Gtk2 passphrase requesters. Use "make gnome-ssh-askpass1" or -"make gnome-ssh-askpass2" to build. - -sshd.pam.generic: - -A generic PAM config file which may be useful on your system. YMMV - -sshd.pam.freebsd: - -A PAM config file which works with FreeBSD's PAM port. Contributed by -Dominik Brettnacher - -mdoc2man.pl: - -Converts mdoc formated manpages into normal manpages. This can be used -on Solaris machines to provide manpages that are not preformated. -Contributed by Mark D. Roth - -redhat: - -RPM spec file and scripts for building Redhat packages - -suse: - -RPM spec file and scripts for building SuSE packages - diff --git a/crypto/openssh/contrib/aix/README b/crypto/openssh/contrib/aix/README deleted file mode 100644 index 2a29935..0000000 --- a/crypto/openssh/contrib/aix/README +++ /dev/null @@ -1,50 +0,0 @@ -Overview: - -This directory contains files to build an AIX native (installp or SMIT -installable) openssh package. - - -Directions: - -(optional) create config.local in your build dir -./configure [options] -contrib/aix/buildbff.sh - -The file config.local or the environment is read to set the following options -(default first): -PERMIT_ROOT_LOGIN=[no|yes] -X11_FORWARDING=[no|yes] -AIX_SRC=[no|yes] - -Acknowledgements: - -The contents of this directory are based on Ben Lindstrom's Solaris -buildpkg.sh. Ben also supplied inventory.sh. - -Jim Abbey's (GPL'ed) lppbuild-2.1 was used to learn how to build .bff's -and for comparison with the output from this script, however no code -from lppbuild is included and it is not required for operation. - -SRC support based on examples provided by Sandor Sklar and Maarten Kreuger. -PrivSep account handling fixes contributed by W. Earl Allen. - - -Other notes: - -The script treats all packages as USR packages (not ROOT+USR when -appropriate). It seems to work, though...... - -If there are any patches to this that have not yet been integrated they -may be found at http://www.zip.com.au/~dtucker/openssh/. - - -Disclaimer: - -It is hoped that it is useful but there is no warranty. If it breaks -you get to keep both pieces. - - - - Darren Tucker (dtucker at zip dot com dot au) - 2002/03/01 - -$Id: README,v 1.4 2003/08/25 05:01:04 dtucker Exp $ diff --git a/crypto/openssh/contrib/aix/buildbff.sh b/crypto/openssh/contrib/aix/buildbff.sh deleted file mode 100755 index 4a5c32b0e..0000000 --- a/crypto/openssh/contrib/aix/buildbff.sh +++ /dev/null @@ -1,383 +0,0 @@ -#!/bin/sh -# -# buildbff.sh: Create AIX SMIT-installable OpenSSH packages -# $Id: buildbff.sh,v 1.7 2003/11/21 12:48:56 djm Exp $ -# -# Author: Darren Tucker (dtucker at zip dot com dot au) -# This file is placed in the public domain and comes with absolutely -# no warranty. -# -# Based originally on Ben Lindstrom's buildpkg.sh for Solaris -# - -# -# Tunable configuration settings -# create a "config.local" in your build directory or set -# environment variables to override these. -# -[ -z "$PERMIT_ROOT_LOGIN" ] && PERMIT_ROOT_LOGIN=no -[ -z "$X11_FORWARDING" ] && X11_FORWARDING=no -[ -z "$AIX_SRC" ] && AIX_SRC=no - -umask 022 - -startdir=`pwd` - -# Path to inventory.sh: same place as buildbff.sh -if echo $0 | egrep '^/' -then - inventory=`dirname $0`/inventory.sh # absolute path -else - inventory=`pwd`/`dirname $0`/inventory.sh # relative path -fi - -# -# We still support running from contrib/aix, but this is deprecated -# -if pwd | egrep 'contrib/aix$' -then - echo "Changing directory to `pwd`/../.." - echo "Please run buildbff.sh from your build directory in future." - cd ../.. - contribaix=1 -fi - -if [ ! -f Makefile ] -then - echo "Makefile not found (did you run configure?)" - exit 1 -fi - -# -# Directories used during build: -# current dir = $objdir directory you ran ./configure in. -# $objdir/$PKGDIR/ directory package files are constructed in -# $objdir/$PKGDIR/root/ package root ($FAKE_ROOT) -# -objdir=`pwd` -PKGNAME=openssh -PKGDIR=package - -# -# Collect local configuration settings to override defaults -# -if [ -s ./config.local ] -then - echo Reading local settings from config.local - . ./config.local -fi - -# -# Fill in some details from Makefile, like prefix and sysconfdir -# the eval also expands variables like sysconfdir=${prefix}/etc -# provided they are eval'ed in the correct order -# -for confvar in prefix exec_prefix bindir sbindir libexecdir datadir mandir mansubdir sysconfdir piddir srcdir -do - eval $confvar=`grep "^$confvar=" $objdir/Makefile | cut -d = -f 2` -done - -# -# Collect values of privsep user and privsep path -# currently only found in config.h -# -for confvar in SSH_PRIVSEP_USER PRIVSEP_PATH -do - eval $confvar=`awk '/#define[ \t]'$confvar'/{print $3}' $objdir/config.h` -done - -# Set privsep defaults if not defined -if [ -z "$SSH_PRIVSEP_USER" ] -then - SSH_PRIVSEP_USER=sshd -fi -if [ -z "$PRIVSEP_PATH" ] -then - PRIVSEP_PATH=/var/empty -fi - -# Clean package build directory -rm -rf $objdir/$PKGDIR -FAKE_ROOT=$objdir/$PKGDIR/root -mkdir -p $FAKE_ROOT - -# Start by faking root install -echo "Faking root install..." -cd $objdir -make install-nokeys DESTDIR=$FAKE_ROOT - -if [ $? -gt 0 ] -then - echo "Fake root install failed, stopping." - exit 1 -fi - -# -# Copy informational files to include in package -# -cp $srcdir/LICENCE $objdir/$PKGDIR/ -cp $srcdir/README* $objdir/$PKGDIR/ - -# -# Extract common info requires for the 'info' part of the package. -# AIX requires 4-part version numbers -# -VERSION=`./ssh -V 2>&1 | cut -f 1 -d , | cut -f 2 -d _` -MAJOR=`echo $VERSION | cut -f 1 -d p | cut -f 1 -d .` -MINOR=`echo $VERSION | cut -f 1 -d p | cut -f 2 -d .` -PATCH=`echo $VERSION | cut -f 1 -d p | cut -f 3 -d .` -PORTABLE=`echo $VERSION | awk 'BEGIN{FS="p"}{print $2}'` -[ "$PATCH" = "" ] && PATCH=0 -[ "$PORTABLE" = "" ] && PORTABLE=0 -BFFVERSION=`printf "%d.%d.%d.%d" $MAJOR $MINOR $PATCH $PORTABLE` - -echo "Building BFF for $PKGNAME $VERSION (package version $BFFVERSION)" - -# -# Set ssh and sshd parameters as per config.local -# -if [ "${PERMIT_ROOT_LOGIN}" = no ] -then - perl -p -i -e "s/#PermitRootLogin yes/PermitRootLogin no/" \ - $FAKE_ROOT/${sysconfdir}/sshd_config -fi -if [ "${X11_FORWARDING}" = yes ] -then - perl -p -i -e "s/#X11Forwarding no/X11Forwarding yes/" \ - $FAKE_ROOT/${sysconfdir}/sshd_config -fi - - -# Rename config files; postinstall script will copy them if necessary -for cfgfile in ssh_config sshd_config ssh_prng_cmds -do - mv $FAKE_ROOT/$sysconfdir/$cfgfile $FAKE_ROOT/$sysconfdir/$cfgfile.default -done - -# -# Generate lpp control files. -# working dir is $FAKE_ROOT but files are generated in dir above -# and moved into place just before creation of .bff -# -cd $FAKE_ROOT -echo Generating LPP control files -find . ! -name . -print >../openssh.al -$inventory >../openssh.inventory - -cat <../openssh.copyright -This software is distributed under a BSD-style license. -For the full text of the license, see /usr/lpp/openssh/LICENCE -EOD - -# -# openssh.size file allows filesystem expansion as required -# generate list of directories containing files -# then calculate disk usage for each directory and store in openssh.size -# -files=`find . -type f -print` -dirs=`for file in $files; do dirname $file; done | sort -u` -for dir in $dirs -do - du $dir -done > ../openssh.size - -# -# Create postinstall script -# -cat <>../openssh.post_i -#!/bin/sh - -echo Creating configs from defaults if necessary. -for cfgfile in ssh_config sshd_config ssh_prng_cmds -do - if [ ! -f $sysconfdir/\$cfgfile ] - then - echo "Creating \$cfgfile from default" - cp $sysconfdir/\$cfgfile.default $sysconfdir/\$cfgfile - else - echo "\$cfgfile already exists." - fi -done -echo - -# Create PrivSep user if PrivSep not disabled in config -echo Creating PrivSep prereqs if required. -if egrep '^[ \t]*UsePrivilegeSeparation[ \t]+no' $sysconfdir/sshd_config >/dev/null -then - echo "UsePrivilegeSeparation disabled in config, not creating PrivSep user," - echo "group or chroot directory." -else - echo "UsePrivilegeSeparation enabled in config (or defaulting to on)." - - # create group if required - if cut -f1 -d: /etc/group | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null - then - echo "PrivSep group $SSH_PRIVSEP_USER already exists." - else - echo "Creating PrivSep group $SSH_PRIVSEP_USER." - mkgroup -A $SSH_PRIVSEP_USER - fi - - # Create user if required - if lsuser ALL | cut -f1 -d: | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null - then - echo "PrivSep user $SSH_PRIVSEP_USER already exists." - else - echo "Creating PrivSep user $SSH_PRIVSEP_USER." - mkuser gecos='SSHD PrivSep User' login=false rlogin=false account_locked=true pgrp=$SSH_PRIVSEP_USER $SSH_PRIVSEP_USER - fi - - # create chroot directory if required - if [ -d $PRIVSEP_PATH ] - then - echo "PrivSep chroot directory $PRIVSEP_PATH already exists." - else - echo "Creating PrivSep chroot directory $PRIVSEP_PATH." - mkdir $PRIVSEP_PATH - chown 0 $PRIVSEP_PATH - chgrp 0 $PRIVSEP_PATH - chmod 755 $PRIVSEP_PATH - fi -fi -echo - -# Generate keys unless they already exist -echo Creating host keys if required. -if [ -f "$sysconfdir/ssh_host_key" ] ; then - echo "$sysconfdir/ssh_host_key already exists, skipping." -else - $bindir/ssh-keygen -t rsa1 -f $sysconfdir/ssh_host_key -N "" -fi -if [ -f $sysconfdir/ssh_host_dsa_key ] ; then - echo "$sysconfdir/ssh_host_dsa_key already exists, skipping." -else - $bindir/ssh-keygen -t dsa -f $sysconfdir/ssh_host_dsa_key -N "" -fi -if [ -f $sysconfdir/ssh_host_rsa_key ] ; then - echo "$sysconfdir/ssh_host_rsa_key already exists, skipping." -else - $bindir/ssh-keygen -t rsa -f $sysconfdir/ssh_host_rsa_key -N "" -fi -echo - -# Set startup command depending on SRC support -if [ "$AIX_SRC" = "yes" ] -then - echo Creating SRC sshd subsystem. - rmssys -s sshd 2>&1 >/dev/null - mkssys -s sshd -p "$sbindir/sshd" -a '-D' -u 0 -S -n 15 -f 9 -R -G tcpip - startupcmd="start $sbindir/sshd \\\"\\\$src_running\\\"" - oldstartcmd="$sbindir/sshd" -else - startupcmd="$sbindir/sshd" - oldstartcmd="start $sbindir/sshd \\\"$src_running\\\"" -fi - -# If migrating to or from SRC, change previous startup command -# otherwise add to rc.tcpip -if egrep "^\$oldstartcmd" /etc/rc.tcpip >/dev/null -then - if sed "s|^\$oldstartcmd|\$startupcmd|g" /etc/rc.tcpip >/etc/rc.tcpip.new - then - chmod 0755 /etc/rc.tcpip.new - mv /etc/rc.tcpip /etc/rc.tcpip.old && \ - mv /etc/rc.tcpip.new /etc/rc.tcpip - else - echo "Updating /etc/rc.tcpip failed, please check." - fi -else - # Add to system startup if required - if grep "^\$startupcmd" /etc/rc.tcpip >/dev/null - then - echo "sshd found in rc.tcpip, not adding." - else - echo "Adding sshd to rc.tcpip" - echo >>/etc/rc.tcpip - echo "# Start sshd" >>/etc/rc.tcpip - echo "\$startupcmd" >>/etc/rc.tcpip - fi -fi -EOF - -# -# Create liblpp.a and move control files into it -# -echo Creating liblpp.a -( - cd .. - for i in openssh.al openssh.copyright openssh.inventory openssh.post_i openssh.size LICENCE README* - do - ar -r liblpp.a $i - rm $i - done -) - -# -# Create lpp_name -# -# This will end up looking something like: -# 4 R I OpenSSH { -# OpenSSH 3.0.2.1 1 N U en_US OpenSSH 3.0.2p1 Portable for AIX -# [ -# % -# /usr/local/bin 8073 -# /usr/local/etc 189 -# /usr/local/libexec 185 -# /usr/local/man/man1 145 -# /usr/local/man/man8 83 -# /usr/local/sbin 2105 -# /usr/local/share 3 -# % -# ] -# } - -echo Creating lpp_name -cat <../lpp_name -4 R I $PKGNAME { -$PKGNAME $BFFVERSION 1 N U en_US OpenSSH $VERSION Portable for AIX -[ -% -EOF - -for i in $bindir $sysconfdir $libexecdir $mandir/${mansubdir}1 $mandir/${mansubdir}8 $sbindir $datadir /usr/lpp/openssh -do - # get size in 512 byte blocks - if [ -d $FAKE_ROOT/$i ] - then - size=`du $FAKE_ROOT/$i | awk '{print $1}'` - echo "$i $size" >>../lpp_name - fi -done - -echo '%' >>../lpp_name -echo ']' >>../lpp_name -echo '}' >>../lpp_name - -# -# Move pieces into place -# -mkdir -p usr/lpp/openssh -mv ../liblpp.a usr/lpp/openssh -mv ../lpp_name . - -# -# Now invoke backup to create .bff file -# note: lpp_name needs to be the first file so we generate the -# file list on the fly and feed it to backup using -i -# -echo Creating $PKGNAME-$VERSION.bff with backup... -rm -f $PKGNAME-$VERSION.bff -( - echo "./lpp_name" - find . ! -name lpp_name -a ! -name . -print -) | backup -i -q -f ../$PKGNAME-$VERSION.bff $filelist - -# -# Move package into final location and clean up -# -mv ../$PKGNAME-$VERSION.bff $startdir -cd $startdir -rm -rf $objdir/$PKGDIR - -echo $0: done. - diff --git a/crypto/openssh/contrib/aix/inventory.sh b/crypto/openssh/contrib/aix/inventory.sh deleted file mode 100755 index e2641e7..0000000 --- a/crypto/openssh/contrib/aix/inventory.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# -# inventory.sh -# $Id: inventory.sh,v 1.6 2003/11/21 12:48:56 djm Exp $ -# -# Originally written by Ben Lindstrom, modified by Darren Tucker to use perl -# This file is placed into the public domain. -# -# This will produce an AIX package inventory file, which looks like: -# -# /usr/local/bin: -# class=apply,inventory,openssh -# owner=root -# group=system -# mode=755 -# type=DIRECTORY -# /usr/local/bin/slogin: -# class=apply,inventory,openssh -# owner=root -# group=system -# mode=777 -# type=SYMLINK -# target=ssh -# /usr/local/share/Ssh.bin: -# class=apply,inventory,openssh -# owner=root -# group=system -# mode=644 -# type=FILE -# size=VOLATILE -# checksum=VOLATILE - -find . ! -name . -print | perl -ne '{ - chomp; - if ( -l $_ ) { - ($dev,$ino,$mod,$nl,$uid,$gid,$rdev,$sz,$at,$mt,$ct,$bsz,$blk)=lstat; - } else { - ($dev,$ino,$mod,$nl,$uid,$gid,$rdev,$sz,$at,$mt,$ct,$bsz,$blk)=stat; - } - - # Start to display inventory information - $name = $_; - $name =~ s|^.||; # Strip leading dot from path - print "$name:\n"; - print "\tclass=apply,inventory,openssh\n"; - print "\towner=root\n"; - print "\tgroup=system\n"; - printf "\tmode=%lo\n", $mod & 07777; # Mask perm bits - - if ( -l $_ ) { - # Entry is SymLink - print "\ttype=SYMLINK\n"; - printf "\ttarget=%s\n", readlink($_); - } elsif ( -f $_ ) { - # Entry is File - print "\ttype=FILE\n"; - print "\tsize=$sz\n"; - print "\tchecksum=VOLATILE\n"; - } elsif ( -d $_ ) { - # Entry is Directory - print "\ttype=DIRECTORY\n"; - } -}' diff --git a/crypto/openssh/contrib/aix/pam.conf b/crypto/openssh/contrib/aix/pam.conf deleted file mode 100644 index 1495f43..0000000 --- a/crypto/openssh/contrib/aix/pam.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# PAM configuration file /etc/pam.conf -# Example for OpenSSH on AIX 5.2 -# - -# Authentication Management -sshd auth required /usr/lib/security/pam_aix -OTHER auth required /usr/lib/security/pam_aix - -# Account Management -sshd account required /usr/lib/security/pam_aix -OTHER account required /usr/lib/security/pam_aix - -# Session Management -sshd password required /usr/lib/security/pam_aix -OTHER password required /usr/lib/security/pam_aix - -# Password Management -sshd session required /usr/lib/security/pam_aix -OTHER session required /usr/lib/security/pam_aix diff --git a/crypto/openssh/contrib/caldera/openssh.spec b/crypto/openssh/contrib/caldera/openssh.spec deleted file mode 100644 index e690f10..0000000 --- a/crypto/openssh/contrib/caldera/openssh.spec +++ /dev/null @@ -1,366 +0,0 @@ - -# Some of this will need re-evaluation post-LSB. The SVIdir is there -# because the link appeared broken. The rest is for easy compilation, -# the tradeoff open to discussion. (LC957) - -%define SVIdir /etc/rc.d/init.d -%{!?_defaultdocdir:%define _defaultdocdir %{_prefix}/share/doc/packages} -%{!?SVIcdir:%define SVIcdir /etc/sysconfig/daemons} - -%define _mandir %{_prefix}/share/man/en -%define _sysconfdir /etc/ssh -%define _libexecdir %{_libdir}/ssh - -# Do we want to disable root_login? (1=yes 0=no) -%define no_root_login 0 - -#old cvs stuff. please update before use. may be deprecated. -%define use_stable 1 -%if %{use_stable} - %define version 3.8.1p1 - %define cvs %{nil} - %define release 1 -%else - %define version 3.8.1p1 - %define cvs cvs20011009 - %define release 0r1 -%endif -%define xsa x11-ssh-askpass -%define askpass %{xsa}-1.2.4.1 - -# OpenSSH privilege separation requires a user & group ID -%define sshd_uid 67 -%define sshd_gid 67 - -Name : openssh -Version : %{version}%{cvs} -Release : %{release} -Group : System/Network - -Summary : OpenSSH free Secure Shell (SSH) implementation. -Summary(de) : OpenSSH - freie Implementation der Secure Shell (SSH). -Summary(es) : OpenSSH implementación libre de Secure Shell (SSH). -Summary(fr) : Implémentation libre du shell sécurisé OpenSSH (SSH). -Summary(it) : Implementazione gratuita OpenSSH della Secure Shell. -Summary(pt) : Implementação livre OpenSSH do protocolo 'Secure Shell' (SSH). -Summary(pt_BR) : Implementação livre OpenSSH do protocolo Secure Shell (SSH). - -Copyright : BSD -Packager : Raymund Will -URL : http://www.openssh.com/ - -Obsoletes : ssh, ssh-clients, openssh-clients - -BuildRoot : /tmp/%{name}-%{version} -BuildRequires : XFree86-imake - -# %{use_stable}==1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -# %{use_stable}==0: :pserver:cvs@bass.directhit.com:/cvs/openssh_cvs -Source0: see-above:/.../openssh-%{version}.tar.gz -%if %{use_stable} -Source1: see-above:/.../openssh-%{version}.tar.gz.sig -%endif -Source2: http://www.ntrnet.net/~jmknoble/software/%{xsa}/%{askpass}.tar.gz -Source3: http://www.openssh.com/faq.html - -%Package server -Group : System/Network -Requires : openssh = %{version} -Obsoletes : ssh-server - -Summary : OpenSSH Secure Shell protocol server (sshd). -Summary(de) : OpenSSH Secure Shell Protocol-Server (sshd). -Summary(es) : Servidor del protocolo OpenSSH Secure Shell (sshd). -Summary(fr) : Serveur de protocole du shell sécurisé OpenSSH (sshd). -Summary(it) : Server OpenSSH per il protocollo Secure Shell (sshd). -Summary(pt) : Servidor do protocolo 'Secure Shell' OpenSSH (sshd). -Summary(pt_BR) : Servidor do protocolo Secure Shell OpenSSH (sshd). - - -%Package askpass -Group : System/Network -Requires : openssh = %{version} -URL : http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/ -Obsoletes : ssh-extras - -Summary : OpenSSH X11 pass-phrase dialog. -Summary(de) : OpenSSH X11 Passwort-Dialog. -Summary(es) : Aplicación de petición de frase clave OpenSSH X11. -Summary(fr) : Dialogue pass-phrase X11 d'OpenSSH. -Summary(it) : Finestra di dialogo X11 per la frase segreta di OpenSSH. -Summary(pt) : Diálogo de pedido de senha para X11 do OpenSSH. -Summary(pt_BR) : Diálogo de pedido de senha para X11 do OpenSSH. - - -%Description -OpenSSH (Secure Shell) provides access to a remote system. It replaces -telnet, rlogin, rexec, and rsh, and provides secure encrypted -communications between two untrusted hosts over an insecure network. -X11 connections and arbitrary TCP/IP ports can also be forwarded over -the secure channel. - -%Description -l de -OpenSSH (Secure Shell) stellt den Zugang zu anderen Rechnern her. Es ersetzt -telnet, rlogin, rexec und rsh und stellt eine sichere, verschlüsselte -Verbindung zwischen zwei nicht vertrauenswürdigen Hosts über eine unsicheres -Netzwerk her. X11 Verbindungen und beliebige andere TCP/IP Ports können ebenso -über den sicheren Channel weitergeleitet werden. - -%Description -l es -OpenSSH (Secure Shell) proporciona acceso a sistemas remotos. Reemplaza a -telnet, rlogin, rexec, y rsh, y proporciona comunicaciones seguras encriptadas -entre dos equipos entre los que no se ha establecido confianza a través de una -red insegura. Las conexiones X11 y puertos TCP/IP arbitrarios también pueden -ser canalizadas sobre el canal seguro. - -%Description -l fr -OpenSSH (Secure Shell) fournit un accès à un système distant. Il remplace -telnet, rlogin, rexec et rsh, tout en assurant des communications cryptées -securisées entre deux hôtes non fiabilisés sur un réseau non sécurisé. Des -connexions X11 et des ports TCP/IP arbitraires peuvent également être -transmis sur le canal sécurisé. - -%Description -l it -OpenSSH (Secure Shell) fornisce l'accesso ad un sistema remoto. -Sostituisce telnet, rlogin, rexec, e rsh, e fornisce comunicazioni sicure -e crittate tra due host non fidati su una rete non sicura. Le connessioni -X11 ad una porta TCP/IP arbitraria possono essere inoltrate attraverso -un canale sicuro. - -%Description -l pt -OpenSSH (Secure Shell) fornece acesso a um sistema remoto. Substitui o -telnet, rlogin, rexec, e o rsh e fornece comunicações seguras e cifradas -entre duas máquinas sem confiança mútua sobre uma rede insegura. -Ligações X11 e portos TCP/IP arbitrários também poder ser reenviados -pelo canal seguro. - -%Description -l pt_BR -O OpenSSH (Secure Shell) fornece acesso a um sistema remoto. Substitui o -telnet, rlogin, rexec, e o rsh e fornece comunicações seguras e criptografadas -entre duas máquinas sem confiança mútua sobre uma rede insegura. -Ligações X11 e portas TCP/IP arbitrárias também podem ser reenviadas -pelo canal seguro. - -%Description server -This package installs the sshd, the server portion of OpenSSH. - -%Description -l de server -Dieses Paket installiert den sshd, den Server-Teil der OpenSSH. - -%Description -l es server -Este paquete instala sshd, la parte servidor de OpenSSH. - -%Description -l fr server -Ce paquetage installe le 'sshd', partie serveur de OpenSSH. - -%Description -l it server -Questo pacchetto installa sshd, il server di OpenSSH. - -%Description -l pt server -Este pacote intala o sshd, o servidor do OpenSSH. - -%Description -l pt_BR server -Este pacote intala o sshd, o servidor do OpenSSH. - -%Description askpass -This package contains an X11-based pass-phrase dialog used per -default by ssh-add(1). It is based on %{askpass} -by Jim Knoble . - - -%Prep -%setup %([ -z "%{cvs}" ] || echo "-n %{name}_cvs") -a2 -%if ! %{use_stable} - autoreconf -%endif - - -%Build -CFLAGS="$RPM_OPT_FLAGS" \ -%configure \ - --with-pam \ - --with-tcp-wrappers \ - --with-privsep-path=%{_var}/empty/sshd \ - #leave this line for easy edits. - -%__make CFLAGS="$RPM_OPT_FLAGS" - -cd %{askpass} -%configure \ - #leave this line for easy edits. - -xmkmf -%__make includes -%__make - - -%Install -[ %{buildroot} != "/" ] && rm -rf %{buildroot} - -make install DESTDIR=%{buildroot} -%makeinstall -C %{askpass} \ - BINDIR=%{_libexecdir} \ - MANPATH=%{_mandir} \ - DESTDIR=%{buildroot} - -# OpenLinux specific configuration -mkdir -p %{buildroot}{/etc/pam.d,%{SVIcdir},%{SVIdir}} -mkdir -p %{buildroot}%{_var}/empty/sshd - -# enabling X11 forwarding on the server is convenient and okay, -# on the client side it's a potential security risk! -%__perl -pi -e 's:#X11Forwarding no:X11Forwarding yes:g' \ - %{buildroot}%{_sysconfdir}/sshd_config - -%if %{no_root_login} -%__perl -pi -e 's:#PermitRootLogin yes:PermitRootLogin no:g' \ - %{buildroot}%{_sysconfdir}/sshd_config -%endif - -install -m644 contrib/caldera/sshd.pam %{buildroot}/etc/pam.d/sshd -# FIXME: disabled, find out why this doesn't work with nis -%__perl -pi -e 's:(.*pam_limits.*):#$1:' \ - %{buildroot}/etc/pam.d/sshd - -install -m 0755 contrib/caldera/sshd.init %{buildroot}%{SVIdir}/sshd - -# the last one is needless, but more future-proof -find %{buildroot}%{SVIdir} -type f -exec \ - %__perl -pi -e 's:\@SVIdir\@:%{SVIdir}:g;\ - s:\@sysconfdir\@:%{_sysconfdir}:g; \ - s:/usr/sbin:%{_sbindir}:g'\ - \{\} \; - -cat <<-EoD > %{buildroot}%{SVIcdir}/sshd - IDENT=sshd - DESCRIPTIVE="OpenSSH secure shell daemon" - # This service will be marked as 'skipped' on boot if there - # is no host key. Use ssh-host-keygen to generate one - ONBOOT="yes" - OPTIONS="" -EoD - -SKG=%{buildroot}%{_sbindir}/ssh-host-keygen -install -m 0755 contrib/caldera/ssh-host-keygen $SKG -# Fix up some path names in the keygen toy^Hol - %__perl -pi -e 's:\@sysconfdir\@:%{_sysconfdir}:g; \ - s:\@sshkeygen\@:%{_bindir}/ssh-keygen:g' \ - %{buildroot}%{_sbindir}/ssh-host-keygen - -# This looks terrible. Expect it to change. -# install remaining docs -DocD="%{buildroot}%{_defaultdocdir}/%{name}-%{version}" -mkdir -p $DocD/%{askpass} -cp -a CREDITS ChangeLog LICENCE OVERVIEW README* TODO $DocD -install -p -m 0444 %{SOURCE3} $DocD/faq.html -cp -a %{askpass}/{README,ChangeLog,TODO,SshAskpass*.ad} $DocD/%{askpass} -%if %{use_stable} - cp -p %{askpass}/%{xsa}.man $DocD/%{askpass}/%{xsa}.1 -%else - cp -p %{askpass}/%{xsa}.man %{buildroot}%{_mandir}man1/%{xsa}.1 - ln -s %{xsa}.1 %{buildroot}%{_mandir}man1/ssh-askpass.1 -%endif - -find %{buildroot}%{_mandir} -type f -not -name '*.gz' -print0 | xargs -0r %__gzip -9nf -rm %{buildroot}%{_mandir}/man1/slogin.1 && \ - ln -s %{_mandir}/man1/ssh.1.gz \ - %{buildroot}%{_mandir}/man1/slogin.1.gz - - -%Clean -#%{rmDESTDIR} -[ %{buildroot} != "/" ] && rm -rf %{buildroot} - -%Post -# Generate host key when none is present to get up and running, -# both client and server require this for host-based auth! -# ssh-host-keygen checks for existing keys. -/usr/sbin/ssh-host-keygen -: # to protect the rpm database - -%pre server -%{_sbindir}/groupadd -g %{sshd_gid} sshd 2>/dev/null || : -%{_sbindir}/useradd -d /var/empty/sshd -s /bin/false -u %{sshd_uid} \ - -c "SSH Daemon virtual user" -g sshd sshd 2>/dev/null || : -: # to protect the rpm database - -%Post server -if [ -x %{LSBinit}-install ]; then - %{LSBinit}-install sshd -else - lisa --SysV-init install sshd S55 2:3:4:5 K45 0:1:6 -fi - -! %{SVIdir}/sshd status || %{SVIdir}/sshd restart -: # to protect the rpm database - - -%PreUn server -[ "$1" = 0 ] || exit 0 - -! %{SVIdir}/sshd status || %{SVIdir}/sshd stop -: # to protect the rpm database - - -%PostUn server -if [ -x %{LSBinit}-remove ]; then - %{LSBinit}-remove sshd -else - lisa --SysV-init remove sshd $1 -fi -: # to protect the rpm database - - -%Files -%defattr(-,root,root) -%dir %{_sysconfdir} -%config %{_sysconfdir}/ssh_config -%{_bindir}/scp -%{_bindir}/sftp -%{_bindir}/ssh -%{_bindir}/slogin -%{_bindir}/ssh-add -%attr(2755,root,nobody) %{_bindir}/ssh-agent -%{_bindir}/ssh-keygen -%{_bindir}/ssh-keyscan -%dir %{_libexecdir} -%attr(4711,root,root) %{_libexecdir}/ssh-keysign -%{_sbindir}/ssh-host-keygen -%dir %{_defaultdocdir}/%{name}-%{version} -%{_defaultdocdir}/%{name}-%{version}/CREDITS -%{_defaultdocdir}/%{name}-%{version}/ChangeLog -%{_defaultdocdir}/%{name}-%{version}/LICENCE -%{_defaultdocdir}/%{name}-%{version}/OVERVIEW -%{_defaultdocdir}/%{name}-%{version}/README* -%{_defaultdocdir}/%{name}-%{version}/TODO -%{_defaultdocdir}/%{name}-%{version}/faq.html -%{_mandir}/man1/* -%{_mandir}/man8/ssh-keysign.8.gz -%{_mandir}/man5/ssh_config.5.gz - -%Files server -%defattr(-,root,root) -%dir %{_var}/empty/sshd -%config %{SVIdir}/sshd -%config /etc/pam.d/sshd -%config %{_sysconfdir}/moduli -%config %{_sysconfdir}/sshd_config -%config %{SVIcdir}/sshd -%{_libexecdir}/sftp-server -%{_sbindir}/sshd -%{_mandir}/man5/sshd_config.5.gz -%{_mandir}/man8/sftp-server.8.gz -%{_mandir}/man8/sshd.8.gz - -%Files askpass -%defattr(-,root,root) -%{_libexecdir}/ssh-askpass -%{_libexecdir}/x11-ssh-askpass -%{_defaultdocdir}/%{name}-%{version}/%{askpass} - - -%ChangeLog -* Mon Jan 01 1998 ... -Template Version: 1.31 - -$Id: openssh.spec,v 1.49 2004/03/21 22:40:04 djm Exp $ diff --git a/crypto/openssh/contrib/caldera/ssh-host-keygen b/crypto/openssh/contrib/caldera/ssh-host-keygen deleted file mode 100755 index 3c5c171..0000000 --- a/crypto/openssh/contrib/caldera/ssh-host-keygen +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh -# -# $Id: ssh-host-keygen,v 1.2 2003/11/21 12:48:57 djm Exp $ -# -# This script is normally run only *once* for a given host -# (in a given period of time) -- on updates/upgrades/recovery -# the ssh_host_key* files _should_ be retained! Otherwise false -# "man-in-the-middle-attack" alerts will frighten unsuspecting -# clients... - -keydir=@sysconfdir@ -keygen=@sshkeygen@ - -if [ -f $keydir/ssh_host_key -o \ - -f $keydir/ssh_host_key.pub ]; then - echo "You already have an SSH1 RSA host key in $keydir/ssh_host_key." -else - echo "Generating 1024 bit SSH1 RSA host key." - $keygen -b 1024 -t rsa1 -f $keydir/ssh_host_key -C '' -N '' -fi - -if [ -f $keydir/ssh_host_rsa_key -o \ - -f $keydir/ssh_host_rsa_key.pub ]; then - echo "You already have an SSH2 RSA host key in $keydir/ssh_host_rsa_key." -else - echo "Generating 1024 bit SSH2 RSA host key." - $keygen -b 1024 -t rsa -f $keydir/ssh_host_rsa_key -C '' -N '' -fi - -if [ -f $keydir/ssh_host_dsa_key -o \ - -f $keydir/ssh_host_dsa_key.pub ]; then - echo "You already have an SSH2 DSA host key in $keydir/ssh_host_dsa_key." -else - echo "Generating SSH2 DSA host key." - $keygen -t dsa -f $keydir/ssh_host_dsa_key -C '' -N '' -fi diff --git a/crypto/openssh/contrib/caldera/sshd.init b/crypto/openssh/contrib/caldera/sshd.init deleted file mode 100755 index 983146f..0000000 --- a/crypto/openssh/contrib/caldera/sshd.init +++ /dev/null @@ -1,125 +0,0 @@ -#! /bin/bash -# -# $Id: sshd.init,v 1.4 2003/11/21 12:48:57 djm Exp $ -# -### BEGIN INIT INFO -# Provides: -# Required-Start: $network -# Required-Stop: -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -# Description: sshd -# Bring up/down the OpenSSH secure shell daemon. -### END INIT INFO -# -# Written by Miquel van Smoorenburg . -# Modified for Debian GNU/Linux by Ian Murdock . -# Modified for OpenLinux by Raymund Will - -NAME=sshd -DAEMON=/usr/sbin/$NAME -# Hack-Alert(TM)! This is necessary to get around the 'reload'-problem -# created by recent OpenSSH daemon/ssd combinations. See Caldera internal -# PR [linux/8278] for details... -PIDF=/var/run/$NAME.pid -NAME=$DAEMON - -_status() { - [ -z "$1" ] || local pidf="$1" - local ret=-1 - local pid - if [ -n "$pidf" ] && [ -r "$pidf" ]; then - pid=$(head -1 $pidf) - else - pid=$(pidof $NAME) - fi - - if [ ! -e $SVIlock ]; then - # no lock-file => not started == stopped? - ret=3 - elif [ -n "$pidf" -a ! -f "$pidf" ] || [ -z "$pid" ]; then - # pid-file given but not present or no pid => died, but was not stopped - ret=2 - elif [ -r /proc/$pid/cmdline ] && - echo -ne $NAME'\000' | cmp -s - /proc/$pid/cmdline; then - # pid-file given and present or pid found => check process... - # but don't compare exe, as this will fail after an update! - # compares OK => all's well, that ends well... - ret=0 - else - # no such process or exe does not match => stale pid-file or process died - # just recently... - ret=1 - fi - return $ret -} - -# Source function library (and set vital variables). -. @SVIdir@/functions - -case "$1" in - start) - [ ! -e $SVIlock ] || exit 0 - [ -x $DAEMON ] || exit 5 - SVIemptyConfig @sysconfdir@/sshd_config && exit 6 - - if [ ! \( -f @sysconfdir@/ssh_host_key -a \ - -f @sysconfdir@/ssh_host_key.pub \) -a \ - ! \( -f @sysconfdir@/ssh_host_rsa_key -a \ - -f @sysconfdir@/ssh_host_rsa_key.pub \) -a \ - ! \( -f @sysconfdir@/ssh_host_dsa_key -a \ - -f @sysconfdir@/ssh_host_dsa_key.pub \) ]; then - - echo "$SVIsubsys: host key not initialized: skipped!" - echo "$SVIsubsys: use ssh-host-keygen to generate one!" - exit 6 - fi - - echo -n "Starting $SVIsubsys services: " - ssd -S -x $DAEMON -n $NAME -- $OPTIONS - ret=$? - - echo "." - touch $SVIlock - ;; - - stop) - [ -e $SVIlock ] || exit 0 - - echo -n "Stopping $SVIsubsys services: " - ssd -K -p $PIDF -n $NAME - ret=$? - - echo "." - rm -f $SVIlock - ;; - - force-reload|reload) - [ -e $SVIlock ] || exit 0 - - echo "Reloading $SVIsubsys configuration files: " - ssd -K --signal 1 -q -p $PIDF -n $NAME - ret=$? - echo "done." - ;; - - restart) - $0 stop - $0 start - ret=$? - ;; - - status) - _status $PIDF - ret=$? - ;; - - *) - echo "Usage: $SVIscript {[re]start|stop|[force-]reload|status}" - ret=2 - ;; - -esac - -exit $ret - diff --git a/crypto/openssh/contrib/caldera/sshd.pam b/crypto/openssh/contrib/caldera/sshd.pam deleted file mode 100644 index 26dcb34..0000000 --- a/crypto/openssh/contrib/caldera/sshd.pam +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth required /lib/security/pam_pwdb.so shadow nodelay -auth required /lib/security/pam_nologin.so -account required /lib/security/pam_pwdb.so -password required /lib/security/pam_cracklib.so -password required /lib/security/pam_pwdb.so shadow nullok use_authtok -session required /lib/security/pam_pwdb.so -session required /lib/security/pam_limits.so diff --git a/crypto/openssh/contrib/cygwin/Makefile b/crypto/openssh/contrib/cygwin/Makefile deleted file mode 100644 index 09e8ea2..0000000 --- a/crypto/openssh/contrib/cygwin/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -srcdir=../.. -prefix=/usr -exec_prefix=$(prefix) -bindir=$(prefix)/bin -datadir=$(prefix)/share -docdir=$(datadir)/doc -sshdocdir=$(docdir)/openssh -cygdocdir=$(docdir)/Cygwin -sysconfdir=/etc -defaultsdir=$(sysconfdir)/defaults/etc -PRIVSEP_PATH=/var/empty -INSTALL=/usr/bin/install -c - -DESTDIR= - -all: - @echo - @echo "Use \`make cygwin-postinstall DESTDIR=[package directory]'" - @echo "Be sure having DESTDIR set correctly!" - @echo - -move-config-files: $(DESTDIR)$(sysconfdir)/ssh_config $(DESTDIR)$(sysconfdir)/sshd_config - $(srcdir)/mkinstalldirs $(DESTDIR)$(defaultsdir) - mv $(DESTDIR)$(sysconfdir)/ssh_config $(DESTDIR)$(defaultsdir) - mv $(DESTDIR)$(sysconfdir)/sshd_config $(DESTDIR)$(defaultsdir) - -remove-empty-dir: - rm -rf $(DESTDIR)$(PRIVSEP_PATH) - -install-sshdoc: - $(srcdir)/mkinstalldirs $(DESTDIR)$(sshdocdir) - $(INSTALL) -m 644 $(srcdir)/CREDITS $(DESTDIR)$(sshdocdir)/CREDITS - $(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(sshdocdir)/ChangeLog - $(INSTALL) -m 644 $(srcdir)/LICENCE $(DESTDIR)$(sshdocdir)/LICENCE - $(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW - $(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README - $(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns - $(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep - $(INSTALL) -m 644 $(srcdir)/README.smartcard $(DESTDIR)$(sshdocdir)/README.smartcard - $(INSTALL) -m 644 $(srcdir)/RFC.nroff $(DESTDIR)$(sshdocdir)/RFC.nroff - $(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO - $(INSTALL) -m 644 $(srcdir)/WARNING.RNG $(DESTDIR)$(sshdocdir)/WARNING.RNG - -install-cygwindoc: README - $(srcdir)/mkinstalldirs $(DESTDIR)$(cygdocdir) - $(INSTALL) -m 644 README $(DESTDIR)$(cygdocdir)/openssh.README - -install-doc: install-sshdoc install-cygwindoc - -install-scripts: ssh-host-config ssh-user-config - $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) - $(INSTALL) -m 755 ssh-host-config $(DESTDIR)$(bindir)/ssh-host-config - $(INSTALL) -m 755 ssh-user-config $(DESTDIR)$(bindir)/ssh-user-config - -cygwin-postinstall: move-config-files remove-empty-dir install-doc install-scripts - @echo "Cygwin specific configuration finished." diff --git a/crypto/openssh/contrib/cygwin/README b/crypto/openssh/contrib/cygwin/README deleted file mode 100644 index fc0a2f6..0000000 --- a/crypto/openssh/contrib/cygwin/README +++ /dev/null @@ -1,224 +0,0 @@ -This package describes important Cygwin specific stuff concerning OpenSSH. - -The binary package is usually built for recent Cygwin versions and might -not run on older versions. Please check http://cygwin.com/ for information -about current Cygwin releases. - -Build instructions are at the end of the file. - -=========================================================================== -Important change since 3.7.1p2-2: - -The ssh-host-config file doesn't create the /etc/ssh_config and -/etc/sshd_config files from builtin here-scripts anymore, but it uses -skeleton files installed in /etc/defaults/etc. - -Also it now tries hard to create appropriate permissions on files. -Same applies for ssh-user-config. - -After creating the sshd service with ssh-host-config, it's advisable to -call ssh-user-config for all affected users, also already exising user -configurations. In the latter case, file and directory permissions are -checked and changed, if requireed to match the host configuration. - -Important note for Windows 2003 Server users: ---------------------------------------------- - -2003 Server has a funny new feature. When starting services under SYSTEM -account, these services have nearly all user rights which SYSTEM holds... -except for the "Create a token object" right, which is needed to allow -public key authentication :-( - -There's no way around this, except for creating a substitute account which -has the appropriate privileges. Basically, this account should be member -of the administrators group, plus it should have the following user rights: - - Create a token object - Logon as a service - Replace a process level token - Increase Quota - -The ssh-host-config script asks you, if it should create such an account, -called "sshd_server". If you say "no" here, you're on your own. Please -follow the instruction in ssh-host-config exactly if possible. Note that -ssh-user-config sets the permissions on 2003 Server machines dependent of -whether a sshd_server account exists or not. -=========================================================================== - -=========================================================================== -Important change since 3.4p1-2: - -This version adds privilege separation as default setting, see -/usr/doc/openssh/README.privsep. According to that document the -privsep feature requires a non-privileged account called 'sshd'. - -The new ssh-host-config file which is part of this version asks -to create 'sshd' as local user if you want to use privilege -separation. If you confirm, it creates that NT user and adds -the necessary entry to /etc/passwd. - -On 9x/Me systems the script just sets UsePrivilegeSeparation to "no" -since that feature doesn't make any sense on a system which doesn't -differ between privileged and unprivileged users. - -The new ssh-host-config script also adds the /var/empty directory -needed by privilege separation. When creating the /var/empty directory -by yourself, please note that in contrast to the README.privsep document -the owner sshould not be "root" but the user which is running sshd. So, -in the standard configuration this is SYSTEM. The ssh-host-config script -chowns /var/empty accordingly. -=========================================================================== - -=========================================================================== -Important change since 3.0.1p1-2: - -This version introduces the ability to register sshd as service on -Windows 9x/Me systems. This is done only when the options -D and/or --d are not given. -=========================================================================== - -=========================================================================== -Important change since 2.9p2: - -Since Cygwin is able to switch user context without password beginning -with version 1.3.2, OpenSSH now allows to do so when it's running under -a version >= 1.3.2. Keep in mind that `ntsec' has to be activated to -allow that feature. -=========================================================================== - -=========================================================================== -Important change since 2.3.0p1: - -When using `ntea' or `ntsec' you now have to care for the ownership -and permission bits of your host key files and your private key files. -The host key files have to be owned by the NT account which starts -sshd. The user key files have to be owned by the user. The permission -bits of the private key files (host and user) have to be at least -rw------- (0600)! - -Note that this is forced under `ntsec' only if the files are on a NTFS -filesystem (which is recommended) due to the lack of any basic security -features of the FAT/FAT32 filesystems. -=========================================================================== - -If you are installing OpenSSH the first time, you can generate global config -files and server keys by running - - /usr/bin/ssh-host-config - -Note that this binary archive doesn't contain default config files in /etc. -That files are only created if ssh-host-config is started. - -If you are updating your installation you may run the above ssh-host-config -as well to move your configuration files to the new location and to -erase the files at the old location. - -To support testing and unattended installation ssh-host-config got -some options: - -usage: ssh-host-config [OPTION]... -Options: - --debug -d Enable shell's debug output. - --yes -y Answer all questions with "yes" automatically. - --no -n Answer all questions with "no" automatically. - --cygwin -c Use "options" as value for CYGWIN environment var. - --port -p sshd listens on port n. - --pwd -w Use "pwd" as password for user 'sshd_server'. - -Additionally ssh-host-config now asks if it should install sshd as a -service when running under NT/W2K. This requires cygrunsrv installed. - -You can create the private and public keys for a user now by running - - /usr/bin/ssh-user-config - -under the users account. - -To support testing and unattended installation ssh-user-config got -some options as well: - -usage: ssh-user-config [OPTION]... -Options: - --debug -d Enable shell's debug output. - --yes -y Answer all questions with "yes" automatically. - --no -n Answer all questions with "no" automatically. - --passphrase -p word Use "word" as passphrase automatically. - -Install sshd as daemon via cygrunsrv.exe (recommended on NT/W2K), via inetd -(results in very slow deamon startup!) or from the command line (recommended -on 9X/ME). - -If you start sshd as deamon via cygrunsrv.exe you MUST give the -"-D" option to sshd. Otherwise the service can't get started at all. - -If starting via inetd, copy sshd to eg. /usr/sbin/in.sshd and add the -following line to your inetd.conf file: - -ssh stream tcp nowait root /usr/sbin/in.sshd sshd -i - -Moreover you'll have to add the following line to your -${SYSTEMROOT}/system32/drivers/etc/services file: - - ssh 22/tcp #SSH daemon - -Please note that OpenSSH does never use the value of $HOME to -search for the users configuration files! It always uses the -value of the pw_dir field in /etc/passwd as the home directory. -If no home diretory is set in /etc/passwd, the root directory -is used instead! - -You may use all features of the CYGWIN=ntsec setting the same -way as they are used by Cygwin's login(1) port: - - The pw_gecos field may contain an additional field, that begins - with (upper case!) "U-", followed by the domain and the username - separated by a backslash. - CAUTION: The SID _must_ remain the _last_ field in pw_gecos! - BTW: The field separator in pw_gecos is the comma. - The username in pw_name itself may be any nice name: - - domuser::1104:513:John Doe,U-domain\user,S-1-5-21-... - - Now you may use `domuser' as your login name with telnet! - This is possible additionally for local users, if you don't like - your NT login name ;-) You only have to leave out the domain: - - locuser::1104:513:John Doe,U-user,S-1-5-21-... - -Note that the CYGWIN=ntsec setting is required for public key authentication. - -SSH2 server and user keys are generated by the `ssh-*-config' scripts -as well. - -If you want to build from source, the following options to -configure are used for the Cygwin binary distribution: - - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir='$(sbindir)' \ - --localstatedir=/var \ - --datadir='$(prefix)/share' \ - --mandir='$(datadir)/man' \ - --with-tcp-wrappers - -If you want to create a Cygwin package, equivalent to the one -in the Cygwin binary distribution, install like this: - - mkdir /tmp/cygwin-ssh - cd $(builddir) - make install DESTDIR=/tmp/cygwin-ssh - cd $(srcdir)/contrib/cygwin - make cygwin-postinstall DESTDIR=/tmp/cygwin-ssh - cd /tmp/cygwin-ssh - find * \! -type d | tar cvjfT my-openssh.tar.bz2 - - -You must have installed the zlib and openssl-devel packages to be able to -build OpenSSH! - -Please send requests, error reports etc. to cygwin@cygwin.com. - -Have fun, - -Corinna Vinschen -Cygwin Developer -Red Hat Inc. diff --git a/crypto/openssh/contrib/cygwin/ssh-host-config b/crypto/openssh/contrib/cygwin/ssh-host-config deleted file mode 100644 index 9c0dabf..0000000 --- a/crypto/openssh/contrib/cygwin/ssh-host-config +++ /dev/null @@ -1,592 +0,0 @@ -#!/bin/bash -# -# ssh-host-config, Copyright 2000, 2001, 2002, 2003 Red Hat Inc. -# -# This file is part of the Cygwin port of OpenSSH. - -# Subdirectory where the new package is being installed -PREFIX=/usr - -# Directory where the config files are stored -SYSCONFDIR=/etc -LOCALSTATEDIR=/var - -progname=$0 -auto_answer="" -port_number=22 - -privsep_configured=no -privsep_used=yes -sshd_in_passwd=no -sshd_in_sam=no - -request() -{ - if [ "${auto_answer}" = "yes" ] - then - echo "$1 (yes/no) yes" - return 0 - elif [ "${auto_answer}" = "no" ] - then - echo "$1 (yes/no) no" - return 1 - fi - - answer="" - while [ "X${answer}" != "Xyes" -a "X${answer}" != "Xno" ] - do - echo -n "$1 (yes/no) " - read -e answer - done - if [ "X${answer}" = "Xyes" ] - then - return 0 - else - return 1 - fi -} - -# Check options - -while : -do - case $# in - 0) - break - ;; - esac - - option=$1 - shift - - case "${option}" in - -d | --debug ) - set -x - ;; - - -y | --yes ) - auto_answer=yes - ;; - - -n | --no ) - auto_answer=no - ;; - - -c | --cygwin ) - cygwin_value="$1" - shift - ;; - - -p | --port ) - port_number=$1 - shift - ;; - - -w | --pwd ) - password_value="$1" - shift - ;; - - *) - echo "usage: ${progname} [OPTION]..." - echo - echo "This script creates an OpenSSH host configuration." - echo - echo "Options:" - echo " --debug -d Enable shell's debug output." - echo " --yes -y Answer all questions with \"yes\" automatically." - echo " --no -n Answer all questions with \"no\" automatically." - echo " --cygwin -c Use \"options\" as value for CYGWIN environment var." - echo " --port -p sshd listens on port n." - echo " --pwd -w Use \"pwd\" as password for user 'sshd_server'." - echo - exit 1 - ;; - - esac -done - -# Check if running on NT -_sys="`uname`" -_nt=`expr "${_sys}" : "CYGWIN_NT"` -# If running on NT, check if running under 2003 Server or later -if [ ${_nt} -gt 0 ] -then - _nt2003=`uname | awk -F- '{print ( $2 >= 5.2 ) ? 1 : 0;}'` -fi - -# Check for running ssh/sshd processes first. Refuse to do anything while -# some ssh processes are still running - -if ps -ef | grep -v grep | grep -q ssh -then - echo - echo "There are still ssh processes running. Please shut them down first." - echo - exit 1 -fi - -# Check for ${SYSCONFDIR} directory - -if [ -e "${SYSCONFDIR}" -a ! -d "${SYSCONFDIR}" ] -then - echo - echo "${SYSCONFDIR} is existant but not a directory." - echo "Cannot create global configuration files." - echo - exit 1 -fi - -# Create it if necessary - -if [ ! -e "${SYSCONFDIR}" ] -then - mkdir "${SYSCONFDIR}" - if [ ! -e "${SYSCONFDIR}" ] - then - echo - echo "Creating ${SYSCONFDIR} directory failed" - echo - exit 1 - fi -fi - -# Create /var/log and /var/log/lastlog if not already existing - -if [ -f ${LOCALSTATEDIR}/log ] -then - echo "Creating ${LOCALSTATEDIR}/log failed!" -else - if [ ! -d ${LOCALSTATEDIR}/log ] - then - mkdir -p ${LOCALSTATEDIR}/log - fi - if [ -d ${LOCALSTATEDIR}/log/lastlog ] - then - chmod 777 ${LOCALSTATEDIR}/log/lastlog - elif [ ! -f ${LOCALSTATEDIR}/log/lastlog ] - then - cat /dev/null > ${LOCALSTATEDIR}/log/lastlog - chmod 666 ${LOCALSTATEDIR}/log/lastlog - fi -fi - -# Create /var/empty file used as chroot jail for privilege separation -if [ -f ${LOCALSTATEDIR}/empty ] -then - echo "Creating ${LOCALSTATEDIR}/empty failed!" -else - mkdir -p ${LOCALSTATEDIR}/empty - if [ ${_nt} -gt 0 ] - then - chmod 755 ${LOCALSTATEDIR}/empty - fi -fi - -# First generate host keys if not already existing - -if [ ! -f "${SYSCONFDIR}/ssh_host_key" ] -then - echo "Generating ${SYSCONFDIR}/ssh_host_key" - ssh-keygen -t rsa1 -f ${SYSCONFDIR}/ssh_host_key -N '' > /dev/null -fi - -if [ ! -f "${SYSCONFDIR}/ssh_host_rsa_key" ] -then - echo "Generating ${SYSCONFDIR}/ssh_host_rsa_key" - ssh-keygen -t rsa -f ${SYSCONFDIR}/ssh_host_rsa_key -N '' > /dev/null -fi - -if [ ! -f "${SYSCONFDIR}/ssh_host_dsa_key" ] -then - echo "Generating ${SYSCONFDIR}/ssh_host_dsa_key" - ssh-keygen -t dsa -f ${SYSCONFDIR}/ssh_host_dsa_key -N '' > /dev/null -fi - -# Check if ssh_config exists. If yes, ask for overwriting - -if [ -f "${SYSCONFDIR}/ssh_config" ] -then - if request "Overwrite existing ${SYSCONFDIR}/ssh_config file?" - then - rm -f "${SYSCONFDIR}/ssh_config" - if [ -f "${SYSCONFDIR}/ssh_config" ] - then - echo "Can't overwrite. ${SYSCONFDIR}/ssh_config is write protected." - fi - fi -fi - -# Create default ssh_config from skeleton file in /etc/defaults/etc - -if [ ! -f "${SYSCONFDIR}/ssh_config" ] -then - echo "Generating ${SYSCONFDIR}/ssh_config file" - cp ${SYSCONFDIR}/defaults/etc/ssh_config ${SYSCONFDIR}/ssh_config - if [ "${port_number}" != "22" ] - then - echo "Host localhost" >> ${SYSCONFDIR}/ssh_config - echo " Port ${port_number}" >> ${SYSCONFDIR}/ssh_config - fi -fi - -# Check if sshd_config exists. If yes, ask for overwriting - -if [ -f "${SYSCONFDIR}/sshd_config" ] -then - if request "Overwrite existing ${SYSCONFDIR}/sshd_config file?" - then - rm -f "${SYSCONFDIR}/sshd_config" - if [ -f "${SYSCONFDIR}/sshd_config" ] - then - echo "Can't overwrite. ${SYSCONFDIR}/sshd_config is write protected." - fi - else - grep -q UsePrivilegeSeparation ${SYSCONFDIR}/sshd_config && privsep_configured=yes - fi -fi - -# Prior to creating or modifying sshd_config, care for privilege separation - -if [ "${privsep_configured}" != "yes" ] -then - if [ ${_nt} -gt 0 ] - then - echo "Privilege separation is set to yes by default since OpenSSH 3.3." - echo "However, this requires a non-privileged account called 'sshd'." - echo "For more info on privilege separation read /usr/share/doc/openssh/README.privsep." - echo - if request "Should privilege separation be used?" - then - privsep_used=yes - grep -q '^sshd:' ${SYSCONFDIR}/passwd && sshd_in_passwd=yes - net user sshd >/dev/null 2>&1 && sshd_in_sam=yes - if [ "${sshd_in_passwd}" != "yes" ] - then - if [ "${sshd_in_sam}" != "yes" ] - then - echo "Warning: The following function requires administrator privileges!" - if request "Should this script create a local user 'sshd' on this machine?" - then - dos_var_empty=`cygpath -w ${LOCALSTATEDIR}/empty` - net user sshd /add /fullname:"sshd privsep" "/homedir:${dos_var_empty}" /active:no > /dev/null 2>&1 && sshd_in_sam=yes - if [ "${sshd_in_sam}" != "yes" ] - then - echo "Warning: Creating the user 'sshd' failed!" - fi - fi - fi - if [ "${sshd_in_sam}" != "yes" ] - then - echo "Warning: Can't create user 'sshd' in ${SYSCONFDIR}/passwd!" - echo " Privilege separation set to 'no' again!" - echo " Check your ${SYSCONFDIR}/sshd_config file!" - privsep_used=no - else - mkpasswd -l -u sshd | sed -e 's/bash$/false/' >> ${SYSCONFDIR}/passwd - fi - fi - else - privsep_used=no - fi - else - # On 9x don't use privilege separation. Since security isn't - # available it just adds useless additional processes. - privsep_used=no - fi -fi - -# Create default sshd_config from skeleton files in /etc/defaults/etc or -# modify to add the missing privsep configuration option - -if [ ! -f "${SYSCONFDIR}/sshd_config" ] -then - echo "Generating ${SYSCONFDIR}/sshd_config file" - sed -e "s/^#UsePrivilegeSeparation yes/UsePrivilegeSeparation ${privsep_used}/ - s/^#Port 22/Port ${port_number}/ - s/^#StrictModes yes/StrictModes no/" \ - < ${SYSCONFDIR}/defaults/etc/sshd_config \ - > ${SYSCONFDIR}/sshd_config -elif [ "${privsep_configured}" != "yes" ] -then - echo >> ${SYSCONFDIR}/sshd_config - echo "UsePrivilegeSeparation ${privsep_used}" >> ${SYSCONFDIR}/sshd_config -fi - -# Care for services file -_my_etcdir="/ssh-host-config.$$" -if [ ${_nt} -gt 0 ] -then - _win_etcdir="${SYSTEMROOT}\\system32\\drivers\\etc" - _services="${_my_etcdir}/services" - # On NT, 27 spaces, no space after the hash - _spaces=" #" -else - _win_etcdir="${WINDIR}" - _services="${_my_etcdir}/SERVICES" - # On 9x, 18 spaces (95 is very touchy), a space after the hash - _spaces=" # " -fi -_serv_tmp="${_my_etcdir}/srv.out.$$" - -mount -t -f "${_win_etcdir}" "${_my_etcdir}" - -# Depends on the above mount -_wservices=`cygpath -w "${_services}"` - -# Remove sshd 22/port from services -if [ `grep -q 'sshd[ \t][ \t]*22' "${_services}"; echo $?` -eq 0 ] -then - grep -v 'sshd[ \t][ \t]*22' "${_services}" > "${_serv_tmp}" - if [ -f "${_serv_tmp}" ] - then - if mv "${_serv_tmp}" "${_services}" - then - echo "Removing sshd from ${_wservices}" - else - echo "Removing sshd from ${_wservices} failed!" - fi - rm -f "${_serv_tmp}" - else - echo "Removing sshd from ${_wservices} failed!" - fi -fi - -# Add ssh 22/tcp and ssh 22/udp to services -if [ `grep -q 'ssh[ \t][ \t]*22' "${_services}"; echo $?` -ne 0 ] -then - if awk '{ if ( $2 ~ /^23\/tcp/ ) print "ssh 22/tcp'"${_spaces}"'SSH Remote Login Protocol\nssh 22/udp'"${_spaces}"'SSH Remote Login Protocol"; print $0; }' < "${_services}" > "${_serv_tmp}" - then - if mv "${_serv_tmp}" "${_services}" - then - echo "Added ssh to ${_wservices}" - else - echo "Adding ssh to ${_wservices} failed!" - fi - rm -f "${_serv_tmp}" - else - echo "WARNING: Adding ssh to ${_wservices} failed!" - fi -fi - -umount "${_my_etcdir}" - -# Care for inetd.conf file -_inetcnf="${SYSCONFDIR}/inetd.conf" -_inetcnf_tmp="${SYSCONFDIR}/inetd.conf.$$" - -if [ -f "${_inetcnf}" ] -then - # Check if ssh service is already in use as sshd - with_comment=1 - grep -q '^[ \t]*sshd' "${_inetcnf}" && with_comment=0 - # Remove sshd line from inetd.conf - if [ `grep -q '^[# \t]*sshd' "${_inetcnf}"; echo $?` -eq 0 ] - then - grep -v '^[# \t]*sshd' "${_inetcnf}" >> "${_inetcnf_tmp}" - if [ -f "${_inetcnf_tmp}" ] - then - if mv "${_inetcnf_tmp}" "${_inetcnf}" - then - echo "Removed sshd from ${_inetcnf}" - else - echo "Removing sshd from ${_inetcnf} failed!" - fi - rm -f "${_inetcnf_tmp}" - else - echo "Removing sshd from ${_inetcnf} failed!" - fi - fi - - # Add ssh line to inetd.conf - if [ `grep -q '^[# \t]*ssh' "${_inetcnf}"; echo $?` -ne 0 ] - then - if [ "${with_comment}" -eq 0 ] - then - echo 'ssh stream tcp nowait root /usr/sbin/sshd sshd -i' >> "${_inetcnf}" - else - echo '# ssh stream tcp nowait root /usr/sbin/sshd sshd -i' >> "${_inetcnf}" - fi - echo "Added ssh to ${_inetcnf}" - fi -fi - -# On NT ask if sshd should be installed as service -if [ ${_nt} -gt 0 ] -then - # But only if it is not already installed - if ! cygrunsrv -Q sshd > /dev/null 2>&1 - then - echo - echo - echo "Warning: The following functions require administrator privileges!" - echo - echo "Do you want to install sshd as service?" - if request "(Say \"no\" if it's already installed as service)" - then - if [ $_nt2003 -gt 0 ] - then - grep -q '^sshd_server:' ${SYSCONFDIR}/passwd && sshd_server_in_passwd=yes - if [ "${sshd_server_in_passwd}" = "yes" ] - then - # Drop sshd_server from passwd since it could have wrong settings - grep -v '^sshd_server:' ${SYSCONFDIR}/passwd > ${SYSCONFDIR}/passwd.$$ - rm -f ${SYSCONFDIR}/passwd - mv ${SYSCONFDIR}/passwd.$$ ${SYSCONFDIR}/passwd - chmod g-w,o-w ${SYSCONFDIR}/passwd - fi - net user sshd_server >/dev/null 2>&1 && sshd_server_in_sam=yes - if [ "${sshd_server_in_sam}" != "yes" ] - then - echo - echo "You appear to be running Windows 2003 Server or later. On 2003 and" - echo "later systems, it's not possible to use the LocalSystem account" - echo "if sshd should allow passwordless logon (e. g. public key authentication)." - echo "If you want to enable that functionality, it's required to create a new" - echo "account 'sshd_server' with special privileges, which is then used to run" - echo "the sshd service under." - echo - echo "Should this script create a new local account 'sshd_server' which has" - if request "the required privileges?" - then - _admingroup=`awk -F: '{if ( $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group` - if [ -z "${_admingroup}" ] - then - echo "There's no group with SID S-1-5-32-544 (Local administrators group) in" - echo "your ${SYSCONFDIR}/group file. Please regenerate this entry using 'mkgroup -l'" - echo "and restart this script." - exit 1 - fi - dos_var_empty=`cygpath -w ${LOCALSTATEDIR}/empty` - while [ "${sshd_server_in_sam}" != "yes" ] - do - if [ -n "${password_value}" ] - then - _password="${password_value}" - # Allow to ask for password if first try fails - password_value="" - else - echo - echo "Please enter a password for new user 'sshd_server'. Please be sure that" - echo "this password matches the password rules given on your system." - echo -n "Entering no password will exit the configuration. PASSWORD=" - read -e _password - if [ -z "${_password}" ] - then - echo - echo "Exiting configuration. No user sshd_server has been created," - echo "no sshd service installed." - exit 1 - fi - fi - net user sshd_server "${_password}" /add /fullname:"sshd server account" "/homedir:${dos_var_empty}" /yes > /tmp/nu.$$ 2>&1 && sshd_server_in_sam=yes - if [ "${sshd_server_in_sam}" != "yes" ] - then - echo "Creating the user 'sshd_server' failed! Reason:" - cat /tmp/nu.$$ - rm /tmp/nu.$$ - fi - done - net localgroup "${_admingroup}" sshd_server /add > /dev/null 2>&1 && sshd_server_in_admingroup=yes - if [ "${sshd_server_in_admingroup}" != "yes" ] - then - echo "WARNING: Adding user sshd_server to local group ${_admingroup} failed!" - echo "Please add sshd_server to local group ${_admingroup} before" - echo "starting the sshd service!" - echo - fi - passwd_has_expiry_flags=`passwd -v | awk '/^passwd /{print ( $3 >= 1.5 ) ? "yes" : "no";}'` - if [ "${passwd_has_expiry_flags}" != "yes" ] - then - echo - echo "WARNING: User sshd_server has password expiry set to system default." - echo "Please check that password never expires or set it to your needs." - elif ! passwd -e sshd_server - then - echo - echo "WARNING: Setting password expiry for user sshd_server failed!" - echo "Please check that password never expires or set it to your needs." - fi - editrights -a SeAssignPrimaryTokenPrivilege -u sshd_server && - editrights -a SeCreateTokenPrivilege -u sshd_server && - editrights -a SeDenyInteractiveLogonRight -u sshd_server && - editrights -a SeDenyNetworkLogonRight -u sshd_server && - editrights -a SeDenyRemoteInteractiveLogonRight -u sshd_server && - editrights -a SeIncreaseQuotaPrivilege -u sshd_server && - editrights -a SeServiceLogonRight -u sshd_server && - sshd_server_got_all_rights="yes" - if [ "${sshd_server_got_all_rights}" != "yes" ] - then - echo - echo "Assigning the appropriate privileges to user 'sshd_server' failed!" - echo "Can't create sshd service!" - exit 1 - fi - echo - echo "User 'sshd_server' has been created with password '${_password}'." - echo "If you change the password, please keep in mind to change the password" - echo "for the sshd service, too." - echo - echo "Also keep in mind that the user sshd_server needs read permissions on all" - echo "users' .ssh/authorized_keys file to allow public key authentication for" - echo "these users!. (Re-)running ssh-user-config for each user will set the" - echo "required permissions correctly." - echo - fi - fi - if [ "${sshd_server_in_sam}" = "yes" ] - then - mkpasswd -l -u sshd_server | sed -e 's/bash$/false/' >> ${SYSCONFDIR}/passwd - fi - fi - if [ -n "${cygwin_value}" ] - then - _cygwin="${cygwin_value}" - else - echo - echo "Which value should the environment variable CYGWIN have when" - echo "sshd starts? It's recommended to set at least \"ntsec\" to be" - echo "able to change user context without password." - echo -n "Default is \"ntsec\". CYGWIN=" - read -e _cygwin - fi - [ -z "${_cygwin}" ] && _cygwin="ntsec" - if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ] - then - if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -u sshd_server -w "${_password}" -e "CYGWIN=${_cygwin}" - then - echo - echo "The service has been installed under sshd_server account." - echo "To start the service, call \`net start sshd' or \`cygrunsrv -S sshd'." - fi - else - if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -e "CYGWIN=${_cygwin}" - then - echo - echo "The service has been installed under LocalSystem account." - echo "To start the service, call \`net start sshd' or \`cygrunsrv -S sshd'." - fi - fi - fi - # Now check if sshd has been successfully installed. This allows to - # set the ownership of the affected files correctly. - if cygrunsrv -Q sshd > /dev/null 2>&1 - then - if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ] - then - _user="sshd_server" - else - _user="system" - fi - chown "${_user}" ${SYSCONFDIR}/ssh* - chown "${_user}".544 ${LOCALSTATEDIR}/empty - if [ -f ${LOCALSTATEDIR}/log/sshd.log ] - then - chown "${_user}".544 ${LOCALSTATEDIR}/log/sshd.log - fi - fi - fi -fi - -echo -echo "Host configuration finished. Have fun!" diff --git a/crypto/openssh/contrib/cygwin/ssh-user-config b/crypto/openssh/contrib/cygwin/ssh-user-config deleted file mode 100644 index fe07ce3..0000000 --- a/crypto/openssh/contrib/cygwin/ssh-user-config +++ /dev/null @@ -1,250 +0,0 @@ -#!/bin/sh -# -# ssh-user-config, Copyright 2000, 2001, 2002, 2003, Red Hat Inc. -# -# This file is part of the Cygwin port of OpenSSH. - -# Directory where the config files are stored -SYSCONFDIR=/etc - -progname=$0 -auto_answer="" -auto_passphrase="no" -passphrase="" - -request() -{ - if [ "${auto_answer}" = "yes" ] - then - return 0 - elif [ "${auto_answer}" = "no" ] - then - return 1 - fi - - answer="" - while [ "X${answer}" != "Xyes" -a "X${answer}" != "Xno" ] - do - echo -n "$1 (yes/no) " - read answer - done - if [ "X${answer}" = "Xyes" ] - then - return 0 - else - return 1 - fi -} - -# Check if running on NT -_sys="`uname -a`" -_nt=`expr "$_sys" : "CYGWIN_NT"` -# If running on NT, check if running under 2003 Server or later -if [ $_nt -gt 0 ] -then - _nt2003=`uname | awk -F- '{print ( $2 >= 5.2 ) ? 1 : 0;}'` -fi - -# Check options - -while : -do - case $# in - 0) - break - ;; - esac - - option=$1 - shift - - case "$option" in - -d | --debug ) - set -x - ;; - - -y | --yes ) - auto_answer=yes - ;; - - -n | --no ) - auto_answer=no - ;; - - -p | --passphrase ) - with_passphrase="yes" - passphrase=$1 - shift - ;; - - *) - echo "usage: ${progname} [OPTION]..." - echo - echo "This script creates an OpenSSH user configuration." - echo - echo "Options:" - echo " --debug -d Enable shell's debug output." - echo " --yes -y Answer all questions with \"yes\" automatically." - echo " --no -n Answer all questions with \"no\" automatically." - echo " --passphrase -p word Use \"word\" as passphrase automatically." - echo - exit 1 - ;; - - esac -done - -# Ask user if user identity should be generated - -if [ ! -f ${SYSCONFDIR}/passwd ] -then - echo "${SYSCONFDIR}/passwd is nonexistant. Please generate an ${SYSCONFDIR}/passwd file" - echo 'first using mkpasswd. Check if it contains an entry for you and' - echo 'please care for the home directory in your entry as well.' - exit 1 -fi - -uid=`id -u` -pwdhome=`awk -F: '{ if ( $3 == '${uid}' ) print $6; }' < ${SYSCONFDIR}/passwd` - -if [ "X${pwdhome}" = "X" ] -then - echo "There is no home directory set for you in ${SYSCONFDIR}/passwd." - echo 'Setting $HOME is not sufficient!' - exit 1 -fi - -if [ ! -d "${pwdhome}" ] -then - echo "${pwdhome} is set in ${SYSCONFDIR}/passwd as your home directory" - echo 'but it is not a valid directory. Cannot create user identity files.' - exit 1 -fi - -# If home is the root dir, set home to empty string to avoid error messages -# in subsequent parts of that script. -if [ "X${pwdhome}" = "X/" ] -then - # But first raise a warning! - echo "Your home directory in ${SYSCONFDIR}/passwd is set to root (/). This is not recommended!" - if request "Would you like to proceed anyway?" - then - pwdhome='' - else - exit 1 - fi -fi - -if [ -d "${pwdhome}" -a $_nt -gt 0 -a -n "`chmod -c g-w,o-w "${pwdhome}"`" ] -then - echo - echo 'WARNING: group and other have been revoked write permission to your home' - echo " directory ${pwdhome}." - echo ' This is required by OpenSSH to allow public key authentication using' - echo ' the key files stored in your .ssh subdirectory.' - echo ' Revert this change ONLY if you know what you are doing!' - echo -fi - -if [ -e "${pwdhome}/.ssh" -a ! -d "${pwdhome}/.ssh" ] -then - echo "${pwdhome}/.ssh is existant but not a directory. Cannot create user identity files." - exit 1 -fi - -if [ ! -e "${pwdhome}/.ssh" ] -then - mkdir "${pwdhome}/.ssh" - if [ ! -e "${pwdhome}/.ssh" ] - then - echo "Creating users ${pwdhome}/.ssh directory failed" - exit 1 - fi -fi - -if [ $_nt -gt 0 ] -then - _user="system" - if [ $_nt2003 -gt 0 ] - then - grep -q '^sshd_server:' ${SYSCONFDIR}/passwd && _user="sshd_server" - fi - if ! setfacl -m "u::rwx,u:${_user}:r--,g::---,o::---" "${pwdhome}/.ssh" - then - echo "${pwdhome}/.ssh couldn't be given the correct permissions." - echo "Please try to solve this problem first." - exit 1 - fi -fi - -if [ ! -f "${pwdhome}/.ssh/identity" ] -then - if request "Shall I create an SSH1 RSA identity file for you?" - then - echo "Generating ${pwdhome}/.ssh/identity" - if [ "${with_passphrase}" = "yes" ] - then - ssh-keygen -t rsa1 -N "${passphrase}" -f "${pwdhome}/.ssh/identity" > /dev/null - else - ssh-keygen -t rsa1 -f "${pwdhome}/.ssh/identity" > /dev/null - fi - if request "Do you want to use this identity to login to this machine?" - then - echo "Adding to ${pwdhome}/.ssh/authorized_keys" - cat "${pwdhome}/.ssh/identity.pub" >> "${pwdhome}/.ssh/authorized_keys" - fi - fi -fi - -if [ ! -f "${pwdhome}/.ssh/id_rsa" ] -then - if request "Shall I create an SSH2 RSA identity file for you? (yes/no) " - then - echo "Generating ${pwdhome}/.ssh/id_rsa" - if [ "${with_passphrase}" = "yes" ] - then - ssh-keygen -t rsa -N "${passphrase}" -f "${pwdhome}/.ssh/id_rsa" > /dev/null - else - ssh-keygen -t rsa -f "${pwdhome}/.ssh/id_rsa" > /dev/null - fi - if request "Do you want to use this identity to login to this machine?" - then - echo "Adding to ${pwdhome}/.ssh/authorized_keys" - cat "${pwdhome}/.ssh/id_rsa.pub" >> "${pwdhome}/.ssh/authorized_keys" - fi - fi -fi - -if [ ! -f "${pwdhome}/.ssh/id_dsa" ] -then - if request "Shall I create an SSH2 DSA identity file for you? (yes/no) " - then - echo "Generating ${pwdhome}/.ssh/id_dsa" - if [ "${with_passphrase}" = "yes" ] - then - ssh-keygen -t dsa -N "${passphrase}" -f "${pwdhome}/.ssh/id_dsa" > /dev/null - else - ssh-keygen -t dsa -f "${pwdhome}/.ssh/id_dsa" > /dev/null - fi - if request "Do you want to use this identity to login to this machine?" - then - echo "Adding to ${pwdhome}/.ssh/authorized_keys" - cat "${pwdhome}/.ssh/id_dsa.pub" >> "${pwdhome}/.ssh/authorized_keys" - fi - fi -fi - -if [ $_nt -gt 0 -a -e "${pwdhome}/.ssh/authorized_keys" ] -then - if ! setfacl -m "u::rw-,u:${_user}:r--,g::---,o::---" "${pwdhome}/.ssh/authorized_keys" - then - echo - echo "WARNING: Setting correct permissions to ${pwdhome}/.ssh/authorized_keys" - echo "failed. Please care for the correct permissions. The minimum requirement" - echo "is, the owner and ${_user} both need read permissions." - echo - fi -fi - -echo -echo "Configuration finished. Have fun!" diff --git a/crypto/openssh/contrib/findssl.sh b/crypto/openssh/contrib/findssl.sh deleted file mode 100644 index 0c08d4a..0000000 --- a/crypto/openssh/contrib/findssl.sh +++ /dev/null @@ -1,159 +0,0 @@ -#!/bin/sh -# -# findssl.sh -# Search for all instances of OpenSSL headers and libraries -# and print their versions. -# Intended to help diagnose OpenSSH's "OpenSSL headers do not -# match your library" errors. -# -# Written by Darren Tucker (dtucker at zip dot com dot au) -# This file is placed in the public domain. -# -# $Id: findssl.sh,v 1.2 2003/11/21 12:48:56 djm Exp $ -# 2002-07-27: Initial release. -# 2002-08-04: Added public domain notice. -# 2003-06-24: Incorporated readme, set library paths. First cvs version. -# -# "OpenSSL headers do not match your library" are usually caused by -# OpenSSH's configure picking up an older version of OpenSSL headers -# or libraries. You can use the following # procedure to help identify -# the cause. -# -# The output of configure will tell you the versions of the OpenSSL -# headers and libraries that were picked up, for example: -# -# checking OpenSSL header version... 90604f (OpenSSL 0.9.6d 9 May 2002) -# checking OpenSSL library version... 90602f (OpenSSL 0.9.6b [engine] 9 Jul 2001) -# checking whether OpenSSL's headers match the library... no -# configure: error: Your OpenSSL headers do not match your library -# -# Now run findssl.sh. This should identify the headers and libraries -# present and their versions. You should be able to identify the -# libraries and headers used and adjust your CFLAGS or remove incorrect -# versions. The output will show OpenSSL's internal version identifier -# and should look something like: - -# $ ./findssl.sh -# Searching for OpenSSL header files. -# 0x0090604fL /usr/include/openssl/opensslv.h -# 0x0090604fL /usr/local/ssl/include/openssl/opensslv.h -# -# Searching for OpenSSL shared library files. -# 0x0090602fL /lib/libcrypto.so.0.9.6b -# 0x0090602fL /lib/libcrypto.so.2 -# 0x0090581fL /usr/lib/libcrypto.so.0 -# 0x0090602fL /usr/lib/libcrypto.so -# 0x0090581fL /usr/lib/libcrypto.so.0.9.5a -# 0x0090600fL /usr/lib/libcrypto.so.0.9.6 -# 0x0090600fL /usr/lib/libcrypto.so.1 -# -# Searching for OpenSSL static library files. -# 0x0090602fL /usr/lib/libcrypto.a -# 0x0090604fL /usr/local/ssl/lib/libcrypto.a -# -# In this example, I gave configure no extra flags, so it's picking up -# the OpenSSL header from /usr/include/openssl (90604f) and the library -# from /usr/lib/ (90602f). - -# -# Adjust these to suit your compiler. -# You may also need to set the *LIB*PATH environment variables if -# DEFAULT_LIBPATH is not correct for your system. -# -CC=gcc -STATIC=-static - -# -# Set up conftest C source -# -rm -f findssl.log -cat >conftest.c < -int main(){printf("0x%08xL\n", SSLeay());} -EOD - -# -# Set default library paths if not already set -# -DEFAULT_LIBPATH=/usr/lib:/usr/local/lib -LIBPATH=${LIBPATH:=$DEFAULT_LIBPATH} -LD_LIBRARY_PATH=${LD_LIBRARY_PATH:=$DEFAULT_LIBPATH} -LIBRARY_PATH=${LIBRARY_PATH:=$DEFAULT_LIBPATH} -export LIBPATH LD_LIBRARY_PATH LIBRARY_PATH - -# -# Search for OpenSSL headers and print versions -# -echo Searching for OpenSSL header files. -if [ -x "`which locate`" ] -then - headers=`locate opensslv.h` -else - headers=`find / -name opensslv.h -print 2>/dev/null` -fi - -for header in $headers -do - ver=`awk '/OPENSSL_VERSION_NUMBER/{printf \$3}' $header` - echo "$ver $header" -done -echo - -# -# Search for shared libraries. -# Relies on shared libraries looking like "libcrypto.s*" -# -echo Searching for OpenSSL shared library files. -if [ -x "`which locate`" ] -then - libraries=`locate libcrypto.s` -else - libraries=`find / -name 'libcrypto.s*' -print 2>/dev/null` -fi - -for lib in $libraries -do - (echo "Trying libcrypto $lib" >>findssl.log - dir=`dirname $lib` - LIBPATH="$dir:$LIBPATH" - LD_LIBRARY_PATH="$dir:$LIBPATH" - LIBRARY_PATH="$dir:$LIBPATH" - export LIBPATH LD_LIBRARY_PATH LIBRARY_PATH - ${CC} -o conftest conftest.c $lib 2>>findssl.log - if [ -x ./conftest ] - then - ver=`./conftest 2>/dev/null` - rm -f ./conftest - echo "$ver $lib" - fi) -done -echo - -# -# Search for static OpenSSL libraries and print versions -# -echo Searching for OpenSSL static library files. -if [ -x "`which locate`" ] -then - libraries=`locate libcrypto.a` -else - libraries=`find / -name libcrypto.a -print 2>/dev/null` -fi - -for lib in $libraries -do - libdir=`dirname $lib` - echo "Trying libcrypto $lib" >>findssl.log - ${CC} ${STATIC} -o conftest conftest.c -L${libdir} -lcrypto 2>>findssl.log - if [ -x ./conftest ] - then - ver=`./conftest 2>/dev/null` - rm -f ./conftest - echo "$ver $lib" - fi -done - -# -# Clean up -# -rm -f conftest.c diff --git a/crypto/openssh/contrib/gnome-ssh-askpass1.c b/crypto/openssh/contrib/gnome-ssh-askpass1.c deleted file mode 100644 index 4d51032..0000000 --- a/crypto/openssh/contrib/gnome-ssh-askpass1.c +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright (c) 2000-2002 Damien Miller. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * This is a simple GNOME SSH passphrase grabber. To use it, set the - * environment variable SSH_ASKPASS to point to the location of - * gnome-ssh-askpass before calling "ssh-add < /dev/null". - * - * There is only two run-time options: if you set the environment variable - * "GNOME_SSH_ASKPASS_GRAB_SERVER=true" then gnome-ssh-askpass will grab - * the X server. If you set "GNOME_SSH_ASKPASS_GRAB_POINTER=true", then the - * pointer will be grabbed too. These may have some benefit to security if - * you don't trust your X server. We grab the keyboard always. - */ - -/* - * Compile with: - * - * cc `gnome-config --cflags gnome gnomeui` \ - * gnome-ssh-askpass1.c -o gnome-ssh-askpass \ - * `gnome-config --libs gnome gnomeui` - * - */ - -#include -#include -#include -#include -#include -#include - -void -report_failed_grab (void) -{ - GtkWidget *err; - - err = gnome_message_box_new("Could not grab keyboard or mouse.\n" - "A malicious client may be eavesdropping on your session.", - GNOME_MESSAGE_BOX_ERROR, "EXIT", NULL); - gtk_window_set_position(GTK_WINDOW(err), GTK_WIN_POS_CENTER); - gtk_object_set(GTK_OBJECT(err), "type", GTK_WINDOW_POPUP, NULL); - - gnome_dialog_run_and_close(GNOME_DIALOG(err)); -} - -int -passphrase_dialog(char *message) -{ - char *passphrase; - char **messages; - int result, i, grab_server, grab_pointer; - GtkWidget *dialog, *entry, *label; - - grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); - grab_pointer = (getenv("GNOME_SSH_ASKPASS_GRAB_POINTER") != NULL); - - dialog = gnome_dialog_new("OpenSSH", GNOME_STOCK_BUTTON_OK, - GNOME_STOCK_BUTTON_CANCEL, NULL); - - messages = g_strsplit(message, "\\n", 0); - if (messages) - for(i = 0; messages[i]; i++) { - label = gtk_label_new(messages[i]); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), - label, FALSE, FALSE, 0); - } - - entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), entry, FALSE, - FALSE, 0); - gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); - gtk_widget_grab_focus(entry); - - /* Center window and prepare for grab */ - gtk_object_set(GTK_OBJECT(dialog), "type", GTK_WINDOW_POPUP, NULL); - gnome_dialog_set_default(GNOME_DIALOG(dialog), 0); - gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); - gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE); - gnome_dialog_close_hides(GNOME_DIALOG(dialog), TRUE); - gtk_container_set_border_width(GTK_CONTAINER(GNOME_DIALOG(dialog)->vbox), - GNOME_PAD); - gtk_widget_show_all(dialog); - - /* Grab focus */ - if (grab_server) - XGrabServer(GDK_DISPLAY()); - if (grab_pointer && gdk_pointer_grab(dialog->window, TRUE, 0, - NULL, NULL, GDK_CURRENT_TIME)) - goto nograb; - if (gdk_keyboard_grab(dialog->window, FALSE, GDK_CURRENT_TIME)) - goto nograbkb; - - /* Make close dialog */ - gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry)); - - /* Run dialog */ - result = gnome_dialog_run(GNOME_DIALOG(dialog)); - - /* Ungrab */ - if (grab_server) - XUngrabServer(GDK_DISPLAY()); - if (grab_pointer) - gdk_pointer_ungrab(GDK_CURRENT_TIME); - gdk_keyboard_ungrab(GDK_CURRENT_TIME); - gdk_flush(); - - /* Report passphrase if user selected OK */ - passphrase = gtk_entry_get_text(GTK_ENTRY(entry)); - if (result == 0) - puts(passphrase); - - /* Zero passphrase in memory */ - memset(passphrase, '\0', strlen(passphrase)); - gtk_entry_set_text(GTK_ENTRY(entry), passphrase); - - gnome_dialog_close(GNOME_DIALOG(dialog)); - return (result == 0 ? 0 : -1); - - /* At least one grab failed - ungrab what we got, and report - the failure to the user. Note that XGrabServer() cannot - fail. */ - nograbkb: - gdk_pointer_ungrab(GDK_CURRENT_TIME); - nograb: - if (grab_server) - XUngrabServer(GDK_DISPLAY()); - gnome_dialog_close(GNOME_DIALOG(dialog)); - - report_failed_grab(); - return (-1); -} - -int -main(int argc, char **argv) -{ - char *message; - int result; - - gnome_init("GNOME ssh-askpass", "0.1", argc, argv); - - if (argc == 2) - message = argv[1]; - else - message = "Enter your OpenSSH passphrase:"; - - setvbuf(stdout, 0, _IONBF, 0); - result = passphrase_dialog(message); - - return (result); -} diff --git a/crypto/openssh/contrib/gnome-ssh-askpass2.c b/crypto/openssh/contrib/gnome-ssh-askpass2.c deleted file mode 100644 index 0ce8dae..0000000 --- a/crypto/openssh/contrib/gnome-ssh-askpass2.c +++ /dev/null @@ -1,220 +0,0 @@ -/* - * Copyright (c) 2000-2002 Damien Miller. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* GTK2 support by Nalin Dahyabhai */ - -/* - * This is a simple GNOME SSH passphrase grabber. To use it, set the - * environment variable SSH_ASKPASS to point to the location of - * gnome-ssh-askpass before calling "ssh-add < /dev/null". - * - * There is only two run-time options: if you set the environment variable - * "GNOME_SSH_ASKPASS_GRAB_SERVER=true" then gnome-ssh-askpass will grab - * the X server. If you set "GNOME_SSH_ASKPASS_GRAB_POINTER=true", then the - * pointer will be grabbed too. These may have some benefit to security if - * you don't trust your X server. We grab the keyboard always. - */ - -#define GRAB_TRIES 16 -#define GRAB_WAIT 250 /* milliseconds */ - -/* - * Compile with: - * - * cc -Wall `pkg-config --cflags gtk+-2.0` \ - * gnome-ssh-askpass2.c -o gnome-ssh-askpass \ - * `pkg-config --libs gtk+-2.0` - * - */ - -#include -#include -#include -#include -#include -#include -#include - -static void -report_failed_grab (const char *what) -{ - GtkWidget *err; - - err = gtk_message_dialog_new(NULL, 0, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "Could not grab %s. " - "A malicious client may be eavesdropping " - "on your session.", what); - gtk_window_set_position(GTK_WINDOW(err), GTK_WIN_POS_CENTER); - gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(err))->label), - TRUE); - - gtk_dialog_run(GTK_DIALOG(err)); - - gtk_widget_destroy(err); -} - -static void -ok_dialog(GtkWidget *entry, gpointer dialog) -{ - g_return_if_fail(GTK_IS_DIALOG(dialog)); - gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); -} - -static int -passphrase_dialog(char *message) -{ - const char *failed; - char *passphrase, *local; - int result, grab_tries, grab_server, grab_pointer; - GtkWidget *dialog, *entry; - GdkGrabStatus status; - - grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL); - grab_pointer = (getenv("GNOME_SSH_ASKPASS_GRAB_POINTER") != NULL); - grab_tries = 0; - - dialog = gtk_message_dialog_new(NULL, 0, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_OK_CANCEL, - "%s", - message); - - entry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), entry, FALSE, - FALSE, 0); - gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); - gtk_widget_grab_focus(entry); - gtk_widget_show(entry); - - gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH"); - gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); - gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(dialog))->label), - TRUE); - - /* Make close dialog */ - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); - g_signal_connect(G_OBJECT(entry), "activate", - G_CALLBACK(ok_dialog), dialog); - - /* Grab focus */ - gtk_widget_show_now(dialog); - if (grab_pointer) { - for(;;) { - status = gdk_pointer_grab( - (GTK_WIDGET(dialog))->window, TRUE, 0, NULL, - NULL, GDK_CURRENT_TIME); - if (status == GDK_GRAB_SUCCESS) - break; - usleep(GRAB_WAIT * 1000); - if (++grab_tries > GRAB_TRIES) { - failed = "mouse"; - goto nograb; - } - } - } - for(;;) { - status = gdk_keyboard_grab((GTK_WIDGET(dialog))->window, - FALSE, GDK_CURRENT_TIME); - if (status == GDK_GRAB_SUCCESS) - break; - usleep(GRAB_WAIT * 1000); - if (++grab_tries > GRAB_TRIES) { - failed = "keyboard"; - goto nograbkb; - } - } - if (grab_server) { - gdk_x11_grab_server(); - } - - result = gtk_dialog_run(GTK_DIALOG(dialog)); - - /* Ungrab */ - if (grab_server) - XUngrabServer(GDK_DISPLAY()); - if (grab_pointer) - gdk_pointer_ungrab(GDK_CURRENT_TIME); - gdk_keyboard_ungrab(GDK_CURRENT_TIME); - gdk_flush(); - - /* Report passphrase if user selected OK */ - passphrase = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry))); - if (result == GTK_RESPONSE_OK) { - local = g_locale_from_utf8(passphrase, strlen(passphrase), - NULL, NULL, NULL); - if (local != NULL) { - puts(local); - memset(local, '\0', strlen(local)); - g_free(local); - } else { - puts(passphrase); - } - } - - /* Zero passphrase in memory */ - memset(passphrase, '\b', strlen(passphrase)); - gtk_entry_set_text(GTK_ENTRY(entry), passphrase); - memset(passphrase, '\0', strlen(passphrase)); - g_free(passphrase); - - gtk_widget_destroy(dialog); - return (result == GTK_RESPONSE_OK ? 0 : -1); - - /* At least one grab failed - ungrab what we got, and report - the failure to the user. Note that XGrabServer() cannot - fail. */ - nograbkb: - gdk_pointer_ungrab(GDK_CURRENT_TIME); - nograb: - if (grab_server) - XUngrabServer(GDK_DISPLAY()); - gtk_widget_destroy(dialog); - - report_failed_grab(failed); - - return (-1); -} - -int -main(int argc, char **argv) -{ - char *message; - int result; - - gtk_init(&argc, &argv); - - if (argc > 1) { - message = g_strjoinv(" ", argv + 1); - } else { - message = g_strdup("Enter your OpenSSH passphrase:"); - } - - setvbuf(stdout, 0, _IONBF, 0); - result = passphrase_dialog(message); - g_free(message); - - return (result); -} diff --git a/crypto/openssh/contrib/hpux/README b/crypto/openssh/contrib/hpux/README deleted file mode 100644 index f8bfa84..0000000 --- a/crypto/openssh/contrib/hpux/README +++ /dev/null @@ -1,45 +0,0 @@ -README for OpenSSH HP-UX contrib files -Kevin Steves - -sshd: configuration file for sshd.rc -sshd.rc: SSH startup script -egd: configuration file for egd.rc -egd.rc: EGD (entropy gathering daemon) startup script - -To install: - -sshd.rc: - -o Verify paths in sshd.rc match your local installation - (WHAT_PATH and WHAT_PID) -o Customize sshd if needed (SSHD_ARGS) -o Install: - - # cp sshd /etc/rc.config.d - # chmod 444 /etc/rc.config.d/sshd - # cp sshd.rc /sbin/init.d - # chmod 555 /sbin/init.d/sshd.rc - # ln -s /sbin/init.d/sshd.rc /sbin/rc1.d/K100sshd - # ln -s /sbin/init.d/sshd.rc /sbin/rc2.d/S900sshd - -egd.rc: - -o Verify egd.pl path in egd.rc matches your local installation - (WHAT_PATH) -o Customize egd if needed (EGD_ARGS and EGD_LOG) -o Add pseudo account: - - # groupadd egd - # useradd -g egd egd - # mkdir -p /etc/opt/egd - # chown egd:egd /etc/opt/egd - # chmod 711 /etc/opt/egd - -o Install: - - # cp egd /etc/rc.config.d - # chmod 444 /etc/rc.config.d/egd - # cp egd.rc /sbin/init.d - # chmod 555 /sbin/init.d/egd.rc - # ln -s /sbin/init.d/egd.rc /sbin/rc1.d/K600egd - # ln -s /sbin/init.d/egd.rc /sbin/rc2.d/S400egd diff --git a/crypto/openssh/contrib/hpux/egd b/crypto/openssh/contrib/hpux/egd deleted file mode 100644 index 21af0bd..0000000 --- a/crypto/openssh/contrib/hpux/egd +++ /dev/null @@ -1,15 +0,0 @@ -# EGD_START: Set to 1 to start entropy gathering daemon -# EGD_ARGS: Command line arguments to pass to egd -# EGD_LOG: EGD stdout and stderr log file (default /etc/opt/egd/egd.log) -# -# To configure the egd environment: - -# groupadd egd -# useradd -g egd egd -# mkdir -p /etc/opt/egd -# chown egd:egd /etc/opt/egd -# chmod 711 /etc/opt/egd - -EGD_START=1 -EGD_ARGS='/etc/opt/egd/entropy' -EGD_LOG= diff --git a/crypto/openssh/contrib/hpux/egd.rc b/crypto/openssh/contrib/hpux/egd.rc deleted file mode 100755 index 919dea7..0000000 --- a/crypto/openssh/contrib/hpux/egd.rc +++ /dev/null @@ -1,98 +0,0 @@ -#!/sbin/sh - -# -# egd.rc: EGD start-up and shutdown script -# - -# Allowed exit values: -# 0 = success; causes "OK" to show up in checklist. -# 1 = failure; causes "FAIL" to show up in checklist. -# 2 = skip; causes "N/A" to show up in the checklist. -# Use this value if execution of this script is overridden -# by the use of a control variable, or if this script is not -# appropriate to execute for some other reason. -# 3 = reboot; causes the system to be rebooted after execution. - -# Input and output: -# stdin is redirected from /dev/null -# -# stdout and stderr are redirected to the /etc/rc.log file -# during checklist mode, or to the console in raw mode. - -umask 022 - -PATH=/usr/sbin:/usr/bin:/sbin -export PATH - -WHAT='EGD (entropy gathering daemon)' -WHAT_PATH=/opt/perl/bin/egd.pl -WHAT_CONFIG=/etc/rc.config.d/egd -WHAT_LOG=/etc/opt/egd/egd.log - -# NOTE: If your script executes in run state 0 or state 1, then /usr might -# not be available. Do not attempt to access commands or files in -# /usr unless your script executes in run state 2 or greater. Other -# file systems typically not mounted until run state 2 include /var -# and /opt. - -rval=0 - -# Check the exit value of a command run by this script. If non-zero, the -# exit code is echoed to the log file and the return value of this script -# is set to indicate failure. - -set_return() { - x=$? - if [ $x -ne 0 ]; then - echo "EXIT CODE: $x" - rval=1 # script FAILed - fi -} - -case $1 in -'start_msg') - echo "Starting $WHAT" - ;; - -'stop_msg') - echo "Stopping $WHAT" - ;; - -'start') - if [ -f $WHAT_CONFIG ] ; then - . $WHAT_CONFIG - else - echo "ERROR: $WHAT_CONFIG defaults file MISSING" - fi - - - if [ "$EGD_START" -eq 1 -a -x $WHAT_PATH ]; then - EGD_LOG=${EGD_LOG:-$WHAT_LOG} - su egd -c "nohup $WHAT_PATH $EGD_ARGS >$EGD_LOG 2>&1" && - echo $WHAT started - set_return - else - rval=2 - fi - ;; - -'stop') - pid=`ps -fuegd | awk '$1 == "egd" { print $2 }'` - if [ "X$pid" != "X" ]; then - if kill "$pid"; then - echo "$WHAT stopped" - else - rval=1 - echo "Unable to stop $WHAT" - fi - fi - set_return - ;; - -*) - echo "usage: $0 {start|stop|start_msg|stop_msg}" - rval=1 - ;; -esac - -exit $rval diff --git a/crypto/openssh/contrib/hpux/sshd b/crypto/openssh/contrib/hpux/sshd deleted file mode 100644 index 8eb5e92..0000000 --- a/crypto/openssh/contrib/hpux/sshd +++ /dev/null @@ -1,5 +0,0 @@ -# SSHD_START: Set to 1 to start SSH daemon -# SSHD_ARGS: Command line arguments to pass to sshd -# -SSHD_START=1 -SSHD_ARGS= diff --git a/crypto/openssh/contrib/hpux/sshd.rc b/crypto/openssh/contrib/hpux/sshd.rc deleted file mode 100755 index f9a1099..0000000 --- a/crypto/openssh/contrib/hpux/sshd.rc +++ /dev/null @@ -1,90 +0,0 @@ -#!/sbin/sh - -# -# sshd.rc: SSH daemon start-up and shutdown script -# - -# Allowed exit values: -# 0 = success; causes "OK" to show up in checklist. -# 1 = failure; causes "FAIL" to show up in checklist. -# 2 = skip; causes "N/A" to show up in the checklist. -# Use this value if execution of this script is overridden -# by the use of a control variable, or if this script is not -# appropriate to execute for some other reason. -# 3 = reboot; causes the system to be rebooted after execution. - -# Input and output: -# stdin is redirected from /dev/null -# -# stdout and stderr are redirected to the /etc/rc.log file -# during checklist mode, or to the console in raw mode. - -PATH=/usr/sbin:/usr/bin:/sbin -export PATH - -WHAT='OpenSSH' -WHAT_PATH=/opt/openssh/sbin/sshd -WHAT_PID=/var/run/sshd.pid -WHAT_CONFIG=/etc/rc.config.d/sshd - -# NOTE: If your script executes in run state 0 or state 1, then /usr might -# not be available. Do not attempt to access commands or files in -# /usr unless your script executes in run state 2 or greater. Other -# file systems typically not mounted until run state 2 include /var -# and /opt. - -rval=0 - -# Check the exit value of a command run by this script. If non-zero, the -# exit code is echoed to the log file and the return value of this script -# is set to indicate failure. - -set_return() { - x=$? - if [ $x -ne 0 ]; then - echo "EXIT CODE: $x" - rval=1 # script FAILed - fi -} - -case $1 in -'start_msg') - echo "Starting $WHAT" - ;; - -'stop_msg') - echo "Stopping $WHAT" - ;; - -'start') - if [ -f $WHAT_CONFIG ] ; then - . $WHAT_CONFIG - else - echo "ERROR: $WHAT_CONFIG defaults file MISSING" - fi - - if [ "$SSHD_START" -eq 1 -a -x "$WHAT_PATH" ]; then - $WHAT_PATH $SSHD_ARGS && echo "$WHAT started" - set_return - else - rval=2 - fi - ;; - -'stop') - if kill `cat $WHAT_PID`; then - echo "$WHAT stopped" - else - rval=1 - echo "Unable to stop $WHAT" - fi - set_return - ;; - -*) - echo "usage: $0 {start|stop|start_msg|stop_msg}" - rval=1 - ;; -esac - -exit $rval diff --git a/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh b/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh deleted file mode 100644 index dd77712..0000000 --- a/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh +++ /dev/null @@ -1 +0,0 @@ -setenv SSH_ASKPASS /usr/libexec/openssh/gnome-ssh-askpass diff --git a/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh b/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh deleted file mode 100644 index 355189f..0000000 --- a/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh +++ /dev/null @@ -1,2 +0,0 @@ -SSH_ASKPASS=/usr/libexec/openssh/gnome-ssh-askpass -export SSH_ASKPASS diff --git a/crypto/openssh/contrib/redhat/openssh.spec b/crypto/openssh/contrib/redhat/openssh.spec deleted file mode 100644 index b747009..0000000 --- a/crypto/openssh/contrib/redhat/openssh.spec +++ /dev/null @@ -1,804 +0,0 @@ -%define ver 3.8.1p1 -%define rel 1 - -# OpenSSH privilege separation requires a user & group ID -%define sshd_uid 74 -%define sshd_gid 74 - -# Version of ssh-askpass -%define aversion 1.2.4.1 - -# Do we want to disable building of x11-askpass? (1=yes 0=no) -%define no_x11_askpass 0 - -# Do we want to disable building of gnome-askpass? (1=yes 0=no) -%define no_gnome_askpass 0 - -# Do we want to link against a static libcrypto? (1=yes 0=no) -%define static_libcrypto 0 - -# Do we want smartcard support (1=yes 0=no) -%define scard 0 - -# Use GTK2 instead of GNOME in gnome-ssh-askpass -%define gtk2 1 - -# Is this build for RHL 6.x? -%define build6x 0 - -# Do we want kerberos5 support (1=yes 0=no) -%define kerberos5 1 - -# Reserve options to override askpass settings with: -# rpm -ba|--rebuild --define 'skip_xxx 1' -%{?skip_x11_askpass:%define no_x11_askpass 1} -%{?skip_gnome_askpass:%define no_gnome_askpass 1} - -# Add option to build without GTK2 for older platforms with only GTK+. -# RedHat <= 7.2 and Red Hat Advanced Server 2.1 are examples. -# rpm -ba|--rebuild --define 'no_gtk2 1' -%{?no_gtk2:%define gtk2 0} - -# Is this a build for RHL 6.x or earlier? -%{?build_6x:%define build6x 1} - -# If this is RHL 6.x, the default configuration has sysconfdir in /usr/etc. -%if %{build6x} -%define _sysconfdir /etc -%endif - -# Options for static OpenSSL link: -# rpm -ba|--rebuild --define "static_openssl 1" -%{?static_openssl:%define static_libcrypto 1} - -# Options for Smartcard support: (needs libsectok and openssl-engine) -# rpm -ba|--rebuild --define "smartcard 1" -%{?smartcard:%define scard 1} - -# Is this a build for the rescue CD (without PAM, with MD5)? (1=yes 0=no) -%define rescue 0 -%{?build_rescue:%define rescue 1} - -# Turn off some stuff for resuce builds -%if %{rescue} -%define kerberos5 0 -%endif - -Summary: The OpenSSH implementation of SSH protocol versions 1 and 2. -Name: openssh -Version: %{ver} -%if %{rescue} -Release: %{rel}rescue -%else -Release: %{rel} -%endif -URL: http://www.openssh.com/portable.html -Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz -Source1: http://www.pobox.com/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz -License: BSD -Group: Applications/Internet -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot -Obsoletes: ssh -%if %{build6x} -PreReq: initscripts >= 5.00 -%else -PreReq: initscripts >= 5.20 -%endif -BuildPreReq: perl, openssl-devel, tcp_wrappers -BuildPreReq: /bin/login -%if ! %{build6x} -BuildPreReq: glibc-devel, pam -%else -BuildPreReq: /usr/include/security/pam_appl.h -%endif -%if ! %{no_x11_askpass} -BuildPreReq: XFree86-devel -%endif -%if ! %{no_gnome_askpass} -BuildPreReq: pkgconfig -%endif -%if %{kerberos5} -BuildPreReq: krb5-devel -BuildPreReq: krb5-libs -%endif - -%package clients -Summary: OpenSSH clients. -Requires: openssh = %{version}-%{release} -Group: Applications/Internet -Obsoletes: ssh-clients - -%package server -Summary: The OpenSSH server daemon. -Group: System Environment/Daemons -Obsoletes: ssh-server -PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9 -%if ! %{build6x} -Requires: /etc/pam.d/system-auth -%endif - -%package askpass -Summary: A passphrase dialog for OpenSSH and X. -Group: Applications/Internet -Requires: openssh = %{version}-%{release} -Obsoletes: ssh-extras - -%package askpass-gnome -Summary: A passphrase dialog for OpenSSH, X, and GNOME. -Group: Applications/Internet -Requires: openssh = %{version}-%{release} -Obsoletes: ssh-extras - -%description -SSH (Secure SHell) is a program for logging into and executing -commands on a remote machine. SSH is intended to replace rlogin and -rsh, and to provide secure encrypted communications between two -untrusted hosts over an insecure network. X11 connections and -arbitrary TCP/IP ports can also be forwarded over the secure channel. - -OpenSSH is OpenBSD's version of the last free version of SSH, bringing -it up to date in terms of security and features, as well as removing -all patented algorithms to separate libraries. - -This package includes the core files necessary for both the OpenSSH -client and server. To make this package useful, you should also -install openssh-clients, openssh-server, or both. - -%description clients -OpenSSH is a free version of SSH (Secure SHell), a program for logging -into and executing commands on a remote machine. This package includes -the clients necessary to make encrypted connections to SSH servers. -You'll also need to install the openssh package on OpenSSH clients. - -%description server -OpenSSH is a free version of SSH (Secure SHell), a program for logging -into and executing commands on a remote machine. This package contains -the secure shell daemon (sshd). The sshd daemon allows SSH clients to -securely connect to your SSH server. You also need to have the openssh -package installed. - -%description askpass -OpenSSH is a free version of SSH (Secure SHell), a program for logging -into and executing commands on a remote machine. This package contains -an X11 passphrase dialog for OpenSSH. - -%description askpass-gnome -OpenSSH is a free version of SSH (Secure SHell), a program for logging -into and executing commands on a remote machine. This package contains -an X11 passphrase dialog for OpenSSH and the GNOME GUI desktop -environment. - -%prep - -%if ! %{no_x11_askpass} -%setup -q -a 1 -%else -%setup -q -%endif - -%build -%if %{rescue} -CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS -%endif - -%if %{kerberos5} -K5DIR=`rpm -ql krb5-devel | grep include/krb5.h | sed 's,\/include\/krb5.h,,'` -echo K5DIR=$K5DIR -%endif - -%configure \ - --sysconfdir=%{_sysconfdir}/ssh \ - --libexecdir=%{_libexecdir}/openssh \ - --datadir=%{_datadir}/openssh \ - --with-tcp-wrappers \ - --with-rsh=%{_bindir}/rsh \ - --with-default-path=/usr/local/bin:/bin:/usr/bin \ - --with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \ - --with-privsep-path=%{_var}/empty/sshd \ - --with-md5-passwords \ -%if %{scard} - --with-smartcard \ -%endif -%if %{rescue} - --without-pam \ -%else - --with-pam \ -%endif -%if %{kerberos5} - --with-kerberos5=$K5DIR \ -%endif - - -%if %{static_libcrypto} -perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile -%endif - -make - -%if ! %{no_x11_askpass} -pushd x11-ssh-askpass-%{aversion} -%configure --libexecdir=%{_libexecdir}/openssh -xmkmf -a -make -popd -%endif - -# Define a variable to toggle gnome1/gtk2 building. This is necessary -# because RPM doesn't handle nested %if statements. -%if %{gtk2} - gtk2=yes -%else - gtk2=no -%endif - -%if ! %{no_gnome_askpass} -pushd contrib -if [ $gtk2 = yes ] ; then - make gnome-ssh-askpass2 - mv gnome-ssh-askpass2 gnome-ssh-askpass -else - make gnome-ssh-askpass1 - mv gnome-ssh-askpass1 gnome-ssh-askpass -fi -popd -%endif - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh -mkdir -p -m755 $RPM_BUILD_ROOT%{_libexecdir}/openssh -mkdir -p -m755 $RPM_BUILD_ROOT%{_var}/empty/sshd - -make install DESTDIR=$RPM_BUILD_ROOT - -install -d $RPM_BUILD_ROOT/etc/pam.d/ -install -d $RPM_BUILD_ROOT/etc/rc.d/init.d -install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh -%if %{build6x} -install -m644 contrib/redhat/sshd.pam.old $RPM_BUILD_ROOT/etc/pam.d/sshd -%else -install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd -%endif -install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd - -%if ! %{no_x11_askpass} -install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/x11-ssh-askpass -ln -s x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass -%endif - -%if ! %{no_gnome_askpass} -install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass -%endif - -%if ! %{scard} - rm -f $RPM_BUILD_ROOT/usr/share/openssh/Ssh.bin -%endif - -%if ! %{no_gnome_askpass} -install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ -install -m 755 contrib/redhat/gnome-ssh-askpass.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ -install -m 755 contrib/redhat/gnome-ssh-askpass.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ -%endif - -perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/* - -%clean -rm -rf $RPM_BUILD_ROOT - -%triggerun server -- ssh-server -if [ "$1" != 0 -a -r /var/run/sshd.pid ] ; then - touch /var/run/sshd.restart -fi - -%triggerun server -- openssh-server < 2.5.0p1 -# Count the number of HostKey and HostDsaKey statements we have. -gawk 'BEGIN {IGNORECASE=1} - /^hostkey/ || /^hostdsakey/ {sawhostkey = sawhostkey + 1} - END {exit sawhostkey}' /etc/ssh/sshd_config -# And if we only found one, we know the client was relying on the old default -# behavior, which loaded the the SSH2 DSA host key when HostDsaKey wasn't -# specified. Now that HostKey is used for both SSH1 and SSH2 keys, specifying -# one nullifies the default, which would have loaded both. -if [ $? -eq 1 ] ; then - echo HostKey /etc/ssh/ssh_host_rsa_key >> /etc/ssh/sshd_config - echo HostKey /etc/ssh/ssh_host_dsa_key >> /etc/ssh/sshd_config -fi - -%triggerpostun server -- ssh-server -if [ "$1" != 0 ] ; then - /sbin/chkconfig --add sshd - if test -f /var/run/sshd.restart ; then - rm -f /var/run/sshd.restart - /sbin/service sshd start > /dev/null 2>&1 || : - fi -fi - -%pre server -%{_sbindir}/groupadd -r -g %{sshd_gid} sshd 2>/dev/null || : -%{_sbindir}/useradd -d /var/empty/sshd -s /bin/false -u %{sshd_uid} \ - -g sshd -M -r sshd 2>/dev/null || : - -%post server -/sbin/chkconfig --add sshd - -%postun server -/sbin/service sshd condrestart > /dev/null 2>&1 || : - -%preun server -if [ "$1" = 0 ] -then - /sbin/service sshd stop > /dev/null 2>&1 || : - /sbin/chkconfig --del sshd -fi - -%files -%defattr(-,root,root) -%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* RFC* TODO WARNING* -%attr(0755,root,root) %{_bindir}/scp -%attr(0644,root,root) %{_mandir}/man1/scp.1* -%attr(0755,root,root) %dir %{_sysconfdir}/ssh -%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/moduli -%if ! %{rescue} -%attr(0755,root,root) %{_bindir}/ssh-keygen -%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* -%attr(0755,root,root) %dir %{_libexecdir}/openssh -%attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign -%attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* -%endif -%if %{scard} -%attr(0755,root,root) %dir %{_datadir}/openssh -%attr(0644,root,root) %{_datadir}/openssh/Ssh.bin -%endif - -%files clients -%defattr(-,root,root) -%attr(0755,root,root) %{_bindir}/ssh -%attr(0644,root,root) %{_mandir}/man1/ssh.1* -%attr(0644,root,root) %{_mandir}/man5/ssh_config.5* -%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config -%attr(-,root,root) %{_bindir}/slogin -%attr(-,root,root) %{_mandir}/man1/slogin.1* -%if ! %{rescue} -%attr(2755,root,nobody) %{_bindir}/ssh-agent -%attr(0755,root,root) %{_bindir}/ssh-add -%attr(0755,root,root) %{_bindir}/ssh-keyscan -%attr(0755,root,root) %{_bindir}/sftp -%attr(0644,root,root) %{_mandir}/man1/ssh-agent.1* -%attr(0644,root,root) %{_mandir}/man1/ssh-add.1* -%attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1* -%attr(0644,root,root) %{_mandir}/man1/sftp.1* -%endif - -%if ! %{rescue} -%files server -%defattr(-,root,root) -%dir %attr(0111,root,root) %{_var}/empty/sshd -%attr(0755,root,root) %{_sbindir}/sshd -%attr(0755,root,root) %{_libexecdir}/openssh/sftp-server -%attr(0644,root,root) %{_mandir}/man8/sshd.8* -%attr(0644,root,root) %{_mandir}/man5/sshd_config.5* -%attr(0644,root,root) %{_mandir}/man8/sftp-server.8* -%attr(0755,root,root) %dir %{_sysconfdir}/ssh -%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config -%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd -%attr(0755,root,root) %config /etc/rc.d/init.d/sshd -%endif - -%if ! %{no_x11_askpass} -%files askpass -%defattr(-,root,root) -%doc x11-ssh-askpass-%{aversion}/README -%doc x11-ssh-askpass-%{aversion}/ChangeLog -%doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad -%attr(0755,root,root) %{_libexecdir}/openssh/ssh-askpass -%attr(0755,root,root) %{_libexecdir}/openssh/x11-ssh-askpass -%endif - -%if ! %{no_gnome_askpass} -%files askpass-gnome -%defattr(-,root,root) -%attr(0755,root,root) %config %{_sysconfdir}/profile.d/gnome-ssh-askpass.* -%attr(0755,root,root) %{_libexecdir}/openssh/gnome-ssh-askpass -%endif - -%changelog -* Mon Jun 2 2003 Damien Miller -- Remove noip6 option. This may be controlled at run-time in client config - file using new AddressFamily directive - -* Mon May 12 2003 Damien Miller -- Don't install profile.d scripts when not building with GNOME/GTK askpass - (patch from bet@rahul.net) - -* Wed Oct 01 2002 Damien Miller -- Install ssh-agent setgid nobody to prevent ptrace() key theft attacks - -* Mon Sep 30 2002 Damien Miller -- Use contrib/ Makefile for building askpass programs - -* Fri Jun 21 2002 Damien Miller -- Merge in spec changes from seba@iq.pl (Sebastian Pachuta) -- Add new {ssh,sshd}_config.5 manpages -- Add new ssh-keysign program and remove setuid from ssh client - -* Fri May 10 2002 Damien Miller -- Merge in spec changes from RedHat, reorgansie a little -- Add Privsep user, group and directory - -* Thu Mar 7 2002 Nalin Dahyabhai 3.1p1-2 -- bump and grind (through the build system) - -* Thu Mar 7 2002 Nalin Dahyabhai 3.1p1-1 -- require sharutils for building (mindrot #137) -- require db1-devel only when building for 6.x (#55105), which probably won't - work anyway (3.1 requires OpenSSL 0.9.6 to build), but what the heck -- require pam-devel by file (not by package name) again -- add Markus's patch to compile with OpenSSL 0.9.5a (from - http://bugzilla.mindrot.org/show_bug.cgi?id=141) and apply it if we're - building for 6.x - -* Thu Mar 7 2002 Nalin Dahyabhai 3.1p1-0 -- update to 3.1p1 - -* Tue Mar 5 2002 Nalin Dahyabhai SNAP-20020305 -- update to SNAP-20020305 -- drop debug patch, fixed upstream - -* Wed Feb 20 2002 Nalin Dahyabhai SNAP-20020220 -- update to SNAP-20020220 for testing purposes (you've been warned, if there's - anything to be warned about, gss patches won't apply, I don't mind) - -* Wed Feb 13 2002 Nalin Dahyabhai 3.0.2p1-3 -- add patches from Simon Wilkinson and Nicolas Williams for GSSAPI key - exchange, authentication, and named key support - -* Wed Jan 23 2002 Nalin Dahyabhai 3.0.2p1-2 -- remove dependency on db1-devel, which has just been swallowed up whole - by gnome-libs-devel - -* Sun Dec 29 2001 Nalin Dahyabhai -- adjust build dependencies so that build6x actually works right (fix - from Hugo van der Kooij) - -* Tue Dec 4 2001 Nalin Dahyabhai 3.0.2p1-1 -- update to 3.0.2p1 - -* Fri Nov 16 2001 Nalin Dahyabhai 3.0.1p1-1 -- update to 3.0.1p1 - -* Tue Nov 13 2001 Nalin Dahyabhai -- update to current CVS (not for use in distribution) - -* Thu Nov 8 2001 Nalin Dahyabhai 3.0p1-1 -- merge some of Damien Miller changes from the upstream - 3.0p1 spec file and init script - -* Wed Nov 7 2001 Nalin Dahyabhai -- update to 3.0p1 -- update to x11-ssh-askpass 1.2.4.1 -- change build dependency on a file from pam-devel to the pam-devel package -- replace primes with moduli - -* Thu Sep 27 2001 Nalin Dahyabhai 2.9p2-9 -- incorporate fix from Markus Friedl's advisory for IP-based authorization bugs - -* Thu Sep 13 2001 Bernhard Rosenkraenzer 2.9p2-8 -- Merge changes to rescue build from current sysadmin survival cd - -* Thu Sep 6 2001 Nalin Dahyabhai 2.9p2-7 -- fix scp's server's reporting of file sizes, and build with the proper - preprocessor define to get large-file capable open(), stat(), etc. - (sftp has been doing this correctly all along) (#51827) -- configure without --with-ipv4-default on RHL 7.x and newer (#45987,#52247) -- pull cvs patch to fix support for /etc/nologin for non-PAM logins (#47298) -- mark profile.d scriptlets as config files (#42337) -- refer to Jason Stone's mail for zsh workaround for exit-hanging quasi-bug -- change a couple of log() statements to debug() statements (#50751) -- pull cvs patch to add -t flag to sshd (#28611) -- clear fd_sets correctly (one bit per FD, not one byte per FD) (#43221) - -* Mon Aug 20 2001 Nalin Dahyabhai 2.9p2-6 -- add db1-devel as a BuildPrerequisite (noted by Hans Ecke) - -* Thu Aug 16 2001 Nalin Dahyabhai -- pull cvs patch to fix remote port forwarding with protocol 2 - -* Thu Aug 9 2001 Nalin Dahyabhai -- pull cvs patch to add session initialization to no-pty sessions -- pull cvs patch to not cut off challengeresponse auth needlessly -- refuse to do X11 forwarding if xauth isn't there, handy if you enable - it by default on a system that doesn't have X installed (#49263) - -* Wed Aug 8 2001 Nalin Dahyabhai -- don't apply patches to code we don't intend to build (spotted by Matt Galgoci) - -* Mon Aug 6 2001 Nalin Dahyabhai -- pass OPTIONS correctly to initlog (#50151) - -* Wed Jul 25 2001 Nalin Dahyabhai -- switch to x11-ssh-askpass 1.2.2 - -* Wed Jul 11 2001 Nalin Dahyabhai -- rebuild in new environment - -* Mon Jun 25 2001 Nalin Dahyabhai -- disable the gssapi patch - -* Mon Jun 18 2001 Nalin Dahyabhai -- update to 2.9p2 -- refresh to a new version of the gssapi patch - -* Thu Jun 7 2001 Nalin Dahyabhai -- change Copyright: BSD to License: BSD -- add Markus Friedl's unverified patch for the cookie file deletion problem - so that we can verify it -- drop patch to check if xauth is present (was folded into cookie patch) -- don't apply gssapi patches for the errata candidate -- clear supplemental groups list at startup - -* Fri May 25 2001 Nalin Dahyabhai -- fix an error parsing the new default sshd_config -- add a fix from Markus Friedl (via openssh-unix-dev) for ssh-keygen not - dealing with comments right - -* Thu May 24 2001 Nalin Dahyabhai -- add in Simon Wilkinson's GSSAPI patch to give it some testing in-house, - to be removed before the next beta cycle because it's a big departure - from the upstream version - -* Thu May 3 2001 Nalin Dahyabhai -- finish marking strings in the init script for translation -- modify init script to source /etc/sysconfig/sshd and pass $OPTIONS to sshd - at startup (change merged from openssh.com init script, originally by - Pekka Savola) -- refuse to do X11 forwarding if xauth isn't there, handy if you enable - it by default on a system that doesn't have X installed - -* Wed May 2 2001 Nalin Dahyabhai -- update to 2.9 -- drop various patches that came from or went upstream or to or from CVS - -* Wed Apr 18 2001 Nalin Dahyabhai -- only require initscripts 5.00 on 6.2 (reported by Peter Bieringer) - -* Sun Apr 8 2001 Preston Brown -- remove explicit openssl requirement, fixes builddistro issue -- make initscript stop() function wait until sshd really dead to avoid - races in condrestart - -* Mon Apr 2 2001 Nalin Dahyabhai -- mention that challengereponse supports PAM, so disabling password doesn't - limit users to pubkey and rsa auth (#34378) -- bypass the daemon() function in the init script and call initlog directly, - because daemon() won't start a daemon it detects is already running (like - open connections) -- require the version of openssl we had when we were built - -* Fri Mar 23 2001 Nalin Dahyabhai -- make do_pam_setcred() smart enough to know when to establish creds and - when to reinitialize them -- add in a couple of other fixes from Damien for inclusion in the errata - -* Thu Mar 22 2001 Nalin Dahyabhai -- update to 2.5.2p2 -- call setcred() again after initgroups, because the "creds" could actually - be group memberships - -* Tue Mar 20 2001 Nalin Dahyabhai -- update to 2.5.2p1 (includes endianness fixes in the rijndael implementation) -- don't enable challenge-response by default until we find a way to not - have too many userauth requests (we may make up to six pubkey and up to - three password attempts as it is) -- remove build dependency on rsh to match openssh.com's packages more closely - -* Sat Mar 3 2001 Nalin Dahyabhai -- remove dependency on openssl -- would need to be too precise - -* Fri Mar 2 2001 Nalin Dahyabhai -- rebuild in new environment - -* Mon Feb 26 2001 Nalin Dahyabhai -- Revert the patch to move pam_open_session. -- Init script and spec file changes from Pekka Savola. (#28750) -- Patch sftp to recognize '-o protocol' arguments. (#29540) - -* Thu Feb 22 2001 Nalin Dahyabhai -- Chuck the closing patch. -- Add a trigger to add host keys for protocol 2 to the config file, now that - configuration file syntax requires us to specify it with HostKey if we - specify any other HostKey values, which we do. - -* Tue Feb 20 2001 Nalin Dahyabhai -- Redo patch to move pam_open_session after the server setuid()s to the user. -- Rework the nopam patch to use be picked up by autoconf. - -* Mon Feb 19 2001 Nalin Dahyabhai -- Update for 2.5.1p1. -- Add init script mods from Pekka Savola. -- Tweak the init script to match the CVS contrib script more closely. -- Redo patch to ssh-add to try to adding both identity and id_dsa to also try - adding id_rsa. - -* Fri Feb 16 2001 Nalin Dahyabhai -- Update for 2.5.0p1. -- Use $RPM_OPT_FLAGS instead of -O when building gnome-ssh-askpass -- Resync with parts of Damien Miller's openssh.spec from CVS, including - update of x11 askpass to 1.2.0. -- Only require openssl (don't prereq) because we generate keys in the init - script now. - -* Tue Feb 13 2001 Nalin Dahyabhai -- Don't open a PAM session until we've forked and become the user (#25690). -- Apply Andrew Bartlett's patch for letting pam_authenticate() know which - host the user is attempting a login from. -- Resync with parts of Damien Miller's openssh.spec from CVS. -- Don't expose KbdInt responses in debug messages (from CVS). -- Detect and handle errors in rsa_{public,private}_decrypt (from CVS). - -* Wed Feb 7 2001 Trond Eivind Glomsrxd -- i18n-tweak to initscript. - -* Tue Jan 23 2001 Nalin Dahyabhai -- More gettextizing. -- Close all files after going into daemon mode (needs more testing). -- Extract patch from CVS to handle auth banners (in the client). -- Extract patch from CVS to handle compat weirdness. - -* Fri Jan 19 2001 Nalin Dahyabhai -- Finish with the gettextizing. - -* Thu Jan 18 2001 Nalin Dahyabhai -- Fix a bug in auth2-pam.c (#23877) -- Gettextize the init script. - -* Wed Dec 20 2000 Nalin Dahyabhai -- Incorporate a switch for using PAM configs for 6.x, just in case. - -* Tue Dec 5 2000 Nalin Dahyabhai -- Incorporate Bero's changes for a build specifically for rescue CDs. - -* Wed Nov 29 2000 Nalin Dahyabhai -- Don't treat pam_setcred() failure as fatal unless pam_authenticate() has - succeeded, to allow public-key authentication after a failure with "none" - authentication. (#21268) - -* Tue Nov 28 2000 Nalin Dahyabhai -- Update to x11-askpass 1.1.1. (#21301) -- Don't second-guess fixpaths, which causes paths to get fixed twice. (#21290) - -* Mon Nov 27 2000 Nalin Dahyabhai -- Merge multiple PAM text messages into subsequent prompts when possible when - doing keyboard-interactive authentication. - -* Sun Nov 26 2000 Nalin Dahyabhai -- Disable the built-in MD5 password support. We're using PAM. -- Take a crack at doing keyboard-interactive authentication with PAM, and - enable use of it in the default client configuration so that the client - will try it when the server disallows password authentication. -- Build with debugging flags. Build root policies strip all binaries anyway. - -* Tue Nov 21 2000 Nalin Dahyabhai -- Use DESTDIR instead of %%makeinstall. -- Remove /usr/X11R6/bin from the path-fixing patch. - -* Mon Nov 20 2000 Nalin Dahyabhai -- Add the primes file from the latest snapshot to the main package (#20884). -- Add the dev package to the prereq list (#19984). -- Remove the default path and mimic login's behavior in the server itself. - -* Fri Nov 17 2000 Nalin Dahyabhai -- Resync with conditional options in Damien Miller's .spec file for an errata. -- Change libexecdir from %%{_libexecdir}/ssh to %%{_libexecdir}/openssh. - -* Tue Nov 7 2000 Nalin Dahyabhai -- Update to OpenSSH 2.3.0p1. -- Update to x11-askpass 1.1.0. -- Enable keyboard-interactive authentication. - -* Mon Oct 30 2000 Nalin Dahyabhai -- Update to ssh-askpass-x11 1.0.3. -- Change authentication related messages to be private (#19966). - -* Tue Oct 10 2000 Nalin Dahyabhai -- Patch ssh-keygen to be able to list signatures for DSA public key files - it generates. - -* Thu Oct 5 2000 Nalin Dahyabhai -- Add BuildPreReq on /usr/include/security/pam_appl.h to be sure we always - build PAM authentication in. -- Try setting SSH_ASKPASS if gnome-ssh-askpass is installed. -- Clean out no-longer-used patches. -- Patch ssh-add to try to add both identity and id_dsa, and to error only - when neither exists. - -* Mon Oct 2 2000 Nalin Dahyabhai -- Update x11-askpass to 1.0.2. (#17835) -- Add BuildPreReqs for /bin/login and /usr/bin/rsh so that configure will - always find them in the right place. (#17909) -- Set the default path to be the same as the one supplied by /bin/login, but - add /usr/X11R6/bin. (#17909) -- Try to handle obsoletion of ssh-server more cleanly. Package names - are different, but init script name isn't. (#17865) - -* Wed Sep 6 2000 Nalin Dahyabhai -- Update to 2.2.0p1. (#17835) -- Tweak the init script to allow proper restarting. (#18023) - -* Wed Aug 23 2000 Nalin Dahyabhai -- Update to 20000823 snapshot. -- Change subpackage requirements from %%{version} to %%{version}-%%{release} -- Back out the pipe patch. - -* Mon Jul 17 2000 Nalin Dahyabhai -- Update to 2.1.1p4, which includes fixes for config file parsing problems. -- Move the init script back. -- Add Damien's quick fix for wackiness. - -* Wed Jul 12 2000 Nalin Dahyabhai -- Update to 2.1.1p3, which includes fixes for X11 forwarding and strtok(). - -* Thu Jul 6 2000 Nalin Dahyabhai -- Move condrestart to server postun. -- Move key generation to init script. -- Actually use the right patch for moving the key generation to the init script. -- Clean up the init script a bit. - -* Wed Jul 5 2000 Nalin Dahyabhai -- Fix X11 forwarding, from mail post by Chan Shih-Ping Richard. - -* Sun Jul 2 2000 Nalin Dahyabhai -- Update to 2.1.1p2. -- Use of strtok() considered harmful. - -* Sat Jul 1 2000 Nalin Dahyabhai -- Get the build root out of the man pages. - -* Thu Jun 29 2000 Nalin Dahyabhai -- Add and use condrestart support in the init script. -- Add newer initscripts as a prereq. - -* Tue Jun 27 2000 Nalin Dahyabhai -- Build in new environment (release 2) -- Move -clients subpackage to Applications/Internet group - -* Fri Jun 9 2000 Nalin Dahyabhai -- Update to 2.2.1p1 - -* Sat Jun 3 2000 Nalin Dahyabhai -- Patch to build with neither RSA nor RSAref. -- Miscellaneous FHS-compliance tweaks. -- Fix for possibly-compressed man pages. - -* Wed Mar 15 2000 Damien Miller -- Updated for new location -- Updated for new gnome-ssh-askpass build - -* Sun Dec 26 1999 Damien Miller -- Added Jim Knoble's askpass - -* Mon Nov 15 1999 Damien Miller -- Split subpackages further based on patch from jim knoble - -* Sat Nov 13 1999 Damien Miller -- Added 'Obsoletes' directives - -* Tue Nov 09 1999 Damien Miller -- Use make install -- Subpackages - -* Mon Nov 08 1999 Damien Miller -- Added links for slogin -- Fixed perms on manpages - -* Sat Oct 30 1999 Damien Miller -- Renamed init script - -* Fri Oct 29 1999 Damien Miller -- Back to old binary names - -* Thu Oct 28 1999 Damien Miller -- Use autoconf -- New binary names - -* Wed Oct 27 1999 Damien Miller -- Initial RPMification, based on Jan "Yenya" Kasprzak's spec. diff --git a/crypto/openssh/contrib/redhat/sshd.init b/crypto/openssh/contrib/redhat/sshd.init deleted file mode 100755 index 4ee8630..0000000 --- a/crypto/openssh/contrib/redhat/sshd.init +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/bash -# -# Init file for OpenSSH server daemon -# -# chkconfig: 2345 55 25 -# description: OpenSSH server daemon -# -# processname: sshd -# config: /etc/ssh/ssh_host_key -# config: /etc/ssh/ssh_host_key.pub -# config: /etc/ssh/ssh_random_seed -# config: /etc/ssh/sshd_config -# pidfile: /var/run/sshd.pid - -# source function library -. /etc/rc.d/init.d/functions - -# pull in sysconfig settings -[ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd - -RETVAL=0 -prog="sshd" - -# Some functions to make the below more readable -KEYGEN=/usr/bin/ssh-keygen -SSHD=/usr/sbin/sshd -RSA1_KEY=/etc/ssh/ssh_host_key -RSA_KEY=/etc/ssh/ssh_host_rsa_key -DSA_KEY=/etc/ssh/ssh_host_dsa_key -PID_FILE=/var/run/sshd.pid - -do_rsa1_keygen() { - if [ ! -s $RSA1_KEY ]; then - echo -n $"Generating SSH1 RSA host key: " - if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then - chmod 600 $RSA1_KEY - chmod 644 $RSA1_KEY.pub - success $"RSA1 key generation" - echo - else - failure $"RSA1 key generation" - echo - exit 1 - fi - fi -} - -do_rsa_keygen() { - if [ ! -s $RSA_KEY ]; then - echo -n $"Generating SSH2 RSA host key: " - if $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then - chmod 600 $RSA_KEY - chmod 644 $RSA_KEY.pub - success $"RSA key generation" - echo - else - failure $"RSA key generation" - echo - exit 1 - fi - fi -} - -do_dsa_keygen() { - if [ ! -s $DSA_KEY ]; then - echo -n $"Generating SSH2 DSA host key: " - if $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then - chmod 600 $DSA_KEY - chmod 644 $DSA_KEY.pub - success $"DSA key generation" - echo - else - failure $"DSA key generation" - echo - exit 1 - fi - fi -} - -do_restart_sanity_check() -{ - $SSHD -t - RETVAL=$? - if [ ! "$RETVAL" = 0 ]; then - failure $"Configuration file or keys are invalid" - echo - fi -} - -start() -{ - # Create keys if necessary - do_rsa1_keygen - do_rsa_keygen - do_dsa_keygen - - echo -n $"Starting $prog:" - initlog -c "$SSHD $OPTIONS" && success || failure - RETVAL=$? - [ "$RETVAL" = 0 ] && touch /var/lock/subsys/sshd - echo -} - -stop() -{ - echo -n $"Stopping $prog:" - killproc $SSHD -TERM - RETVAL=$? - [ "$RETVAL" = 0 ] && rm -f /var/lock/subsys/sshd - echo -} - -reload() -{ - echo -n $"Reloading $prog:" - killproc $SSHD -HUP - RETVAL=$? - echo -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - reload) - reload - ;; - condrestart) - if [ -f /var/lock/subsys/sshd ] ; then - do_restart_sanity_check - if [ "$RETVAL" = 0 ] ; then - stop - # avoid race - sleep 3 - start - fi - fi - ;; - status) - status $SSHD - RETVAL=$? - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" - RETVAL=1 -esac -exit $RETVAL diff --git a/crypto/openssh/contrib/redhat/sshd.pam b/crypto/openssh/contrib/redhat/sshd.pam deleted file mode 100644 index 24f3b46..0000000 --- a/crypto/openssh/contrib/redhat/sshd.pam +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth required pam_stack.so service=system-auth -auth required pam_nologin.so -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth -session required pam_limits.so -session optional pam_console.so diff --git a/crypto/openssh/contrib/solaris/README b/crypto/openssh/contrib/solaris/README deleted file mode 100755 index eb4c590..0000000 --- a/crypto/openssh/contrib/solaris/README +++ /dev/null @@ -1,24 +0,0 @@ -The following is a new package build script for Solaris. This is being -introduced into OpenSSH 3.0 and above in hopes of simplifying the build -process. As of 3.1p2 the script should work on all platforms that have -SVR4 style package tools. - -The build process is called a 'dummy install'.. Which means the software does -a "make install-nokeys DESTDIR=[fakeroot]". This way all manpages should -be handled correctly and key are defered until the first time the sshd -is started. - -Directions: - -1. make -F Makefile.in distprep (Only if you are getting from the CVS tree) -2. ./configure --with-pam [..any other options you want..] -3. look at the top of contrib/solaris/buildpkg.sh for the configurable options. -4. ./contrib/solaris/buildpkg.sh - -If all goes well you should have a solaris package ready to be installed. - -If you have any problems with this script please post them to -openssh-unix-dev@mindrot.org and I will try to assist you as best as I can. - -- Ben Lindstrom - diff --git a/crypto/openssh/contrib/solaris/buildpkg.sh b/crypto/openssh/contrib/solaris/buildpkg.sh deleted file mode 100755 index 29d0963..0000000 --- a/crypto/openssh/contrib/solaris/buildpkg.sh +++ /dev/null @@ -1,386 +0,0 @@ -#!/bin/sh -# -# Fake Root Solaris/SVR4/SVR5 Build System - Prototype -# -# The following code has been provide under Public Domain License. I really -# don't care what you use it for. Just as long as you don't complain to me -# nor my employer if you break it. - Ben Lindstrom (mouring@eviladmin.org) -# -umask 022 -# -# Options for building the package -# You can create a config.local with your customized options -# -# uncommenting TEST_DIR and using -# configure --prefix=/var/tmp --with-privsep-path=/var/tmp/empty -# and -# PKGNAME=tOpenSSH should allow testing a package without interfering -# with a real OpenSSH package on a system. This is not needed on systems -# that support the -R option to pkgadd. -#TEST_DIR=/var/tmp # leave commented out for production build -PKGNAME=OpenSSH -SYSVINIT_NAME=opensshd -MAKE=${MAKE:="make"} -SSHDUID=67 # Default privsep uid -SSHDGID=67 # Default privsep gid -# uncomment these next three as needed -#PERMIT_ROOT_LOGIN=no -#X11_FORWARDING=yes -#USR_LOCAL_IS_SYMLINK=yes -# list of system directories we do NOT want to change owner/group/perms -# when installing our package -SYSTEM_DIR="/etc \ -/etc/init.d \ -/etc/rcS.d \ -/etc/rc0.d \ -/etc/rc1.d \ -/etc/rc2.d \ -/etc/opt \ -/opt \ -/opt/bin \ -/usr \ -/usr/bin \ -/usr/lib \ -/usr/sbin \ -/usr/share \ -/usr/share/man \ -/usr/share/man/man1 \ -/usr/share/man/man8 \ -/usr/local \ -/usr/local/bin \ -/usr/local/etc \ -/usr/local/libexec \ -/usr/local/man \ -/usr/local/man/man1 \ -/usr/local/man/man8 \ -/usr/local/sbin \ -/usr/local/share \ -/var \ -/var/opt \ -/var/run \ -/var/tmp \ -/tmp" - -# We may need to build as root so we make sure PATH is set up -# only set the path if it's not set already -[ -d /usr/local/bin ] && { - echo $PATH | grep ":/usr/local/bin" > /dev/null 2>&1 - [ $? -ne 0 ] && PATH=$PATH:/usr/local/bin -} -[ -d /usr/ccs/bin ] && { - echo $PATH | grep ":/usr/ccs/bin" > /dev/null 2>&1 - [ $? -ne 0 ] && PATH=$PATH:/usr/ccs/bin -} -export PATH -# - -[ -f Makefile ] || { - echo "Please run this script from your build directory" - exit 1 -} - -# we will look for config.local to override the above options -[ -s ./config.local ] && . ./config.local - -## Start by faking root install -echo "Faking root install..." -START=`pwd` -OPENSSHD_IN=`dirname $0`/opensshd.in -FAKE_ROOT=$START/package -[ -d $FAKE_ROOT ] && rm -fr $FAKE_ROOT -mkdir $FAKE_ROOT -${MAKE} install-nokeys DESTDIR=$FAKE_ROOT -if [ $? -gt 0 ] -then - echo "Fake root install failed, stopping." - exit 1 -fi - -## Fill in some details, like prefix and sysconfdir -for confvar in prefix exec_prefix bindir sbindir libexecdir datadir mandir sysconfdir piddir -do - eval $confvar=`grep "^$confvar=" Makefile | cut -d = -f 2` -done - - -## Collect value of privsep user -for confvar in SSH_PRIVSEP_USER -do - eval $confvar=`awk '/#define[ \t]'$confvar'/{print $3}' config.h` -done - -## Set privsep defaults if not defined -if [ -z "$SSH_PRIVSEP_USER" ] -then - SSH_PRIVSEP_USER=sshd -fi - -## Extract common info requires for the 'info' part of the package. -VERSION=`./ssh -V 2>&1 | sed -e 's/,.*//'` - -UNAME_S=`uname -s` -case ${UNAME_S} in - SunOS) UNAME_S=Solaris - ARCH=`uname -p` - RCS_D=yes - DEF_MSG="(default: n)" - ;; - *) ARCH=`uname -m` - DEF_MSG="\n" ;; -esac - -## Setup our run level stuff while we are at it. -mkdir -p $FAKE_ROOT${TEST_DIR}/etc/init.d - -## setup our initscript correctly -sed -e "s#%%configDir%%#${sysconfdir}#g" \ - -e "s#%%openSSHDir%%#$prefix#g" \ - -e "s#%%pidDir%%#${piddir}#g" \ - ${OPENSSHD_IN} > $FAKE_ROOT${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} -chmod 744 $FAKE_ROOT${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} - -[ "${PERMIT_ROOT_LOGIN}" = no ] && \ - perl -p -i -e "s/#PermitRootLogin yes/PermitRootLogin no/" \ - $FAKE_ROOT/${sysconfdir}/sshd_config -[ "${X11_FORWARDING}" = yes ] && \ - perl -p -i -e "s/#X11Forwarding no/X11Forwarding yes/" \ - $FAKE_ROOT/${sysconfdir}/sshd_config -# fix PrintMotd -perl -p -i -e "s/#PrintMotd yes/PrintMotd no/" \ - $FAKE_ROOT/${sysconfdir}/sshd_config - -# We don't want to overwrite config files on multiple installs -mv $FAKE_ROOT/${sysconfdir}/ssh_config $FAKE_ROOT/${sysconfdir}/ssh_config.default -mv $FAKE_ROOT/${sysconfdir}/sshd_config $FAKE_ROOT/${sysconfdir}/sshd_config.default -[ -f $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds ] && \ -mv $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds.default - -cd $FAKE_ROOT - -## Ok, this is outright wrong, but it will work. I'm tired of pkgmk -## whining. -for i in *; do - PROTO_ARGS="$PROTO_ARGS $i=/$i"; -done - -## Build info file -echo "Building pkginfo file..." -cat > pkginfo << _EOF -PKG=$PKGNAME -NAME="OpenSSH Portable for ${UNAME_S}" -DESC="Secure Shell remote access utility; replaces telnet and rlogin/rsh." -VENDOR="OpenSSH Portable Team - http://www.openssh.com/portable.html" -ARCH=$ARCH -VERSION=$VERSION -CATEGORY="Security,application" -BASEDIR=/ -CLASSES="none" -_EOF - -## Build preinstall file -echo "Building preinstall file..." -cat > preinstall << _EOF -#! /sbin/sh -# -[ "\${PRE_INS_STOP}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} stop -exit 0 -_EOF - -## Build postinstall file -echo "Building postinstall file..." -cat > postinstall << _EOF -#! /sbin/sh -# -[ -f \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_config ] || \\ - cp -p \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_config.default \\ - \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_config -[ -f \${PKG_INSTALL_ROOT}${sysconfdir}/sshd_config ] || \\ - cp -p \${PKG_INSTALL_ROOT}${sysconfdir}/sshd_config.default \\ - \${PKG_INSTALL_ROOT}${sysconfdir}/sshd_config -[ -f \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_prng_cmds.default ] && { - [ -f \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_prng_cmds ] || \\ - cp -p \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_prng_cmds.default \\ - \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_prng_cmds -} - -# make rc?.d dirs only if we are doing a test install -[ -n "${TEST_DIR}" ] && { - [ "$RCS_D" = yes ] && mkdir -p ${TEST_DIR}/etc/rcS.d - mkdir -p ${TEST_DIR}/etc/rc0.d - mkdir -p ${TEST_DIR}/etc/rc1.d - mkdir -p ${TEST_DIR}/etc/rc2.d -} - -if [ "\${USE_SYM_LINKS}" = yes ] -then - [ "$RCS_D" = yes ] && \ -installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/K30${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s - installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/K30${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s - installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/K30${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s - installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc2.d/S98${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s -else - [ "$RCS_D" = yes ] && \ -installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/K30${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l - installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/K30${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l - installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/K30${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l - installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc2.d/S98${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l -fi - -# If piddir doesn't exist we add it. (Ie. --with-pid-dir=/var/opt/ssh) -[ -d $piddir ] || installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR$piddir d 755 root sys - -installf -f ${PKGNAME} - -# Use chroot to handle PKG_INSTALL_ROOT -if [ ! -z "\${PKG_INSTALL_ROOT}" ] -then - chroot="chroot \${PKG_INSTALL_ROOT}" -fi -# If this is a test build, we will skip the groupadd/useradd/passwd commands -if [ ! -z "${TEST_DIR}" ] -then - chroot=echo -fi - -if egrep '^[ \t]*UsePrivilegeSeparation[ \t]+no' \${PKG_INSTALL_ROOT}/$sysconfdir/sshd_config >/dev/null -then - echo "UsePrivilegeSeparation disabled in config, not creating PrivSep user" - echo "or group." -else - echo "UsePrivilegeSeparation enabled in config (or defaulting to on)." - - # create group if required - if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/group | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null - then - echo "PrivSep group $SSH_PRIVSEP_USER already exists." - else - # Use gid of 67 if possible - if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/group | egrep '^'$SSHDGID'\$' >/dev/null - then - : - else - sshdgid="-g $SSHDGID" - fi - echo "Creating PrivSep group $SSH_PRIVSEP_USER." - \$chroot /usr/sbin/groupadd \$sshdgid $SSH_PRIVSEP_USER - fi - - # Create user if required - if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null - then - echo "PrivSep user $SSH_PRIVSEP_USER already exists." - else - # Use uid of 67 if possible - if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSHDGID'\$' >/dev/null - then - : - else - sshduid="-u $SSHDUID" - fi - echo "Creating PrivSep user $SSH_PRIVSEP_USER." - \$chroot /usr/sbin/useradd -c 'SSHD PrivSep User' -s /bin/false -g $SSH_PRIVSEP_USER \$sshduid $SSH_PRIVSEP_USER - \$chroot /usr/bin/passwd -l $SSH_PRIVSEP_USER - fi -fi - -[ "\${POST_INS_START}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start -exit 0 -_EOF - -## Build preremove file -echo "Building preremove file..." -cat > preremove << _EOF -#! /sbin/sh -# -${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} stop -exit 0 -_EOF - -## Build request file -echo "Building request file..." -cat > request << _EOF -trap 'exit 3' 15 -USE_SYM_LINKS=no -PRE_INS_STOP=no -POST_INS_START=no -# Use symbolic links? -ans=\`ckyorn -d n \ --p "Do you want symbolic links for the start/stop scripts? ${DEF_MSG}"\` || exit \$? -case \$ans in - [y,Y]*) USE_SYM_LINKS=yes ;; -esac - -# determine if should restart the daemon -if [ -s ${piddir}/sshd.pid -a -f ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} ] -then - ans=\`ckyorn -d n \ --p "Should the running sshd daemon be restarted? ${DEF_MSG}"\` || exit \$? - case \$ans in - [y,Y]*) PRE_INS_STOP=yes - POST_INS_START=yes - ;; - esac - -else - -# determine if we should start sshd - ans=\`ckyorn -d n \ --p "Start the sshd daemon after installing this package? ${DEF_MSG}"\` || exit \$? - case \$ans in - [y,Y]*) POST_INS_START=yes ;; - esac -fi - -# make parameters available to installation service, -# and so to any other packaging scripts -cat >\$1 < space << _EOF -# extra space required by start/stop links added by installf in postinstall -$TEST_DIR/etc/rc0.d/K30${SYSVINIT_NAME} 0 1 -$TEST_DIR/etc/rc1.d/K30${SYSVINIT_NAME} 0 1 -$TEST_DIR/etc/rc2.d/S98${SYSVINIT_NAME} 0 1 -_EOF -[ "$RCS_D" = yes ] && \ -echo "$TEST_DIR/etc/rcS.d/K30${SYSVINIT_NAME} 0 1" >> space - -## Next Build our prototype -echo "Building prototype file..." -cat >mk-proto.awk << _EOF - BEGIN { print "i pkginfo"; print "i preinstall"; \\ - print "i postinstall"; print "i preremove"; \\ - print "i request"; print "i space"; \\ - split("$SYSTEM_DIR",sys_files); } - { - for (dir in sys_files) { if ( \$3 != sys_files[dir] ) - { \$5="root"; \$6="sys"; } - else - { \$4="?"; \$5="?"; \$6="?"; break;} - } } - { print; } -_EOF -find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \ - pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype - -# /usr/local is a symlink on some systems -[ "${USR_LOCAL_IS_SYMLINK}" = yes ] && { - grep -v "^d none /usr/local ? ? ?$" prototype > prototype.new - mv prototype.new prototype -} - -## Step back a directory and now build the package. -echo "Building package.." -cd .. -pkgmk -d ${FAKE_ROOT} -f $FAKE_ROOT/prototype -o -echo | pkgtrans -os ${FAKE_ROOT} ${START}/$PKGNAME-$UNAME_S-$ARCH-$VERSION.pkg -rm -rf $FAKE_ROOT - diff --git a/crypto/openssh/contrib/solaris/opensshd.in b/crypto/openssh/contrib/solaris/opensshd.in deleted file mode 100755 index 50e18de..0000000 --- a/crypto/openssh/contrib/solaris/opensshd.in +++ /dev/null @@ -1,82 +0,0 @@ -#!/sbin/sh -# Donated code that was put under PD license. -# -# Stripped PRNGd out of it for the time being. - -umask 022 - -CAT=/usr/bin/cat -KILL=/usr/bin/kill - -prefix=%%openSSHDir%% -etcdir=%%configDir%% -piddir=%%pidDir%% - -SSHD=$prefix/sbin/sshd -PIDFILE=$piddir/sshd.pid -SSH_KEYGEN=$prefix/bin/ssh-keygen -HOST_KEY_RSA1=$etcdir/ssh_host_key -HOST_KEY_DSA=$etcdir/ssh_host_dsa_key -HOST_KEY_RSA=$etcdir/ssh_host_rsa_key - - -checkkeys() { - if [ ! -f $HOST_KEY_RSA1 ]; then - ${SSH_KEYGEN} -t rsa1 -f ${HOST_KEY_RSA1} -N "" - fi - if [ ! -f $HOST_KEY_DSA ]; then - ${SSH_KEYGEN} -t dsa -f ${HOST_KEY_DSA} -N "" - fi - if [ ! -f $HOST_KEY_RSA ]; then - ${SSH_KEYGEN} -t rsa -f ${HOST_KEY_RSA} -N "" - fi -} - -stop_service() { - if [ -r $PIDFILE -a ! -z ${PIDFILE} ]; then - PID=`${CAT} ${PIDFILE}` - fi - if [ ${PID:=0} -gt 1 -a ! "X$PID" = "X " ]; then - ${KILL} ${PID} - else - echo "Unable to read PID file" - fi -} - -start_service() { - # XXX We really should check if the service is already going, but - # XXX we will opt out at this time. - Bal - - # Check to see if we have keys that need to be made - checkkeys - - # Start SSHD - echo "starting $SSHD... \c" ; $SSHD - - sshd_rc=$? - if [ $sshd_rc -ne 0 ]; then - echo "$0: Error ${sshd_rc} starting ${SSHD}... bailing." - exit $sshd_rc - fi - echo done. -} - -case $1 in - -'start') - start_service - ;; - -'stop') - stop_service - ;; - -'restart') - stop_service - start_service - ;; - -*) - echo "$0: usage: $0 {start|stop|restart}" - ;; -esac diff --git a/crypto/openssh/contrib/ssh-copy-id b/crypto/openssh/contrib/ssh-copy-id deleted file mode 100644 index a1c0a92..0000000 --- a/crypto/openssh/contrib/ssh-copy-id +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -# Shell script to install your identity.pub on a remote machine -# Takes the remote machine name as an argument. -# Obviously, the remote machine must accept password authentication, -# or one of the other keys in your ssh-agent, for this to work. - -ID_FILE="${HOME}/.ssh/identity.pub" - -if [ "-i" = "$1" ]; then - shift - # check if we have 2 parameters left, if so the first is the new ID file - if [ -n "$2" ]; then - if expr "$1" : ".*\.pub" ; then - ID_FILE="$1" - else - ID_FILE="$1.pub" - fi - shift # and this should leave $1 as the target name - fi -else - if [ x$SSH_AUTH_SOCK != x ] ; then - GET_ID="$GET_ID ssh-add -L" - fi -fi - -if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then - GET_ID="cat ${ID_FILE}" -fi - -if [ -z "`eval $GET_ID`" ]; then - echo "$0: ERROR: No identities found" >&2 - exit 1 -fi - -if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then - echo "Usage: $0 [-i [identity_file]] [user@]machine" >&2 - exit 1 -fi - -{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1 - -cat < - -Permission is granted to make and distribute verbatim copies of -this manual provided the copyright notice and this permission notice -are preserved on all copies. - -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided that the -entire resulting derived work is distributed under the terms of a -permission notice identical to this one. - -Permission is granted to copy and distribute translations of this -manual into another language, under the above conditions for modified -versions, except that this permission notice may be included in -translations approved by the Free Software Foundation instead of in -the original English. -.. -.TH SSH-COPY-ID 1 "14 November 1999" "OpenSSH" -.SH NAME -ssh-copy-id \- install your identity.pub in a remote machine's authorized_keys -.SH SYNOPSIS -.B ssh-copy-id [-i [identity_file]] -.I "[user@]machine" -.br -.SH DESCRIPTION -.BR ssh-copy-id -is a script that uses ssh to log into a remote machine (presumably -using a login password, so password authentication should be enabled, -unless you've done some clever use of multiple identities) -.PP -It also changes the permissions of the remote user's home, -.BR ~/.ssh , -and -.B ~/.ssh/authorized_keys -to remove group writability (which would otherwise prevent you from logging in, if the remote -.B sshd -has -.B StrictModes -set in its configuration). -.PP -If the -.B -i -option is given then the identity file (defaults to -.BR ~/.ssh/identity.pub ) -is used, regardless of whether there are any keys in your -.BR ssh-agent . -Otherwise, if this: -.PP -.B " ssh-add -L" -.PP -provides any output, it uses that in preference to the identity file. -.PP -If the -.B -i -option is used, or the -.B ssh-add -produced no output, then it uses the contents of the identity -file. Once it has one or more fingerprints (by whatever means) it -uses ssh to append them to -.B ~/.ssh/authorized_keys -on the remote machine (creating the file, and directory, if necessary) - -.SH "SEE ALSO" -.BR ssh (1), -.BR ssh-agent (1), -.BR sshd (8) diff --git a/crypto/openssh/contrib/sshd.pam.freebsd b/crypto/openssh/contrib/sshd.pam.freebsd deleted file mode 100644 index c0bc364..0000000 --- a/crypto/openssh/contrib/sshd.pam.freebsd +++ /dev/null @@ -1,5 +0,0 @@ -sshd auth required pam_unix.so try_first_pass -sshd account required pam_unix.so -sshd password required pam_permit.so -sshd session required pam_permit.so - diff --git a/crypto/openssh/contrib/sshd.pam.generic b/crypto/openssh/contrib/sshd.pam.generic deleted file mode 100644 index cf5af30..0000000 --- a/crypto/openssh/contrib/sshd.pam.generic +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth required /lib/security/pam_unix.so shadow nodelay -auth required /lib/security/pam_nologin.so -account required /lib/security/pam_unix.so -password required /lib/security/pam_cracklib.so -password required /lib/security/pam_unix.so shadow nullok use_authtok -session required /lib/security/pam_unix.so -session required /lib/security/pam_limits.so diff --git a/crypto/openssh/contrib/suse/openssh.spec b/crypto/openssh/contrib/suse/openssh.spec deleted file mode 100644 index 2b43d03..0000000 --- a/crypto/openssh/contrib/suse/openssh.spec +++ /dev/null @@ -1,199 +0,0 @@ -Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation -Name: openssh -Version: 3.8.1p1 -URL: http://www.openssh.com/ -Release: 1 -Source0: openssh-%{version}.tar.gz -Copyright: BSD -Group: Applications/Internet -BuildRoot: /tmp/openssh-%{version}-buildroot -PreReq: openssl -Obsoletes: ssh -# -# (Build[ing] Prereq[uisites] only work for RPM 2.95 and newer.) -# building prerequisites -- stuff for -# OpenSSL (openssl-devel), -# TCP Wrappers (nkitb), -# and Gnome (glibdev, gtkdev, and gnlibsd) -# -BuildPrereq: openssl -BuildPrereq: nkitb -BuildPrereq: glibdev -BuildPrereq: gtkdev -BuildPrereq: gnlibsd - -%description -Ssh (Secure Shell) a program for logging into a remote machine and for -executing commands in a remote machine. It is intended to replace -rlogin and rsh, and provide secure encrypted communications between -two untrusted hosts over an insecure network. X11 connections and -arbitrary TCP/IP ports can also be forwarded over the secure channel. - -OpenSSH is OpenBSD's rework of the last free version of SSH, bringing it -up to date in terms of security and features, as well as removing all -patented algorithms to seperate libraries (OpenSSL). - -This package includes all files necessary for both the OpenSSH -client and server. Additionally, this package contains the GNOME -passphrase dialog. - -%changelog -* Mon Jun 12 2000 Damien Miller -- Glob manpages to catch compressed files -* Wed Mar 15 2000 Damien Miller -- Updated for new location -- Updated for new gnome-ssh-askpass build -* Sun Dec 26 1999 Chris Saia -- Made symlink to gnome-ssh-askpass called ssh-askpass -* Wed Nov 24 1999 Chris Saia -- Removed patches that included /etc/pam.d/sshd, /sbin/init.d/rc.sshd, and - /var/adm/fillup-templates/rc.config.sshd, since Damien merged these into - his released tarfile -- Changed permissions on ssh_config in the install procedure to 644 from 600 - even though it was correct in the %files section and thus right in the RPMs -- Postinstall script for the server now only prints "Generating SSH host - key..." if we need to actually do this, in order to eliminate a confusing - message if an SSH host key is already in place -- Marked all manual pages as %doc(umentation) -* Mon Nov 22 1999 Chris Saia -- Added flag to configure daemon with TCP Wrappers support -- Added building prerequisites (works in RPM 3.0 and newer) -* Thu Nov 18 1999 Chris Saia -- Made this package correct for SuSE. -- Changed instances of pam_pwdb.so to pam_unix.so, since it works more properly - with SuSE, and lib_pwdb.so isn't installed by default. -* Mon Nov 15 1999 Damien Miller -- Split subpackages further based on patch from jim knoble -* Sat Nov 13 1999 Damien Miller -- Added 'Obsoletes' directives -* Tue Nov 09 1999 Damien Miller -- Use make install -- Subpackages -* Mon Nov 08 1999 Damien Miller -- Added links for slogin -- Fixed perms on manpages -* Sat Oct 30 1999 Damien Miller -- Renamed init script -* Fri Oct 29 1999 Damien Miller -- Back to old binary names -* Thu Oct 28 1999 Damien Miller -- Use autoconf -- New binary names -* Wed Oct 27 1999 Damien Miller -- Initial RPMification, based on Jan "Yenya" Kasprzak's spec. - -%prep - -%setup -q - -%build -CFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=/usr \ - --sysconfdir=/etc/ssh \ - --datadir=/usr/share/openssh \ - --with-pam \ - --with-gnome-askpass \ - --with-tcp-wrappers \ - --with-ipv4-default \ - --libexecdir=/usr/lib/ssh -make - -cd contrib -gcc -O -g `gnome-config --cflags gnome gnomeui` \ - gnome-ssh-askpass.c -o gnome-ssh-askpass \ - `gnome-config --libs gnome gnomeui` -cd .. - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT/ -install -d $RPM_BUILD_ROOT/etc/ssh/ -install -d $RPM_BUILD_ROOT/etc/pam.d/ -install -d $RPM_BUILD_ROOT/sbin/init.d/ -install -d $RPM_BUILD_ROOT/var/adm/fillup-templates -install -d $RPM_BUILD_ROOT/usr/lib/ssh -install -m644 contrib/sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd -install -m744 contrib/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd -ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd -install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/lib/ssh/gnome-ssh-askpass -ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/lib/ssh/ssh-askpass -install -m744 contrib/suse/rc.config.sshd \ - $RPM_BUILD_ROOT/var/adm/fillup-templates - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -if [ "$1" = 1 ]; then - echo "Creating SSH stop/start scripts in the rc directories..." - ln -s ../sshd /sbin/init.d/rc2.d/K20sshd - ln -s ../sshd /sbin/init.d/rc2.d/S20sshd - ln -s ../sshd /sbin/init.d/rc3.d/K20sshd - ln -s ../sshd /sbin/init.d/rc3.d/S20sshd -fi -echo "Updating /etc/rc.config..." -if [ -x /bin/fillup ] ; then - /bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.sshd -else - echo "ERROR: fillup not found. This should NOT happen in SuSE Linux." - echo "Update /etc/rc.config by hand from the following template file:" - echo " /var/adm/fillup-templates/rc.config.sshd" -fi -if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then - echo "Generating SSH host key..." - /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2 -fi -if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then - echo "Generating SSH DSA host key..." - /usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' >&2 -fi -if test -r /var/run/sshd.pid -then - echo "Restarting the running SSH daemon..." - /usr/sbin/rcsshd restart >&2 -fi - -%preun -if [ "$1" = 0 ] -then - echo "Stopping the SSH daemon..." - /usr/sbin/rcsshd stop >&2 - echo "Removing SSH stop/start scripts from the rc directories..." - rm /sbin/init.d/rc2.d/K20sshd - rm /sbin/init.d/rc2.d/S20sshd - rm /sbin/init.d/rc3.d/K20sshd - rm /sbin/init.d/rc3.d/S20sshd -fi - -%files -%defattr(-,root,root) -%doc ChangeLog OVERVIEW README* -%doc RFC.nroff TODO CREDITS LICENCE -%attr(0755,root,root) %dir /etc/ssh -%attr(0644,root,root) %config /etc/ssh/ssh_config -%attr(0600,root,root) %config /etc/ssh/sshd_config -%attr(0600,root,root) %config /etc/ssh/moduli -%attr(0644,root,root) %config /etc/pam.d/sshd -%attr(0755,root,root) %config /sbin/init.d/sshd -%attr(0755,root,root) /usr/bin/ssh-keygen -%attr(0755,root,root) /usr/bin/scp -%attr(4755,root,root) /usr/bin/ssh -%attr(-,root,root) /usr/bin/slogin -%attr(0755,root,root) /usr/bin/ssh-agent -%attr(0755,root,root) /usr/bin/ssh-add -%attr(0755,root,root) /usr/bin/ssh-keyscan -%attr(0755,root,root) /usr/bin/sftp -%attr(0755,root,root) /usr/sbin/sshd -%attr(-,root,root) /usr/sbin/rcsshd -%attr(0755,root,root) %dir /usr/lib/ssh -%attr(0755,root,root) /usr/lib/ssh/ssh-askpass -%attr(0755,root,root) /usr/lib/ssh/gnome-ssh-askpass -%attr(0644,root,root) %doc /usr/man/man1/scp.1* -%attr(0644,root,root) %doc /usr/man/man1/ssh.1* -%attr(-,root,root) %doc /usr/man/man1/slogin.1* -%attr(0644,root,root) %doc /usr/man/man1/ssh-agent.1* -%attr(0644,root,root) %doc /usr/man/man1/ssh-add.1* -%attr(0644,root,root) %doc /usr/man/man1/ssh-keygen.1* -%attr(0644,root,root) %doc /usr/man/man8/sshd.8* -%attr(0644,root,root) /var/adm/fillup-templates/rc.config.sshd - diff --git a/crypto/openssh/contrib/suse/rc.config.sshd b/crypto/openssh/contrib/suse/rc.config.sshd deleted file mode 100644 index baaa7a5..0000000 --- a/crypto/openssh/contrib/suse/rc.config.sshd +++ /dev/null @@ -1,5 +0,0 @@ -# -# Start the Secure Shell (SSH) Daemon? -# -START_SSHD="yes" - diff --git a/crypto/openssh/contrib/suse/rc.sshd b/crypto/openssh/contrib/suse/rc.sshd deleted file mode 100644 index f7d431e..0000000 --- a/crypto/openssh/contrib/suse/rc.sshd +++ /dev/null @@ -1,80 +0,0 @@ -#! /bin/sh -# Copyright (c) 1995-1998 SuSE GmbH Nuernberg, Germany. -# -# Author: Chris Saia -# -# /sbin/init.d/sshd -# -# and symbolic its link -# -# /sbin/rcsshd -# - -. /etc/rc.config - -# Determine the base and follow a runlevel link name. -base=${0##*/} -link=${base#*[SK][0-9][0-9]} - -# Force execution if not called by a runlevel directory. -test $link = $base && START_SSHD=yes -test "$START_SSHD" = yes || exit 0 - -# The echo return value for success (defined in /etc/rc.config). -return=$rc_done -case "$1" in - start) - echo -n "Starting service sshd" - ## Start daemon with startproc(8). If this fails - ## the echo return value is set appropriate. - - startproc /usr/sbin/sshd || return=$rc_failed - - echo -e "$return" - ;; - stop) - echo -n "Stopping service sshd" - ## Stop daemon with killproc(8) and if this fails - ## set echo the echo return value. - - killproc -TERM /usr/sbin/sshd || return=$rc_failed - - echo -e "$return" - ;; - restart) - ## If first returns OK call the second, if first or - ## second command fails, set echo return value. - $0 stop && $0 start || return=$rc_failed - ;; - reload) - ## Choose ONE of the following two cases: - - ## First possibility: A few services accepts a signal - ## to reread the (changed) configuration. - - echo -n "Reload service sshd" - killproc -HUP /usr/sbin/sshd || return=$rc_failed - echo -e "$return" - ;; - status) - echo -n "Checking for service sshd" - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. - - checkproc /usr/sbin/sshd && echo OK || echo No process - ;; - probe) - ## Optional: Probe for the necessity of a reload, - ## give out the argument which is required for a reload. - - test /etc/ssh/sshd_config -nt /var/run/sshd.pid && echo reload - ;; - *) - echo "Usage: $0 {start|stop|status|restart|reload[|probe]}" - exit 1 - ;; -esac - -# Inform the caller not only verbosely and set an exit status. -test "$return" = "$rc_done" || exit 1 -exit 0 diff --git a/crypto/openssh/envpass.sh b/crypto/openssh/envpass.sh deleted file mode 100644 index 67044d4..0000000 --- a/crypto/openssh/envpass.sh +++ /dev/null @@ -1,44 +0,0 @@ -# $OpenBSD: envpass.sh,v 1.1 2004/04/27 09:47:30 djm Exp $ -# Placed in the Public Domain. - -tid="environment passing" - -# NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST) - -trace "pass env, don't accept" -verbose "test $tid: pass env, don't accept" -_TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \ - '[ -z "$_TEST_ENV" ]' -r=$? -if [ $r -ne 0 ]; then - fail "environment found" -fi - -trace "don't pass env, accept" -verbose "test $tid: don't pass env, accept" -${SSH} -F $OBJ/ssh_proxy otherhost \ - '[ -z "$_XXX_TEST_A" -a -z "$_XXX_TEST_B" ]' -r=$? -if [ $r -ne 0 ]; then - fail "environment found" -fi - -trace "pass single env, accept single env" -verbose "test $tid: pass single env, accept single env" -_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \ - '[ "x$_XXX_TEST" = "xblah" ]' -r=$? -if [ $r -ne 0 ]; then - fail "environment not found" -fi - -trace "pass multiple env, accept multiple env" -verbose "test $tid: pass multiple env, accept multiple env" -_XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \ - -F $OBJ/ssh_proxy otherhost \ - '[ "x$_XXX_TEST_A" = "x1" -a "x$_XXX_TEST_B" = "x2" ]' -r=$? -if [ $r -ne 0 ]; then - fail "environment not found" -fi - diff --git a/crypto/openssh/getput.h b/crypto/openssh/getput.h deleted file mode 100644 index 20cf8f2..0000000 --- a/crypto/openssh/getput.h +++ /dev/null @@ -1,58 +0,0 @@ -/* $OpenBSD: getput.h,v 1.8 2002/03/04 17:27:39 stevesk Exp $ */ - -/* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - * All rights reserved - * Macros for storing and retrieving data in msb first and lsb first order. - * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". - */ - -#ifndef GETPUT_H -#define GETPUT_H - -/*------------ macros for storing/extracting msb first words -------------*/ - -#define GET_64BIT(cp) (((u_int64_t)(u_char)(cp)[0] << 56) | \ - ((u_int64_t)(u_char)(cp)[1] << 48) | \ - ((u_int64_t)(u_char)(cp)[2] << 40) | \ - ((u_int64_t)(u_char)(cp)[3] << 32) | \ - ((u_int64_t)(u_char)(cp)[4] << 24) | \ - ((u_int64_t)(u_char)(cp)[5] << 16) | \ - ((u_int64_t)(u_char)(cp)[6] << 8) | \ - ((u_int64_t)(u_char)(cp)[7])) - -#define GET_32BIT(cp) (((u_long)(u_char)(cp)[0] << 24) | \ - ((u_long)(u_char)(cp)[1] << 16) | \ - ((u_long)(u_char)(cp)[2] << 8) | \ - ((u_long)(u_char)(cp)[3])) - -#define GET_16BIT(cp) (((u_long)(u_char)(cp)[0] << 8) | \ - ((u_long)(u_char)(cp)[1])) - -#define PUT_64BIT(cp, value) do { \ - (cp)[0] = (value) >> 56; \ - (cp)[1] = (value) >> 48; \ - (cp)[2] = (value) >> 40; \ - (cp)[3] = (value) >> 32; \ - (cp)[4] = (value) >> 24; \ - (cp)[5] = (value) >> 16; \ - (cp)[6] = (value) >> 8; \ - (cp)[7] = (value); } while (0) - -#define PUT_32BIT(cp, value) do { \ - (cp)[0] = (value) >> 24; \ - (cp)[1] = (value) >> 16; \ - (cp)[2] = (value) >> 8; \ - (cp)[3] = (value); } while (0) - -#define PUT_16BIT(cp, value) do { \ - (cp)[0] = (value) >> 8; \ - (cp)[1] = (value); } while (0) - -#endif /* GETPUT_H */ diff --git a/crypto/openssh/moduli.h b/crypto/openssh/moduli.h deleted file mode 100644 index 9cd1cd3..0000000 --- a/crypto/openssh/moduli.h +++ /dev/null @@ -1,23 +0,0 @@ -/* $OpenBSD: moduli.h,v 1.1 2003/07/28 09:49:56 djm Exp $ */ - -#include -#include - -/* - * Using virtual memory can cause thrashing. This should be the largest - * number that is supported without a large amount of disk activity -- - * that would increase the run time from hours to days or weeks! - */ -#define LARGE_MINIMUM (8UL) /* megabytes */ - -/* - * Do not increase this number beyond the unsigned integer bit size. - * Due to a multiple of 4, it must be LESS than 128 (yielding 2**30 bits). - */ -#define LARGE_MAXIMUM (127UL) /* megabytes */ - -/* Minimum number of primality tests to perform */ -#define TRIAL_MINIMUM (4) - -int gen_candidates(FILE *, int, int, BIGNUM *); -int prime_test(FILE *, FILE *, u_int32_t, u_int32_t); diff --git a/crypto/openssh/mpaux.c b/crypto/openssh/mpaux.c deleted file mode 100644 index 0c48627..0000000 --- a/crypto/openssh/mpaux.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - * All rights reserved - * This file contains various auxiliary functions related to multiple - * precision integers. - * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". - */ - -#include "includes.h" -RCSID("$OpenBSD: mpaux.c,v 1.16 2001/02/08 19:30:52 itojun Exp $"); - -#include -#include "getput.h" -#include "xmalloc.h" - -#include - -#include "mpaux.h" - -void -compute_session_id(u_char session_id[16], - u_char cookie[8], - BIGNUM* host_key_n, - BIGNUM* session_key_n) -{ - u_int host_key_bytes = BN_num_bytes(host_key_n); - u_int session_key_bytes = BN_num_bytes(session_key_n); - u_int bytes = host_key_bytes + session_key_bytes; - u_char *buf = xmalloc(bytes); - MD5_CTX md; - - BN_bn2bin(host_key_n, buf); - BN_bn2bin(session_key_n, buf + host_key_bytes); - MD5_Init(&md); - MD5_Update(&md, buf, bytes); - MD5_Update(&md, cookie, 8); - MD5_Final(session_id, &md); - memset(buf, 0, bytes); - xfree(buf); -} diff --git a/crypto/openssh/mpaux.h b/crypto/openssh/mpaux.h deleted file mode 100644 index 2a312f5..0000000 --- a/crypto/openssh/mpaux.h +++ /dev/null @@ -1,22 +0,0 @@ -/* $OpenBSD: mpaux.h,v 1.12 2002/03/04 17:27:39 stevesk Exp $ */ - -/* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - * All rights reserved - * This file contains various auxiliary functions related to multiple - * precision integers. - * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". - */ - -#ifndef MPAUX_H -#define MPAUX_H - -void compute_session_id(u_char[16], u_char[8], BIGNUM *, BIGNUM *); - -#endif /* MPAUX_H */ diff --git a/crypto/openssh/openbsd-compat/.cvsignore b/crypto/openssh/openbsd-compat/.cvsignore deleted file mode 100644 index f3c7a7c..0000000 --- a/crypto/openssh/openbsd-compat/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/crypto/openssh/readpass.h b/crypto/openssh/readpass.h deleted file mode 100644 index a45d32f..0000000 --- a/crypto/openssh/readpass.h +++ /dev/null @@ -1,19 +0,0 @@ -/* $OpenBSD: readpass.h,v 1.7 2002/03/26 15:58:46 markus Exp $ */ - -/* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - * All rights reserved - * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". - */ - -#define RP_ECHO 0x0001 -#define RP_ALLOW_STDIN 0x0002 -#define RP_ALLOW_EOF 0x0004 - -char *read_passphrase(const char *, int); diff --git a/crypto/openssh/scard/.cvsignore b/crypto/openssh/scard/.cvsignore deleted file mode 100644 index 5349d34..0000000 --- a/crypto/openssh/scard/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Ssh.bin diff --git a/crypto/openssh/sftp-glob.h b/crypto/openssh/sftp-glob.h deleted file mode 100644 index f879e87..0000000 --- a/crypto/openssh/sftp-glob.h +++ /dev/null @@ -1,37 +0,0 @@ -/* $OpenBSD: sftp-glob.h,v 1.8 2002/09/11 22:41:50 djm Exp $ */ - -/* - * Copyright (c) 2001,2002 Damien Miller. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* Remote sftp filename globbing */ - -#ifndef _SFTP_GLOB_H -#define _SFTP_GLOB_H - -#include "sftp-client.h" - -int remote_glob(struct sftp_conn *, const char *, int, - int (*)(const char *, int), glob_t *); - -#endif diff --git a/crypto/openssh/sftp-int.c b/crypto/openssh/sftp-int.c deleted file mode 100644 index c93eaab..0000000 --- a/crypto/openssh/sftp-int.c +++ /dev/null @@ -1,1191 +0,0 @@ -/* - * Copyright (c) 2001,2002 Damien Miller. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* XXX: recursive operations */ - -#include "includes.h" -RCSID("$OpenBSD: sftp-int.c,v 1.62 2003/08/25 08:13:09 fgsch Exp $"); - -#include "buffer.h" -#include "xmalloc.h" -#include "log.h" -#include "pathnames.h" - -#include "sftp.h" -#include "sftp-common.h" -#include "sftp-glob.h" -#include "sftp-client.h" -#include "sftp-int.h" - -/* File to read commands from */ -extern FILE *infile; - -/* Size of buffer used when copying files */ -extern size_t copy_buffer_len; - -/* Number of concurrent outstanding requests */ -extern int num_requests; - -/* This is set to 0 if the progressmeter is not desired. */ -int showprogress = 1; - -/* Seperators for interactive commands */ -#define WHITESPACE " \t\r\n" - -/* Define what type of ls view (0 - multi-column) */ -#define LONG_VIEW 1 /* Full view ala ls -l */ -#define SHORT_VIEW 2 /* Single row view ala ls -1 */ - -/* Commands for interactive mode */ -#define I_CHDIR 1 -#define I_CHGRP 2 -#define I_CHMOD 3 -#define I_CHOWN 4 -#define I_GET 5 -#define I_HELP 6 -#define I_LCHDIR 7 -#define I_LLS 8 -#define I_LMKDIR 9 -#define I_LPWD 10 -#define I_LS 11 -#define I_LUMASK 12 -#define I_MKDIR 13 -#define I_PUT 14 -#define I_PWD 15 -#define I_QUIT 16 -#define I_RENAME 17 -#define I_RM 18 -#define I_RMDIR 19 -#define I_SHELL 20 -#define I_SYMLINK 21 -#define I_VERSION 22 -#define I_PROGRESS 23 - -struct CMD { - const char *c; - const int n; -}; - -static const struct CMD cmds[] = { - { "bye", I_QUIT }, - { "cd", I_CHDIR }, - { "chdir", I_CHDIR }, - { "chgrp", I_CHGRP }, - { "chmod", I_CHMOD }, - { "chown", I_CHOWN }, - { "dir", I_LS }, - { "exit", I_QUIT }, - { "get", I_GET }, - { "mget", I_GET }, - { "help", I_HELP }, - { "lcd", I_LCHDIR }, - { "lchdir", I_LCHDIR }, - { "lls", I_LLS }, - { "lmkdir", I_LMKDIR }, - { "ln", I_SYMLINK }, - { "lpwd", I_LPWD }, - { "ls", I_LS }, - { "lumask", I_LUMASK }, - { "mkdir", I_MKDIR }, - { "progress", I_PROGRESS }, - { "put", I_PUT }, - { "mput", I_PUT }, - { "pwd", I_PWD }, - { "quit", I_QUIT }, - { "rename", I_RENAME }, - { "rm", I_RM }, - { "rmdir", I_RMDIR }, - { "symlink", I_SYMLINK }, - { "version", I_VERSION }, - { "!", I_SHELL }, - { "?", I_HELP }, - { NULL, -1} -}; - -static void -help(void) -{ - printf("Available commands:\n"); - printf("cd path Change remote directory to 'path'\n"); - printf("lcd path Change local directory to 'path'\n"); - printf("chgrp grp path Change group of file 'path' to 'grp'\n"); - printf("chmod mode path Change permissions of file 'path' to 'mode'\n"); - printf("chown own path Change owner of file 'path' to 'own'\n"); - printf("help Display this help text\n"); - printf("get remote-path [local-path] Download file\n"); - printf("lls [ls-options [path]] Display local directory listing\n"); - printf("ln oldpath newpath Symlink remote file\n"); - printf("lmkdir path Create local directory\n"); - printf("lpwd Print local working directory\n"); - printf("ls [path] Display remote directory listing\n"); - printf("lumask umask Set local umask to 'umask'\n"); - printf("mkdir path Create remote directory\n"); - printf("progress Toggle display of progress meter\n"); - printf("put local-path [remote-path] Upload file\n"); - printf("pwd Display remote working directory\n"); - printf("exit Quit sftp\n"); - printf("quit Quit sftp\n"); - printf("rename oldpath newpath Rename remote file\n"); - printf("rmdir path Remove remote directory\n"); - printf("rm path Delete remote file\n"); - printf("symlink oldpath newpath Symlink remote file\n"); - printf("version Show SFTP version\n"); - printf("!command Execute 'command' in local shell\n"); - printf("! Escape to local shell\n"); - printf("? Synonym for help\n"); -} - -static void -local_do_shell(const char *args) -{ - int status; - char *shell; - pid_t pid; - - if (!*args) - args = NULL; - - if ((shell = getenv("SHELL")) == NULL) - shell = _PATH_BSHELL; - - if ((pid = fork()) == -1) - fatal("Couldn't fork: %s", strerror(errno)); - - if (pid == 0) { - /* XXX: child has pipe fds to ssh subproc open - issue? */ - if (args) { - debug3("Executing %s -c \"%s\"", shell, args); - execl(shell, shell, "-c", args, (char *)NULL); - } else { - debug3("Executing %s", shell); - execl(shell, shell, (char *)NULL); - } - fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell, - strerror(errno)); - _exit(1); - } - while (waitpid(pid, &status, 0) == -1) - if (errno != EINTR) - fatal("Couldn't wait for child: %s", strerror(errno)); - if (!WIFEXITED(status)) - error("Shell exited abormally"); - else if (WEXITSTATUS(status)) - error("Shell exited with status %d", WEXITSTATUS(status)); -} - -static void -local_do_ls(const char *args) -{ - if (!args || !*args) - local_do_shell(_PATH_LS); - else { - int len = strlen(_PATH_LS " ") + strlen(args) + 1; - char *buf = xmalloc(len); - - /* XXX: quoting - rip quoting code from ftp? */ - snprintf(buf, len, _PATH_LS " %s", args); - local_do_shell(buf); - xfree(buf); - } -} - -/* Strip one path (usually the pwd) from the start of another */ -static char * -path_strip(char *path, char *strip) -{ - size_t len; - - if (strip == NULL) - return (xstrdup(path)); - - len = strlen(strip); - if (strip != NULL && strncmp(path, strip, len) == 0) { - if (strip[len - 1] != '/' && path[len] == '/') - len++; - return (xstrdup(path + len)); - } - - return (xstrdup(path)); -} - -static char * -path_append(char *p1, char *p2) -{ - char *ret; - int len = strlen(p1) + strlen(p2) + 2; - - ret = xmalloc(len); - strlcpy(ret, p1, len); - if (p1[strlen(p1) - 1] != '/') - strlcat(ret, "/", len); - strlcat(ret, p2, len); - - return(ret); -} - -static char * -make_absolute(char *p, char *pwd) -{ - char *abs; - - /* Derelativise */ - if (p && p[0] != '/') { - abs = path_append(pwd, p); - xfree(p); - return(abs); - } else - return(p); -} - -static int -infer_path(const char *p, char **ifp) -{ - char *cp; - - cp = strrchr(p, '/'); - if (cp == NULL) { - *ifp = xstrdup(p); - return(0); - } - - if (!cp[1]) { - error("Invalid path"); - return(-1); - } - - *ifp = xstrdup(cp + 1); - return(0); -} - -static int -parse_getput_flags(const char **cpp, int *pflag) -{ - const char *cp = *cpp; - - /* Check for flags */ - if (cp[0] == '-' && cp[1] && strchr(WHITESPACE, cp[2])) { - switch (cp[1]) { - case 'p': - case 'P': - *pflag = 1; - break; - default: - error("Invalid flag -%c", cp[1]); - return(-1); - } - cp += 2; - *cpp = cp + strspn(cp, WHITESPACE); - } - - return(0); -} - -static int -parse_ls_flags(const char **cpp, int *lflag) -{ - const char *cp = *cpp; - - /* Check for flags */ - if (cp++[0] == '-') { - for(; strchr(WHITESPACE, *cp) == NULL; cp++) { - switch (*cp) { - case 'l': - *lflag = LONG_VIEW; - break; - case '1': - *lflag = SHORT_VIEW; - break; - default: - error("Invalid flag -%c", *cp); - return(-1); - } - } - *cpp = cp + strspn(cp, WHITESPACE); - } - - return(0); -} - -static int -get_pathname(const char **cpp, char **path) -{ - const char *cp = *cpp, *end; - char quot; - int i, j; - - cp += strspn(cp, WHITESPACE); - if (!*cp) { - *cpp = cp; - *path = NULL; - return (0); - } - - *path = xmalloc(strlen(cp) + 1); - - /* Check for quoted filenames */ - if (*cp == '\"' || *cp == '\'') { - quot = *cp++; - - /* Search for terminating quote, unescape some chars */ - for (i = j = 0; i <= strlen(cp); i++) { - if (cp[i] == quot) { /* Found quote */ - (*path)[j] = '\0'; - i++; - break; - } - if (cp[i] == '\0') { /* End of string */ - error("Unterminated quote"); - goto fail; - } - if (cp[i] == '\\') { /* Escaped characters */ - i++; - if (cp[i] != '\'' && cp[i] != '\"' && - cp[i] != '\\') { - error("Bad escaped character '\%c'", - cp[i]); - goto fail; - } - } - (*path)[j++] = cp[i]; - } - - if (j == 0) { - error("Empty quotes"); - goto fail; - } - *cpp = cp + i + strspn(cp + i, WHITESPACE); - } else { - /* Read to end of filename */ - end = strpbrk(cp, WHITESPACE); - if (end == NULL) - end = strchr(cp, '\0'); - *cpp = end + strspn(end, WHITESPACE); - - memcpy(*path, cp, end - cp); - (*path)[end - cp] = '\0'; - } - return (0); - - fail: - xfree(*path); - *path = NULL; - return (-1); -} - -static int -is_dir(char *path) -{ - struct stat sb; - - /* XXX: report errors? */ - if (stat(path, &sb) == -1) - return(0); - - return(sb.st_mode & S_IFDIR); -} - -static int -is_reg(char *path) -{ - struct stat sb; - - if (stat(path, &sb) == -1) - fatal("stat %s: %s", path, strerror(errno)); - - return(S_ISREG(sb.st_mode)); -} - -static int -remote_is_dir(struct sftp_conn *conn, char *path) -{ - Attrib *a; - - /* XXX: report errors? */ - if ((a = do_stat(conn, path, 1)) == NULL) - return(0); - if (!(a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS)) - return(0); - return(a->perm & S_IFDIR); -} - -static int -process_get(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag) -{ - char *abs_src = NULL; - char *abs_dst = NULL; - char *tmp; - glob_t g; - int err = 0; - int i; - - abs_src = xstrdup(src); - abs_src = make_absolute(abs_src, pwd); - - memset(&g, 0, sizeof(g)); - debug3("Looking up %s", abs_src); - if (remote_glob(conn, abs_src, 0, NULL, &g)) { - error("File \"%s\" not found.", abs_src); - err = -1; - goto out; - } - - /* If multiple matches, dst must be a directory or unspecified */ - if (g.gl_matchc > 1 && dst && !is_dir(dst)) { - error("Multiple files match, but \"%s\" is not a directory", - dst); - err = -1; - goto out; - } - - for (i = 0; g.gl_pathv[i]; i++) { - if (infer_path(g.gl_pathv[i], &tmp)) { - err = -1; - goto out; - } - - if (g.gl_matchc == 1 && dst) { - /* If directory specified, append filename */ - if (is_dir(dst)) { - if (infer_path(g.gl_pathv[0], &tmp)) { - err = 1; - goto out; - } - abs_dst = path_append(dst, tmp); - xfree(tmp); - } else - abs_dst = xstrdup(dst); - } else if (dst) { - abs_dst = path_append(dst, tmp); - xfree(tmp); - } else - abs_dst = tmp; - - printf("Fetching %s to %s\n", g.gl_pathv[i], abs_dst); - if (do_download(conn, g.gl_pathv[i], abs_dst, pflag) == -1) - err = -1; - xfree(abs_dst); - abs_dst = NULL; - } - -out: - xfree(abs_src); - if (abs_dst) - xfree(abs_dst); - globfree(&g); - return(err); -} - -static int -process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag) -{ - char *tmp_dst = NULL; - char *abs_dst = NULL; - char *tmp; - glob_t g; - int err = 0; - int i; - - if (dst) { - tmp_dst = xstrdup(dst); - tmp_dst = make_absolute(tmp_dst, pwd); - } - - memset(&g, 0, sizeof(g)); - debug3("Looking up %s", src); - if (glob(src, 0, NULL, &g)) { - error("File \"%s\" not found.", src); - err = -1; - goto out; - } - - /* If multiple matches, dst may be directory or unspecified */ - if (g.gl_matchc > 1 && tmp_dst && !remote_is_dir(conn, tmp_dst)) { - error("Multiple files match, but \"%s\" is not a directory", - tmp_dst); - err = -1; - goto out; - } - - for (i = 0; g.gl_pathv[i]; i++) { - if (!is_reg(g.gl_pathv[i])) { - error("skipping non-regular file %s", - g.gl_pathv[i]); - continue; - } - if (infer_path(g.gl_pathv[i], &tmp)) { - err = -1; - goto out; - } - - if (g.gl_matchc == 1 && tmp_dst) { - /* If directory specified, append filename */ - if (remote_is_dir(conn, tmp_dst)) { - if (infer_path(g.gl_pathv[0], &tmp)) { - err = 1; - goto out; - } - abs_dst = path_append(tmp_dst, tmp); - xfree(tmp); - } else - abs_dst = xstrdup(tmp_dst); - - } else if (tmp_dst) { - abs_dst = path_append(tmp_dst, tmp); - xfree(tmp); - } else - abs_dst = make_absolute(tmp, pwd); - - printf("Uploading %s to %s\n", g.gl_pathv[i], abs_dst); - if (do_upload(conn, g.gl_pathv[i], abs_dst, pflag) == -1) - err = -1; - } - -out: - if (abs_dst) - xfree(abs_dst); - if (tmp_dst) - xfree(tmp_dst); - globfree(&g); - return(err); -} - -static int -sdirent_comp(const void *aa, const void *bb) -{ - SFTP_DIRENT *a = *(SFTP_DIRENT **)aa; - SFTP_DIRENT *b = *(SFTP_DIRENT **)bb; - - return (strcmp(a->filename, b->filename)); -} - -/* sftp ls.1 replacement for directories */ -static int -do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag) -{ - int n, c = 1, colspace = 0, columns = 1; - SFTP_DIRENT **d; - - if ((n = do_readdir(conn, path, &d)) != 0) - return (n); - - if (!(lflag & SHORT_VIEW)) { - int m = 0, width = 80; - struct winsize ws; - - /* Count entries for sort and find longest filename */ - for (n = 0; d[n] != NULL; n++) - m = MAX(m, strlen(d[n]->filename)); - - if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) != -1) - width = ws.ws_col; - - columns = width / (m + 2); - columns = MAX(columns, 1); - colspace = width / columns; - } - - qsort(d, n, sizeof(*d), sdirent_comp); - - for (n = 0; d[n] != NULL; n++) { - char *tmp, *fname; - - tmp = path_append(path, d[n]->filename); - fname = path_strip(tmp, strip_path); - xfree(tmp); - - if (lflag & LONG_VIEW) { - char *lname; - struct stat sb; - - memset(&sb, 0, sizeof(sb)); - attrib_to_stat(&d[n]->a, &sb); - lname = ls_file(fname, &sb, 1); - printf("%s\n", lname); - xfree(lname); - } else { - printf("%-*s", colspace, fname); - if (c >= columns) { - printf("\n"); - c = 1; - } else - c++; - } - - xfree(fname); - } - - if (!(lflag & LONG_VIEW) && (c != 1)) - printf("\n"); - - free_sftp_dirents(d); - return (0); -} - -/* sftp ls.1 replacement which handles path globs */ -static int -do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path, - int lflag) -{ - glob_t g; - int i, c = 1, colspace = 0, columns = 1; - Attrib *a; - - memset(&g, 0, sizeof(g)); - - if (remote_glob(conn, path, GLOB_MARK|GLOB_NOCHECK|GLOB_BRACE, - NULL, &g)) { - error("Can't ls: \"%s\" not found", path); - return (-1); - } - - /* - * If the glob returns a single match, which is the same as the - * input glob, and it is a directory, then just list its contents - */ - if (g.gl_pathc == 1 && - strncmp(path, g.gl_pathv[0], strlen(g.gl_pathv[0]) - 1) == 0) { - if ((a = do_lstat(conn, path, 1)) == NULL) { - globfree(&g); - return (-1); - } - if ((a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) && - S_ISDIR(a->perm)) { - globfree(&g); - return (do_ls_dir(conn, path, strip_path, lflag)); - } - } - - if (!(lflag & SHORT_VIEW)) { - int m = 0, width = 80; - struct winsize ws; - - /* Count entries for sort and find longest filename */ - for (i = 0; g.gl_pathv[i]; i++) - m = MAX(m, strlen(g.gl_pathv[i])); - - if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) != -1) - width = ws.ws_col; - - columns = width / (m + 2); - columns = MAX(columns, 1); - colspace = width / columns; - } - - for (i = 0; g.gl_pathv[i]; i++) { - char *fname; - - fname = path_strip(g.gl_pathv[i], strip_path); - - if (lflag & LONG_VIEW) { - char *lname; - struct stat sb; - - /* - * XXX: this is slow - 1 roundtrip per path - * A solution to this is to fork glob() and - * build a sftp specific version which keeps the - * attribs (which currently get thrown away) - * that the server returns as well as the filenames. - */ - memset(&sb, 0, sizeof(sb)); - a = do_lstat(conn, g.gl_pathv[i], 1); - if (a != NULL) - attrib_to_stat(a, &sb); - lname = ls_file(fname, &sb, 1); - printf("%s\n", lname); - xfree(lname); - } else { - printf("%-*s", colspace, fname); - if (c >= columns) { - printf("\n"); - c = 1; - } else - c++; - } - xfree(fname); - } - - if (!(lflag & LONG_VIEW) && (c != 1)) - printf("\n"); - - if (g.gl_pathc) - globfree(&g); - - return (0); -} - -static int -parse_args(const char **cpp, int *pflag, int *lflag, int *iflag, - unsigned long *n_arg, char **path1, char **path2) -{ - const char *cmd, *cp = *cpp; - char *cp2; - int base = 0; - long l; - int i, cmdnum; - - /* Skip leading whitespace */ - cp = cp + strspn(cp, WHITESPACE); - - /* Ignore blank lines and lines which begin with comment '#' char */ - if (*cp == '\0' || *cp == '#') - return (0); - - /* Check for leading '-' (disable error processing) */ - *iflag = 0; - if (*cp == '-') { - *iflag = 1; - cp++; - } - - /* Figure out which command we have */ - for (i = 0; cmds[i].c; i++) { - int cmdlen = strlen(cmds[i].c); - - /* Check for command followed by whitespace */ - if (!strncasecmp(cp, cmds[i].c, cmdlen) && - strchr(WHITESPACE, cp[cmdlen])) { - cp += cmdlen; - cp = cp + strspn(cp, WHITESPACE); - break; - } - } - cmdnum = cmds[i].n; - cmd = cmds[i].c; - - /* Special case */ - if (*cp == '!') { - cp++; - cmdnum = I_SHELL; - } else if (cmdnum == -1) { - error("Invalid command."); - return (-1); - } - - /* Get arguments and parse flags */ - *lflag = *pflag = *n_arg = 0; - *path1 = *path2 = NULL; - switch (cmdnum) { - case I_GET: - case I_PUT: - if (parse_getput_flags(&cp, pflag)) - return(-1); - /* Get first pathname (mandatory) */ - if (get_pathname(&cp, path1)) - return(-1); - if (*path1 == NULL) { - error("You must specify at least one path after a " - "%s command.", cmd); - return(-1); - } - /* Try to get second pathname (optional) */ - if (get_pathname(&cp, path2)) - return(-1); - break; - case I_RENAME: - case I_SYMLINK: - if (get_pathname(&cp, path1)) - return(-1); - if (get_pathname(&cp, path2)) - return(-1); - if (!*path1 || !*path2) { - error("You must specify two paths after a %s " - "command.", cmd); - return(-1); - } - break; - case I_RM: - case I_MKDIR: - case I_RMDIR: - case I_CHDIR: - case I_LCHDIR: - case I_LMKDIR: - /* Get pathname (mandatory) */ - if (get_pathname(&cp, path1)) - return(-1); - if (*path1 == NULL) { - error("You must specify a path after a %s command.", - cmd); - return(-1); - } - break; - case I_LS: - if (parse_ls_flags(&cp, lflag)) - return(-1); - /* Path is optional */ - if (get_pathname(&cp, path1)) - return(-1); - break; - case I_LLS: - case I_SHELL: - /* Uses the rest of the line */ - break; - case I_LUMASK: - base = 8; - case I_CHMOD: - base = 8; - case I_CHOWN: - case I_CHGRP: - /* Get numeric arg (mandatory) */ - l = strtol(cp, &cp2, base); - if (cp2 == cp || ((l == LONG_MIN || l == LONG_MAX) && - errno == ERANGE) || l < 0) { - error("You must supply a numeric argument " - "to the %s command.", cmd); - return(-1); - } - cp = cp2; - *n_arg = l; - if (cmdnum == I_LUMASK && strchr(WHITESPACE, *cp)) - break; - if (cmdnum == I_LUMASK || !strchr(WHITESPACE, *cp)) { - error("You must supply a numeric argument " - "to the %s command.", cmd); - return(-1); - } - cp += strspn(cp, WHITESPACE); - - /* Get pathname (mandatory) */ - if (get_pathname(&cp, path1)) - return(-1); - if (*path1 == NULL) { - error("You must specify a path after a %s command.", - cmd); - return(-1); - } - break; - case I_QUIT: - case I_PWD: - case I_LPWD: - case I_HELP: - case I_VERSION: - case I_PROGRESS: - break; - default: - fatal("Command not implemented"); - } - - *cpp = cp; - return(cmdnum); -} - -static int -parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd, - int err_abort) -{ - char *path1, *path2, *tmp; - int pflag, lflag, iflag, cmdnum, i; - unsigned long n_arg; - Attrib a, *aa; - char path_buf[MAXPATHLEN]; - int err = 0; - glob_t g; - - path1 = path2 = NULL; - cmdnum = parse_args(&cmd, &pflag, &lflag, &iflag, &n_arg, - &path1, &path2); - - if (iflag != 0) - err_abort = 0; - - memset(&g, 0, sizeof(g)); - - /* Perform command */ - switch (cmdnum) { - case 0: - /* Blank line */ - break; - case -1: - /* Unrecognized command */ - err = -1; - break; - case I_GET: - err = process_get(conn, path1, path2, *pwd, pflag); - break; - case I_PUT: - err = process_put(conn, path1, path2, *pwd, pflag); - break; - case I_RENAME: - path1 = make_absolute(path1, *pwd); - path2 = make_absolute(path2, *pwd); - err = do_rename(conn, path1, path2); - break; - case I_SYMLINK: - path2 = make_absolute(path2, *pwd); - err = do_symlink(conn, path1, path2); - break; - case I_RM: - path1 = make_absolute(path1, *pwd); - remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g); - for (i = 0; g.gl_pathv[i]; i++) { - printf("Removing %s\n", g.gl_pathv[i]); - err = do_rm(conn, g.gl_pathv[i]); - if (err != 0 && err_abort) - break; - } - break; - case I_MKDIR: - path1 = make_absolute(path1, *pwd); - attrib_clear(&a); - a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS; - a.perm = 0777; - err = do_mkdir(conn, path1, &a); - break; - case I_RMDIR: - path1 = make_absolute(path1, *pwd); - err = do_rmdir(conn, path1); - break; - case I_CHDIR: - path1 = make_absolute(path1, *pwd); - if ((tmp = do_realpath(conn, path1)) == NULL) { - err = 1; - break; - } - if ((aa = do_stat(conn, tmp, 0)) == NULL) { - xfree(tmp); - err = 1; - break; - } - if (!(aa->flags & SSH2_FILEXFER_ATTR_PERMISSIONS)) { - error("Can't change directory: Can't check target"); - xfree(tmp); - err = 1; - break; - } - if (!S_ISDIR(aa->perm)) { - error("Can't change directory: \"%s\" is not " - "a directory", tmp); - xfree(tmp); - err = 1; - break; - } - xfree(*pwd); - *pwd = tmp; - break; - case I_LS: - if (!path1) { - do_globbed_ls(conn, *pwd, *pwd, lflag); - break; - } - - /* Strip pwd off beginning of non-absolute paths */ - tmp = NULL; - if (*path1 != '/') - tmp = *pwd; - - path1 = make_absolute(path1, *pwd); - err = do_globbed_ls(conn, path1, tmp, lflag); - break; - case I_LCHDIR: - if (chdir(path1) == -1) { - error("Couldn't change local directory to " - "\"%s\": %s", path1, strerror(errno)); - err = 1; - } - break; - case I_LMKDIR: - if (mkdir(path1, 0777) == -1) { - error("Couldn't create local directory " - "\"%s\": %s", path1, strerror(errno)); - err = 1; - } - break; - case I_LLS: - local_do_ls(cmd); - break; - case I_SHELL: - local_do_shell(cmd); - break; - case I_LUMASK: - umask(n_arg); - printf("Local umask: %03lo\n", n_arg); - break; - case I_CHMOD: - path1 = make_absolute(path1, *pwd); - attrib_clear(&a); - a.flags |= SSH2_FILEXFER_ATTR_PERMISSIONS; - a.perm = n_arg; - remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g); - for (i = 0; g.gl_pathv[i]; i++) { - printf("Changing mode on %s\n", g.gl_pathv[i]); - err = do_setstat(conn, g.gl_pathv[i], &a); - if (err != 0 && err_abort) - break; - } - break; - case I_CHOWN: - case I_CHGRP: - path1 = make_absolute(path1, *pwd); - remote_glob(conn, path1, GLOB_NOCHECK, NULL, &g); - for (i = 0; g.gl_pathv[i]; i++) { - if (!(aa = do_stat(conn, g.gl_pathv[i], 0))) { - if (err != 0 && err_abort) - break; - else - continue; - } - if (!(aa->flags & SSH2_FILEXFER_ATTR_UIDGID)) { - error("Can't get current ownership of " - "remote file \"%s\"", g.gl_pathv[i]); - if (err != 0 && err_abort) - break; - else - continue; - } - aa->flags &= SSH2_FILEXFER_ATTR_UIDGID; - if (cmdnum == I_CHOWN) { - printf("Changing owner on %s\n", g.gl_pathv[i]); - aa->uid = n_arg; - } else { - printf("Changing group on %s\n", g.gl_pathv[i]); - aa->gid = n_arg; - } - err = do_setstat(conn, g.gl_pathv[i], aa); - if (err != 0 && err_abort) - break; - } - break; - case I_PWD: - printf("Remote working directory: %s\n", *pwd); - break; - case I_LPWD: - if (!getcwd(path_buf, sizeof(path_buf))) { - error("Couldn't get local cwd: %s", strerror(errno)); - err = -1; - break; - } - printf("Local working directory: %s\n", path_buf); - break; - case I_QUIT: - /* Processed below */ - break; - case I_HELP: - help(); - break; - case I_VERSION: - printf("SFTP protocol version %u\n", sftp_proto_version(conn)); - break; - case I_PROGRESS: - showprogress = !showprogress; - if (showprogress) - printf("Progress meter enabled\n"); - else - printf("Progress meter disabled\n"); - break; - default: - fatal("%d is not implemented", cmdnum); - } - - if (g.gl_pathc) - globfree(&g); - if (path1) - xfree(path1); - if (path2) - xfree(path2); - - /* If an unignored error occurs in batch mode we should abort. */ - if (err_abort && err != 0) - return (-1); - else if (cmdnum == I_QUIT) - return (1); - - return (0); -} - -int -interactive_loop(int fd_in, int fd_out, char *file1, char *file2) -{ - char *pwd; - char *dir = NULL; - char cmd[2048]; - struct sftp_conn *conn; - int err; - - conn = do_init(fd_in, fd_out, copy_buffer_len, num_requests); - if (conn == NULL) - fatal("Couldn't initialise connection to server"); - - pwd = do_realpath(conn, "."); - if (pwd == NULL) - fatal("Need cwd"); - - if (file1 != NULL) { - dir = xstrdup(file1); - dir = make_absolute(dir, pwd); - - if (remote_is_dir(conn, dir) && file2 == NULL) { - printf("Changing to: %s\n", dir); - snprintf(cmd, sizeof cmd, "cd \"%s\"", dir); - if (parse_dispatch_command(conn, cmd, &pwd, 1) != 0) - return (-1); - } else { - if (file2 == NULL) - snprintf(cmd, sizeof cmd, "get %s", dir); - else - snprintf(cmd, sizeof cmd, "get %s %s", dir, - file2); - - err = parse_dispatch_command(conn, cmd, &pwd, 1); - xfree(dir); - xfree(pwd); - return (err); - } - xfree(dir); - } - -#if HAVE_SETVBUF - setvbuf(stdout, NULL, _IOLBF, 0); - setvbuf(infile, NULL, _IOLBF, 0); -#else - setlinebuf(stdout); - setlinebuf(infile); -#endif - - err = 0; - for (;;) { - char *cp; - - printf("sftp> "); - - /* XXX: use libedit */ - if (fgets(cmd, sizeof(cmd), infile) == NULL) { - printf("\n"); - break; - } else if (infile != stdin) /* Bluff typing */ - printf("%s", cmd); - - cp = strrchr(cmd, '\n'); - if (cp) - *cp = '\0'; - - err = parse_dispatch_command(conn, cmd, &pwd, infile != stdin); - if (err != 0) - break; - } - xfree(pwd); - - /* err == 1 signifies normal "quit" exit */ - return (err >= 0 ? 0 : -1); -} - diff --git a/crypto/openssh/sftp-int.h b/crypto/openssh/sftp-int.h deleted file mode 100644 index 8a04a03..0000000 --- a/crypto/openssh/sftp-int.h +++ /dev/null @@ -1,27 +0,0 @@ -/* $OpenBSD: sftp-int.h,v 1.6 2003/01/08 23:53:26 djm Exp $ */ - -/* - * Copyright (c) 2001,2002 Damien Miller. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -int interactive_loop(int, int, char *, char *); diff --git a/crypto/openssh/sshtty.h b/crypto/openssh/sshtty.h deleted file mode 100644 index 723b278..0000000 --- a/crypto/openssh/sshtty.h +++ /dev/null @@ -1,47 +0,0 @@ -/* $OpenBSD: sshtty.h,v 1.3 2003/09/19 17:43:35 markus Exp $ */ -/* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - * All rights reserved - * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". - */ -/* - * Copyright (c) 2001 Markus Friedl. All rights reserved. - * Copyright (c) 2001 Kevin Steves. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SSHTTY_H -#define SSHTTY_H - -#include - -struct termios get_saved_tio(void); -void leave_raw_mode(void); -void enter_raw_mode(void); - -#endif diff --git a/crypto/openssh/tildexpand.c b/crypto/openssh/tildexpand.c deleted file mode 100644 index cedb653..0000000 --- a/crypto/openssh/tildexpand.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - * All rights reserved - * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". - */ - -#include "includes.h" -RCSID("$OpenBSD: tildexpand.c,v 1.15 2004/05/21 08:43:03 markus Exp $"); - -#include "xmalloc.h" -#include "log.h" -#include "misc.h" - -/* - * Expands tildes in the file name. Returns data allocated by xmalloc. - * Warning: this calls getpw*. - */ -char * -tilde_expand_filename(const char *filename, uid_t my_uid) -{ - const char *cp; - u_int userlen; - char *expanded; - struct passwd *pw; - char user[100]; - int len; - - /* Return immediately if no tilde. */ - if (filename[0] != '~') - return xstrdup(filename); - - /* Skip the tilde. */ - filename++; - - /* Find where the username ends. */ - cp = strchr(filename, '/'); - if (cp) - userlen = cp - filename; /* Something after username. */ - else - userlen = strlen(filename); /* Nothing after username. */ - if (userlen == 0) - pw = getpwuid(my_uid); /* Own home directory. */ - else { - /* Tilde refers to someone elses home directory. */ - if (userlen > sizeof(user) - 1) - fatal("User name after tilde too long."); - memcpy(user, filename, userlen); - user[userlen] = 0; - pw = getpwnam(user); - } - if (!pw) - fatal("Unknown user %100s.", user); - - /* If referring to someones home directory, return it now. */ - if (!cp) { - /* Only home directory specified */ - return xstrdup(pw->pw_dir); - } - /* Build a path combining the specified directory and path. */ - len = strlen(pw->pw_dir) + strlen(cp + 1) + 2; - if (len > MAXPATHLEN) - fatal("Home directory too long (%d > %d", len-1, MAXPATHLEN-1); - expanded = xmalloc(len); - snprintf(expanded, len, "%s%s%s", pw->pw_dir, - strcmp(pw->pw_dir, "/") ? "/" : "", cp + 1); - return expanded; -} diff --git a/crypto/openssh/tildexpand.h b/crypto/openssh/tildexpand.h deleted file mode 100644 index f5e7e40..0000000 --- a/crypto/openssh/tildexpand.h +++ /dev/null @@ -1,15 +0,0 @@ -/* $OpenBSD: tildexpand.h,v 1.4 2001/06/26 17:27:25 markus Exp $ */ - -/* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland - * All rights reserved - * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". - */ - -char *tilde_expand_filename(const char *, uid_t); -- cgit v1.1 From e6cc400c8f011e212207834669aaf4b62bee951e Mon Sep 17 00:00:00 2001 From: des Date: Wed, 4 Oct 2006 10:14:30 +0000 Subject: Apply vendor patch to fix detection of tap / tun headers and ENGINE support. --- crypto/openssh/configure.ac | 266 ++++++++++++++++++++++---------------------- 1 file changed, 133 insertions(+), 133 deletions(-) (limited to 'crypto') diff --git a/crypto/openssh/configure.ac b/crypto/openssh/configure.ac index cfcd027..ecfa50c 100644 --- a/crypto/openssh/configure.ac +++ b/crypto/openssh/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.367 2006/09/24 19:08:59 tim Exp $ +# $Id: configure.ac,v 1.369 2006/10/03 16:34:35 tim Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.367 $) +AC_REVISION($Revision: 1.369 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -127,6 +127,136 @@ AC_ARG_WITH(rpath, ] ) +# Allow user to specify flags +AC_ARG_WITH(cflags, + [ --with-cflags Specify additional flags to pass to compiler], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CFLAGS="$CFLAGS $withval" + fi + ] +) +AC_ARG_WITH(cppflags, + [ --with-cppflags Specify additional flags to pass to preprocessor] , + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CPPFLAGS="$CPPFLAGS $withval" + fi + ] +) +AC_ARG_WITH(ldflags, + [ --with-ldflags Specify additional flags to pass to linker], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LDFLAGS="$LDFLAGS $withval" + fi + ] +) +AC_ARG_WITH(libs, + [ --with-libs Specify additional libraries to link with], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LIBS="$LIBS $withval" + fi + ] +) +AC_ARG_WITH(Werror, + [ --with-Werror Build main code with -Werror], + [ + if test -n "$withval" && test "x$withval" != "xno"; then + werror_flags="-Werror" + if test "x${withval}" != "xyes"; then + werror_flags="$withval" + fi + fi + ] +) + +AC_CHECK_HEADERS( \ + bstring.h \ + crypt.h \ + crypto/sha2.h \ + dirent.h \ + endian.h \ + features.h \ + fcntl.h \ + floatingpoint.h \ + getopt.h \ + glob.h \ + ia.h \ + iaf.h \ + limits.h \ + login.h \ + maillock.h \ + ndir.h \ + net/if_tun.h \ + netdb.h \ + netgroup.h \ + pam/pam_appl.h \ + paths.h \ + pty.h \ + readpassphrase.h \ + rpc/types.h \ + security/pam_appl.h \ + sha2.h \ + shadow.h \ + stddef.h \ + stdint.h \ + string.h \ + strings.h \ + sys/audit.h \ + sys/bitypes.h \ + sys/bsdtty.h \ + sys/cdefs.h \ + sys/dir.h \ + sys/mman.h \ + sys/ndir.h \ + sys/prctl.h \ + sys/pstat.h \ + sys/select.h \ + sys/stat.h \ + sys/stream.h \ + sys/stropts.h \ + sys/strtio.h \ + sys/sysmacros.h \ + sys/time.h \ + sys/timers.h \ + sys/un.h \ + time.h \ + tmpdir.h \ + ttyent.h \ + unistd.h \ + usersec.h \ + util.h \ + utime.h \ + utmp.h \ + utmpx.h \ + vis.h \ +) + +# lastlog.h requires sys/time.h to be included first on Solaris +AC_CHECK_HEADERS(lastlog.h, [], [], [ +#ifdef HAVE_SYS_TIME_H +# include +#endif +]) + +# sys/ptms.h requires sys/stream.h to be included first on Solaris +AC_CHECK_HEADERS(sys/ptms.h, [], [], [ +#ifdef HAVE_SYS_STREAM_H +# include +#endif +]) + +# login_cap.h requires sys/types.h on NetBSD +AC_CHECK_HEADERS(login_cap.h, [], [], [ +#include +]) + # Messages for features tested for in target-specific section SIA_MSG="no" SPC_MSG="no" @@ -663,55 +793,6 @@ mips-sony-bsd|mips-sony-newsos4) ;; esac -# Allow user to specify flags -AC_ARG_WITH(cflags, - [ --with-cflags Specify additional flags to pass to compiler], - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - CFLAGS="$CFLAGS $withval" - fi - ] -) -AC_ARG_WITH(cppflags, - [ --with-cppflags Specify additional flags to pass to preprocessor] , - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - CPPFLAGS="$CPPFLAGS $withval" - fi - ] -) -AC_ARG_WITH(ldflags, - [ --with-ldflags Specify additional flags to pass to linker], - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - LDFLAGS="$LDFLAGS $withval" - fi - ] -) -AC_ARG_WITH(libs, - [ --with-libs Specify additional libraries to link with], - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - LIBS="$LIBS $withval" - fi - ] -) -AC_ARG_WITH(Werror, - [ --with-Werror Build main code with -Werror], - [ - if test -n "$withval" && test "x$withval" != "xno"; then - werror_flags="-Werror" - if test "x${withval}" != "xyes"; then - werror_flags="$withval" - fi - fi - ] -) - AC_MSG_CHECKING(compiler and flags for sanity) AC_RUN_IFELSE( [AC_LANG_SOURCE([ @@ -727,87 +808,6 @@ int main(){exit(0);} ) dnl Checks for header files. -AC_CHECK_HEADERS( \ - bstring.h \ - crypt.h \ - crypto/sha2.h \ - dirent.h \ - endian.h \ - features.h \ - fcntl.h \ - floatingpoint.h \ - getopt.h \ - glob.h \ - ia.h \ - iaf.h \ - limits.h \ - login.h \ - maillock.h \ - ndir.h \ - net/if_tun.h \ - netdb.h \ - netgroup.h \ - pam/pam_appl.h \ - paths.h \ - pty.h \ - readpassphrase.h \ - rpc/types.h \ - security/pam_appl.h \ - sha2.h \ - shadow.h \ - stddef.h \ - stdint.h \ - string.h \ - strings.h \ - sys/audit.h \ - sys/bitypes.h \ - sys/bsdtty.h \ - sys/cdefs.h \ - sys/dir.h \ - sys/mman.h \ - sys/ndir.h \ - sys/prctl.h \ - sys/pstat.h \ - sys/select.h \ - sys/stat.h \ - sys/stream.h \ - sys/stropts.h \ - sys/strtio.h \ - sys/sysmacros.h \ - sys/time.h \ - sys/timers.h \ - sys/un.h \ - time.h \ - tmpdir.h \ - ttyent.h \ - unistd.h \ - usersec.h \ - util.h \ - utime.h \ - utmp.h \ - utmpx.h \ - vis.h \ -) - -# lastlog.h requires sys/time.h to be included first on Solaris -AC_CHECK_HEADERS(lastlog.h, [], [], [ -#ifdef HAVE_SYS_TIME_H -# include -#endif -]) - -# sys/ptms.h requires sys/stream.h to be included first on Solaris -AC_CHECK_HEADERS(sys/ptms.h, [], [], [ -#ifdef HAVE_SYS_STREAM_H -# include -#endif -]) - -# login_cap.h requires sys/types.h on NetBSD -AC_CHECK_HEADERS(login_cap.h, [], [], [ -#include -]) - # Checks for libraries. AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) @@ -1916,7 +1916,7 @@ AC_ARG_WITH(ssl-engine, AC_TRY_COMPILE( [ #include ], [ -int main(void){ENGINE_load_builtin_engines();ENGINE_register_all_complete();} +ENGINE_load_builtin_engines();ENGINE_register_all_complete(); ], [ AC_MSG_RESULT(yes) AC_DEFINE(USE_OPENSSL_ENGINE, 1, -- cgit v1.1 From f591b3e29c677bff2b0f0d482490554c419128fd Mon Sep 17 00:00:00 2001 From: des Date: Fri, 10 Nov 2006 16:39:21 +0000 Subject: Vendor import of OpenSSH 4.5p1. --- crypto/openssh/ChangeLog | 3103 +------------------------- crypto/openssh/Makefile.in | 3 +- crypto/openssh/README | 4 +- crypto/openssh/audit-bsm.c | 3 +- crypto/openssh/auth-rsa.c | 10 +- crypto/openssh/auth.c | 2 - crypto/openssh/bufbn.c | 12 +- crypto/openssh/buildpkg.sh.in | 14 +- crypto/openssh/clientloop.c | 8 +- crypto/openssh/configure.ac | 7 +- crypto/openssh/dh.c | 2 +- crypto/openssh/entropy.c | 1 + crypto/openssh/kexdhc.c | 11 +- crypto/openssh/kexdhs.c | 12 +- crypto/openssh/kexgexc.c | 11 +- crypto/openssh/kexgexs.c | 12 +- crypto/openssh/key.c | 16 +- crypto/openssh/moduli.c | 52 +- crypto/openssh/monitor.c | 8 +- crypto/openssh/monitor_fdpass.c | 3 + crypto/openssh/openbsd-compat/port-solaris.c | 19 +- crypto/openssh/rsa.c | 18 +- crypto/openssh/scard.c | 12 +- crypto/openssh/scard/Makefile.in | 3 +- crypto/openssh/serverloop.c | 8 +- crypto/openssh/session.c | 2 +- crypto/openssh/sftp-client.c | 4 +- crypto/openssh/sftp.c | 3 +- crypto/openssh/ssh-agent.c | 2 +- crypto/openssh/ssh-dss.c | 7 +- crypto/openssh/ssh-keygen.c | 5 +- crypto/openssh/ssh-keyscan.1 | 4 +- crypto/openssh/ssh-keyscan.c | 2 +- crypto/openssh/ssh.1 | 22 +- crypto/openssh/ssh.c | 2 +- crypto/openssh/sshconnect.c | 11 +- crypto/openssh/sshconnect1.c | 22 +- crypto/openssh/sshd.c | 24 +- crypto/openssh/version.h | 4 +- 39 files changed, 340 insertions(+), 3128 deletions(-) (limited to 'crypto') diff --git a/crypto/openssh/ChangeLog b/crypto/openssh/ChangeLog index 9ebc3d6..2755591 100644 --- a/crypto/openssh/ChangeLog +++ b/crypto/openssh/ChangeLog @@ -1,7 +1,117 @@ +20061107 + - (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it + if we absolutely need it. Pointed out by Corinna, ok djm@ + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2006/11/06 21:25:28 + [auth-rsa.c kexgexc.c kexdhs.c key.c ssh-dss.c sshd.c kexgexs.c + ssh-keygen.c bufbn.c moduli.c scard.c kexdhc.c sshconnect1.c dh.c rsa.c] + add missing checks for openssl return codes; with & ok djm@ + - markus@cvs.openbsd.org 2006/11/07 10:31:31 + [monitor.c version.h] + correctly check for bad signatures in the monitor, otherwise the monitor + and the unpriv process can get out of sync. with dtucker@, ok djm@, + dtucker@ + - (dtucker) [README contrib/{caldera,redhat,contrib}/openssh.spec] Bump + versions. + - (dtucker) [dh.c] Type fix for BN_hex2bn; ok markus@ + - (dtucker) Release 4.5p1. + +20061105 + - (djm) OpenBSD CVS Sync + - otto@cvs.openbsd.org 2006/10/28 18:08:10 + [ssh.1] + correct/expand example of usage of -w; ok jmc@ stevesk@ + - markus@cvs.openbsd.org 2006/10/31 16:33:12 + [kexdhc.c kexdhs.c kexgexc.c kexgexs.c] + check DH_compute_key() for -1 even if it should not happen because of + earlier calls to dh_pub_is_valid(); report krahmer at suse.de; ok djm + +20061101 + - (dtucker) [openbsd-compat/port-solaris.c] Bug #1255: Make only hwerr + events fatal in Solaris process contract support and tell it to signal + only processes in the same process group when something happens. + Based on information from andrew.benham at thus.net and similar to + a patch from Chad Mynhier. ok djm@ + +20061027 +- (djm) [auth.c] gc some dead code + +20061023 + - (djm) OpenBSD CVS Sync + - ray@cvs.openbsd.org 2006/09/30 17:48:22 + [sftp.c] + Clear errno before calling the strtol functions. + From Paul Stoeber . + OK deraadt@. + - djm@cvs.openbsd.org 2006/10/06 02:29:19 + [ssh-agent.c ssh-keyscan.c ssh.c] + sys/resource.h needs sys/time.h; prompted by brad@ + (NB. Id sync only for portable) + - djm@cvs.openbsd.org 2006/10/09 23:36:11 + [session.c] + xmalloc -> xcalloc that was missed previously, from portable + (NB. Id sync only for portable, obviously) + - markus@cvs.openbsd.org 2006/10/10 10:12:45 + [sshconnect.c] + sleep before retrying (not after) since sleep changes errno; fixes + pr 5250; rad@twig.com; ok dtucker djm + - markus@cvs.openbsd.org 2006/10/11 12:38:03 + [clientloop.c serverloop.c] + exit instead of doing a blocking tcp send if we detect a client/server + timeout, since the tcp sendqueue might be already full (of alive + requests); ok dtucker, report mpf + - djm@cvs.openbsd.org 2006/10/22 02:25:50 + [sftp-client.c] + cancel progress meter when upload write fails; ok deraadt@ + - (tim) [Makefile.in scard/Makefile.in] Add datarootdir= lines to keep + autoconf 2.60 from complaining. + +20061018 + - (dtucker) OpenBSD CVS Sync + - ray@cvs.openbsd.org 2006/09/25 04:55:38 + [ssh-keyscan.1 ssh.1] + Change "a SSH" to "an SSH". Hurray, I'm not the only one who + pronounces "SSH" as "ess-ess-aich". + OK jmc@ and stevesk@. + - (dtucker) [sshd.c] Reshuffle storing of pw struct; prevents warnings + on older versions of OS X. ok djm@ + +20061016 + - (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros + on older (2.0) Linuxes. Based on patch from thmo-13 at gmx de. + +20061006 + - (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris. + Differentiate between OpenServer 5 and OpenServer 6 + - (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for + SELinux functions so they're detected correctly. Patch from pebenito at + gentoo.org. + - (tim) [buildpkg.sh.in] Some systems have really limited nawk (OpenServer). + Allow setting alternate awk in openssh-config.local. + +20061003 + - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific + section so additional platform specific CHECK_HEADER tests will work + correctly. Fixes " on FreeBSD" problem report by des AT des.no + Feedback and "seems like a good idea" dtucker@ + +20061001 + - (dtucker) [audit-bsm.c] Include errno.h. Pointed out by des at des.no. + +20060929 + - (dtucker) [configure.ac] Bug #1239: Fix configure test for OpenSSH engine + support. Patch from andrew.benham at thus net. + +20060928 + - (dtucker) [entropy.c] Bug #1238: include signal.h to fix compilation error + on Solaris 8 w/out /dev/random or prngd. Patch from rl at + math.technion.ac.il. + 20060926 - (dtucker) [bufaux.h] nuke bufaux.h; it's already gone from OpenBSD and not referenced any more. ok djm@ - (dtucker) [sftp-server.8] Resync; spotted by djm@ + - (dtucker) Release 4.4p1. 20060924 - (tim) [configure.ac] Remove CFLAGS hack for UnixWare 1.x/2.x (added @@ -2496,2995 +2606,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -20050901 - - (djm) Update RPM spec file versions - -20050831 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2005/08/30 22:08:05 - [gss-serv.c sshconnect2.c] - destroy credentials if krb5_kuserok() call fails. Stops credentials being - delegated to users who are not authorised for GSSAPIAuthentication when - GSSAPIDeletegateCredentials=yes and another authentication mechanism - succeeds; bz#1073 reported by paul.moore AT centrify.com, fix by - simon AT sxw.org.uk, tested todd@ biorn@ jakob@; ok deraadt@ - - markus@cvs.openbsd.org 2005/08/31 09:28:42 - [version.h] - 4.2 - - (dtucker) [README] Update release note URL to 4.2 - - (tim) [configure.ac auth.c defines.h session.c openbsd-compat/port-uw.c - openbsd-compat/port-uw.h openbsd-compat/xcrypt.c] libiaf cleanup. Disable - libiaf bits for OpenServer6. Free memory allocated by ia_get_logpwd(). - Feedback and OK dtucker@ - -20050830 - - (tim) [configure.ac] Back out last change. It needs to be done differently. - -20050829 - - (tim) [configure.ac] ia_openinfo() seems broken on OSR6. Limit UW long - password support to 7.x for now. - -20050826 - - (tim) [CREDITS LICENCE auth.c configure.ac defines.h includes.h session.c - openbsd-compat/Makefile.in openbsd-compat/openbsd-compat.h - openbsd-compat/xcrypt.c] New files [openssh/openbsd-compat/port-uw.c - openssh/openbsd-compat/port-uw.h] Support long passwords (> 8-char) - on UnixWare 7 from Dhiraj Gulati and Ahsan Rashid. Cleanup and testing - by tim@. Feedback and OK dtucker@ - -20050823 - - (dtucker) [regress/test-exec.sh] Do not prepend an extra "/" to a fully- - qualified sshd pathname since some systems (eg Cygwin) may consider "/foo" - and "//foo" to be different. Spotted by vinschen at redhat.com. - - (tim) [configure.ac] Not all gcc's support -Wsign-compare. Enhancements - and OK dtucker@ - - (tim) [defines.h] PATH_MAX bits for OpenServer OK dtucker@ - -20050821 - - (dtucker) [configure.ac defines.h includes.h sftp.c] Add support for - LynxOS, patch from Olli Savia (ops at iki.fi). ok djm@ - -20050816 - - (djm) [ttymodes.c] bugzilla #1025: Fix encoding of _POSIX_VDISABLE, - from Jacob Nevins; ok dtucker@ - -20050815 - - (tim) [sftp.c] wrap el_end() in #ifdef USE_LIBEDIT - - (tim) [configure.ac] corrections to libedit tests. Report and patches - by skeleten AT shillest.net - -20050812 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2005/07/28 17:36:22 - [packet.c] - missing packet_init_compression(); from solar - - djm@cvs.openbsd.org 2005/07/30 01:26:16 - [ssh.c] - fix -D listen_host initialisation, so it picks up gateway_ports setting - correctly - - djm@cvs.openbsd.org 2005/07/30 02:03:47 - [readconf.c] - listen_hosts initialisation here too; spotted greg AT y2005.nest.cx - - dtucker@cvs.openbsd.org 2005/08/06 10:03:12 - [servconf.c] - Unbreak sshd ListenAddress for bare IPv6 addresses. - Report from Janusz Mucka; ok djm@ - - jaredy@cvs.openbsd.org 2005/08/08 13:22:48 - [sftp.c] - sftp prompt enhancements: - - in non-interactive mode, do not print an empty prompt at the end - before finishing - - print newline after EOF in editline mode - - call el_end() in editline mode - ok dtucker djm - -20050810 - - (dtucker) [configure.ac] Test libedit library and headers for compatibility. - Report from skeleten AT shillest.net, ok djm@ - - (dtucker) [LICENCE configure.ac defines.h openbsd-compat/realpath.c] - Sync current (thread-safe) version of realpath.c from OpenBSD (which is - in turn based on FreeBSD's). ok djm@ - -20050809 - - (tim) [configure.ac] Allow --with-audit=no. OK dtucker@ - Report by skeleten AT shillest.net - -20050803 - - (dtucker) [openbsd-compat/fake-rfc2553.h] Check for EAI_* defines - individually and use a value less likely to collide with real values from - netdb.h. Fixes compile warnings on FreeBSD 5.3. ok djm@ - - (dtucker) [openbsd-compat/fake-rfc2553.h] MAX_INT -> INT_MAX since the - latter is specified in the standard. - -20050802 - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2005/07/27 10:39:03 - [scp.c hostfile.c sftp-client.c] - Silence bogus -Wuninitialized warnings; ok djm@ - - (dtucker) [configure.ac] Enable -Wuninitialized by default when compiling - with gcc. ok djm@ - - (dtucker) [configure.ac] Add a --with-Werror option to configure for - adding -Werror to CFLAGS when all of the configure tests are done. ok djm@ - -20050726 - - (dtucker) [configure.ac] Update zlib warning message too, pointed out by - tim@. - - (djm) OpenBSD CVS Sync - - otto@cvs.openbsd.org 2005/07/19 15:32:26 - [auth-passwd.c] - auth_usercheck(3) can return NULL, so check for that. Report from - mpech@. ok markus@ - - markus@cvs.openbsd.org 2005/07/25 11:59:40 - [kex.c kex.h myproposal.h packet.c packet.h servconf.c session.c] - [sshconnect2.c sshd.c sshd_config sshd_config.5] - add a new compression method that delays compression until the user - has been authenticated successfully and set compression to 'delayed' - for sshd. - this breaks older openssh clients (< 3.5) if they insist on - compression, so you have to re-enable compression in sshd_config. - ok djm@ - -20050725 - - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096. - -20050717 -- OpenBSD CVS Sync - - djm@cvs.openbsd.org 2005/07/16 01:35:24 - [auth1.c channels.c cipher.c clientloop.c kex.c session.c ssh.c] - [sshconnect.c] - spacing - - (djm) [acss.c auth-pam.c auth-shadow.c auth-skey.c auth1.c canohost.c] - [cipher-acss.c loginrec.c ssh-rand-helper.c sshd.c] Fix whitespace at EOL - in portable too ("perl -p -i -e 's/\s+$/\n/' *.[ch]") - - (djm) [auth-pam.c sftp.c] spaces vs. tabs at start of line - - djm@cvs.openbsd.org 2005/07/17 06:49:04 - [channels.c channels.h session.c session.h] - Fix a number of X11 forwarding channel leaks: - 1. Refuse multiple X11 forwarding requests on the same session - 2. Clean up all listeners after a single_connection X11 forward, not just - the one that made the single connection - 3. Destroy X11 listeners when the session owning them goes away - testing and ok dtucker@ - - djm@cvs.openbsd.org 2005/07/17 07:17:55 - [auth-rh-rsa.c auth-rhosts.c auth2-chall.c auth2-gss.c channels.c] - [cipher-ctr.c gss-genr.c gss-serv.c kex.c moduli.c readconf.c] - [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c] - [sshconnect.c sshconnect2.c] - knf says that a 2nd level indent is four (not three or five) spaces - -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c] - [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too - - (djm) [monitor.c monitor_wrap.c] -Wsign-compare for PAM monitor calls - -20050716 - - (dtucker) [auth-pam.c] Ensure that only one side of the authentication - socketpair stays open on in both the monitor and PAM process. Patch from - Joerg Sonnenberger. - -20050714 - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2005/07/06 09:33:05 - [ssh.1] - clarify meaning of ssh -b ; with & ok jmc@ - - dtucker@cvs.openbsd.org 2005/07/08 09:26:18 - [misc.c] - Make comment match code; ok djm@ - - markus@cvs.openbsd.org 2005/07/08 09:41:33 - [channels.h] - race when efd gets closed while there is still buffered data: - change CHANNEL_EFD_OUTPUT_ACTIVE() - 1) c->efd must always be valid AND - 2a) no EOF has been seen OR - 2b) there is buffered data - report, initial fix and testing Chuck Cranor - - dtucker@cvs.openbsd.org 2005/07/08 10:20:41 - [ssh_config.5] - change BindAddress to match recent ssh -b change; prompted by markus@ - - jmc@cvs.openbsd.org 2005/07/08 12:53:10 - [ssh_config.5] - new sentence, new line; - - dtucker@cvs.openbsd.org 2005/07/14 04:00:43 - [misc.h] - use __sentinel__ attribute; ok deraadt@ djm@ markus@ - - (dtucker) [configure.ac defines.h] Define __sentinel__ to nothing if the - compiler doesn't understand it to prevent warnings. If any mainstream - compiler versions acquire it we can test for those versions. Based on - discussion with djm@. - -20050707 - - dtucker [auth-krb5.c auth.h gss-serv-krb5.c] Move KRB5CCNAME generation for - the MIT Kerberos code path into a common function and expand mkstemp - template to be consistent with the rest of OpenSSH. From sxw at - inf.ed.ac.uk, ok djm@ - - (dtucker) [auth-krb5.c] There's no guarantee that snprintf will set errno - in the case where the buffer is insufficient, so always return ENOMEM. - Also pointed out by sxw at inf.ed.ac.uk. - - (dtucker) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Remove - calls to krb5_init_ets, which has not been required since krb-1.1.x and - most Kerberos versions no longer export in their public API. From sxw - at inf.ed.ac.uk, ok djm@ - -20050706 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2005/07/01 13:19:47 - [channels.c] - don't free() if getaddrinfo() fails; report mpech@ - - djm@cvs.openbsd.org 2005/07/04 00:58:43 - [channels.c clientloop.c clientloop.h misc.c misc.h ssh.c ssh_config.5] - implement support for X11 and agent forwarding over multiplex slave - connections. Because of protocol limitations, the slave connections inherit - the master's DISPLAY and SSH_AUTH_SOCK rather than distinctly forwarding - their own. - ok dtucker@ "put it in" deraadt@ - - jmc@cvs.openbsd.org 2005/07/04 11:29:51 - [ssh_config.5] - fix Xr and a little grammar; - - markus@cvs.openbsd.org 2005/07/04 14:04:11 - [channels.c] - don't forget to set x11_saved_display - -20050626 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2005/06/17 22:53:47 - [ssh.c sshconnect.c] - Fix ControlPath's %p expanding to "0" for a default port, - spotted dwmw2 AT infradead.org; ok markus@ - - djm@cvs.openbsd.org 2005/06/18 04:30:36 - [ssh.c ssh_config.5] - allow ControlPath=none, patch from dwmw2 AT infradead.org; ok dtucker@ - - djm@cvs.openbsd.org 2005/06/25 22:47:49 - [ssh.c] - do the default port filling code a few lines earlier, so it really - does fix %p - -20050618 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2005/05/20 12:57:01; - [auth1.c] split protocol 1 auth methods into separate functions, makes - authloop much more readable; fixes and ok markus@ (portable ok & - polish dtucker@) - - djm@cvs.openbsd.org 2005/06/17 02:44:33 - [auth1.c] make this -Wsign-compare clean; ok avsm@ markus@ - - (djm) [loginrec.c ssh-rand-helper.c] Fix -Wsign-compare for portable, - tested and fixes tim@ - -20050617 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2005/06/16 03:38:36 - [channels.c channels.h clientloop.c clientloop.h ssh.c] - move x11_get_proto from ssh.c to clientloop.c, to make muliplexed xfwd - easier later; ok deraadt@ - - markus@cvs.openbsd.org 2005/06/16 08:00:00 - [canohost.c channels.c sshd.c] - don't exit if getpeername fails for forwarded ports; bugzilla #1054; - ok djm - - djm@cvs.openbsd.org 2005/06/17 02:44:33 - [auth-rsa.c auth.c auth1.c auth2-chall.c auth2-gss.c authfd.c authfile.c] - [bufaux.c canohost.c channels.c cipher.c clientloop.c dns.c gss-serv.c] - [kex.c kex.h key.c mac.c match.c misc.c packet.c packet.h scp.c] - [servconf.c session.c session.h sftp-client.c sftp-server.c sftp.c] - [ssh-keyscan.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c] - make this -Wsign-compare clean; ok avsm@ markus@ - NB. auth1.c changes not committed yet (conflicts with uncommitted sync) - NB2. more work may be needed to make portable Wsign-compare clean - - (dtucker) [cipher.c openbsd-compat/openbsd-compat.h - openbsd-compat/openssl-compat.c] only include openssl compat stuff where - it's needed as it can cause conflicts elsewhere (eg xcrypt.c). Found by - and ok tim@ - -20050616 - - (djm) OpenBSD CVS Sync - - jaredy@cvs.openbsd.org 2005/06/07 13:25:23 - [progressmeter.c] - catch SIGWINCH and resize progress meter accordingly; ok markus dtucker - - djm@cvs.openbsd.org 2005/06/06 11:20:36 - [auth.c auth.h misc.c misc.h ssh.c ssh_config.5 sshconnect.c] - introduce a generic %foo expansion function. replace existing % expansion - and add expansion to ControlPath; ok markus@ - - djm@cvs.openbsd.org 2005/06/08 03:50:00 - [ssh-keygen.1 ssh-keygen.c sshd.8] - increase default rsa/dsa key length from 1024 to 2048 bits; - ok markus@ deraadt@ - - djm@cvs.openbsd.org 2005/06/08 11:25:09 - [clientloop.c readconf.c readconf.h ssh.c ssh_config.5] - add ControlMaster=auto/autoask options to support opportunistic - multiplexing; tested avsm@ and jakob@, ok markus@ - - dtucker@cvs.openbsd.org 2005/06/09 13:43:49 - [cipher.c] - Correctly initialize end of array sentinel; ok djm@ - (Id sync only, change already in portable) - -20050609 - - (dtucker) [cipher.c openbsd-compat/Makefile.in - openbsd-compat/openbsd-compat.h openbsd-compat/openssl-compat.{c,h}] - Move compatibility code for supporting older OpenSSL versions to the - compat layer. Suggested by and "no objection" djm@ - -20050607 - - (dtucker) [configure.ac] Continue the hunt for LLONG_MIN and LLONG_MAX: - in today's episode we attempt to coax it from limits.h where it may be - hiding, failing that we take the DIY approach. Tested by tim@ - -20050603 - - (dtucker) [configure.ac] Only try gcc -std=gnu99 if LLONG_MAX isn't - defined, and check that it helps before keeping it in CFLAGS. Some old - gcc's don't set an error code when encountering an unknown value in -std. - Found and tested by tim@. - - (dtucker) [configure.ac] Point configure's reporting address at the - openssh-unix-dev list. ok tim@ djm@ - -20050602 - - (tim) [configure.ac] Some platforms need sys/types.h for arpa/nameser.h. - Take AC_CHECK_HEADERS test out of ultrix section. It caused other platforms - to skip builtin standard includes tests. (first AC_CHECK_HEADERS test - must be run on all platforms) Add missing ;; to case statement. OK dtucker@ - -20050601 - - (dtucker) [configure.ac] Look for _getshort and _getlong in - arpa/nameser.h. - - (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoll.c] - Add strtoll to the compat library, from OpenBSD. - - (dtucker) OpenBSD CVS Sync - - avsm@cvs.openbsd.org 2005/05/26 02:08:05 - [scp.c] - If copying multiple files to a target file (which normally fails, as it - must be a target directory), kill the spawned ssh child before exiting. - This stops it trying to authenticate and spewing lots of output. - deraadt@ ok - - dtucker@cvs.openbsd.org 2005/05/26 09:08:12 - [ssh-keygen.c] - uint32_t -> u_int32_t for consistency; ok djm@ - - djm@cvs.openbsd.org 2005/05/27 08:30:37 - [ssh.c] - fix -O for cases where no ControlPath has been specified or socket at - ControlPath is not contactable; spotted by and ok avsm@ - - (tim) [config.guess config.sub] Update to '2005-05-27' version. - - (tim) [configure.ac] set TEST_SHELL for OpenServer 6 - -20050531 - - (dtucker) [contrib/aix/pam.conf] Correct comments. From davidl at - vintela.com. - - (dtucker) [mdoc2man.awk] Teach it to understand .Ox. - -20050530 - - (dtucker) [README] Link to new release notes. Beter late than never... - -20050529 - - (dtucker) [openbsd-compat/port-aix.c] Bug #1046: AIX 5.3 expects the - argument to passwdexpired to be initialized to NULL. Suggested by tim@ - While at it, initialize the other arguments to auth functions in case they - ever acquire this behaviour. - - (dtucker) [openbsd-compat/port-aix.c] Whitespace cleanups while there. - - (dtucker) [openbsd-compat/port-aix.c] Minor correction to debug message, - spotted by tim@. - -20050528 - - (dtucker) [configure.ac] For AC_CHECK_HEADERS() and AC_CHECK_FUNCS() have - one entry per line to make it easier to merge changes. ok djm@ - - (dtucker) [configure.ac] strsep() may be defined in string.h, so check - for its presence and include it in the strsep check. - - (dtucker) [configure.ac] getpgrp may be defined in unistd.h, so check for - its presence before doing AC_FUNC_GETPGRP. - - (dtucker) [configure.ac] Merge HP-UX blocks into a common block with minor - version-specific variations as required. - - (dtucker) [openbsd-compat/port-aix.h] Use the HAVE_DECL_* definitions as - per the autoconf man page. Configure should always define them but it - doesn't hurt to check. - -20050527 - - (djm) [defines.h] Use our realpath if we have to define PATH_MAX, spotted by - David Leach; ok dtucker@ - - (dtucker) [acconfig.h configure.ac defines.h includes.h sshpty.c - openbsd-compat/bsd-misc.c] Add support for Ultrix. No, that's not a typo. - Required changes from Bernhard Simon, integrated by me. ok djm@ - -20050525 - - (djm) [mpaux.c mpaux.h Makefile.in] Remove old mpaux.[ch] code, it has not - been used for a while - - (djm) OpenBSD CVS Sync - - otto@cvs.openbsd.org 2005/04/05 13:45:31 - [ssh-keygen.c] - - djm@cvs.openbsd.org 2005/04/06 09:43:59 - [sshd.c] - avoid harmless logspam by not performing setsockopt() on non-socket; - ok markus@ - - dtucker@cvs.openbsd.org 2005/04/06 12:26:06 - [ssh.c] - Fix debug call for port forwards; patch from pete at seebeyond.com, - ok djm@ (ID sync only - change already in portable) - - djm@cvs.openbsd.org 2005/04/09 04:32:54 - [misc.c misc.h tildexpand.c Makefile.in] - replace tilde_expand_filename with a simpler implementation, ahead of - more whacking; ok deraadt@ - - jmc@cvs.openbsd.org 2005/04/14 12:30:30 - [ssh.1] - arg to -b is an address, not if_name; - ok markus@ - - jakob@cvs.openbsd.org 2005/04/20 10:05:45 - [dns.c] - do not try to look up SSHFP for numerical hostname. ok djm@ - - djm@cvs.openbsd.org 2005/04/21 06:17:50 - [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 ssh_config.5 sshd.8] - [sshd_config.5] OpenSSH doesn't ever look at the $HOME environment - variable, so don't say that we do (bz #623); ok deraadt@ - - djm@cvs.openbsd.org 2005/04/21 11:47:19 - [ssh.c] - don't allocate a pty when -n flag (/dev/null stdin) is set, patch from - ignasi.roca AT fujitsu-siemens.com (bz #829); ok dtucker@ - - dtucker@cvs.openbsd.org 2005/04/23 23:43:47 - [readpass.c] - Add debug message if read_passphrase can't open /dev/tty; bz #471; - ok djm@ - - jmc@cvs.openbsd.org 2005/04/26 12:59:02 - [sftp-client.h] - spelling correction in comment from wiz@netbsd; - - jakob@cvs.openbsd.org 2005/04/26 13:08:37 - [ssh.c ssh_config.5] - fallback gracefully if client cannot connect to ControlPath. ok djm@ - - moritz@cvs.openbsd.org 2005/04/28 10:17:56 - [progressmeter.c ssh-keyscan.c] - add snprintf checks. ok djm@ markus@ - - markus@cvs.openbsd.org 2005/05/02 21:13:22 - [readpass.c] - missing {} - - djm@cvs.openbsd.org 2005/05/10 10:28:11 - [ssh.c] - print nice error message for EADDRINUSE as well (ID sync only) - - djm@cvs.openbsd.org 2005/05/10 10:30:43 - [ssh.c] - report real errors on fallback from ControlMaster=no to normal connect - - markus@cvs.openbsd.org 2005/05/16 15:30:51 - [readconf.c servconf.c] - check return value from strdelim() for NULL (AddressFamily); mpech - - djm@cvs.openbsd.org 2005/05/19 02:39:55 - [sshd_config.5] - sort config options, from grunk AT pestilenz.org; ok jmc@ - - djm@cvs.openbsd.org 2005/05/19 02:40:52 - [sshd_config] - whitespace nit, from grunk AT pestilenz.org - - djm@cvs.openbsd.org 2005/05/19 02:42:26 - [includes.h] - fix cast, from grunk AT pestilenz.org - - djm@cvs.openbsd.org 2005/05/20 10:50:55 - [ssh_config.5] - give a ProxyCommand example using nc(1), with and ok jmc@ - - jmc@cvs.openbsd.org 2005/05/20 11:23:32 - [ssh_config.5] - oops - article and spacing; - - avsm@cvs.openbsd.org 2005/05/23 22:44:01 - [moduli.c ssh-keygen.c] - - removes signed/unsigned comparisons in moduli generation - - use strtonum instead of atoi where its easier - - check some strlcpy overflow and fatal instead of truncate - - djm@cvs.openbsd.org 2005/05/23 23:32:46 - [cipher.c myproposal.h ssh.1 ssh_config.5 sshd_config.5] - add support for draft-harris-ssh-arcfour-fixes-02 improved arcfour modes; - ok markus@ - - avsm@cvs.openbsd.org 2005/05/24 02:05:09 - [ssh-keygen.c] - some style nits from dmiller@, and use a fatal() instead of a printf()/exit - - avsm@cvs.openbsd.org 2005/05/24 17:32:44 - [atomicio.c atomicio.h authfd.c monitor_wrap.c msg.c scp.c sftp-client.c] - [ssh-keyscan.c sshconnect.c] - Switch atomicio to use a simpler interface; it now returns a size_t - (containing number of bytes read/written), and indicates error by - returning 0. EOF is signalled by errno==EPIPE. - Typical use now becomes: - - if (atomicio(read, ..., len) != len) - err(1,"read"); - - ok deraadt@, cloder@, djm@ - - (dtucker) [regress/reexec.sh] Add ${EXEEXT} so this test also works on - Cygwin. - - (dtucker) [auth-pam.c] Bug #1033: Fix warnings building with PAM on Linux: - warning: dereferencing type-punned pointer will break strict-aliasing rules - warning: passing arg 3 of `pam_get_item' from incompatible pointer type - The type-punned pointer fix is based on a patch from SuSE's rpm. ok djm@ - - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Bug #1033: Provide - templates for _getshort and _getlong if missing to prevent compiler warnings - on Linux. - - (djm) [configure.ac openbsd-compat/Makefile.in] - [openbsd-compat/openbsd-compat.h openbsd-compat/strtonum.c] - Add strtonum(3) from OpenBSD libc, new code needs it. - Unfortunately Linux forces us to do a bizarre dance with compiler - options to get LLONG_MIN/MAX; Spotted by and ok dtucker@ - -20050524 - - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - [contrib/suse/openssh.spec] Update spec file versions to 4.1p1 - - (dtucker) [auth-pam.c] Since people don't seem to be getting the message - that USE_POSIX_THREADS is unsupported, not recommended and generally a bad - idea, it is now known as UNSUPPORTED_POSIX_THREADS_HACK. Attempting to use - USE_POSIX_THREADS will now generate an error so we don't silently change - behaviour. ok djm@ - - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Ensure sufficient memory - allocation when retrieving core Windows environment. Add CYGWIN variable - to propagated variables. Patch from vinschen at redhat.com, ok djm@ - - Release 4.1p1 - -20050524 - - (djm) [openbsd-compat/readpassphrase.c] bz #950: Retry tcsetattr to ensure - terminal modes are reset correctly. Fix from peak AT argo.troja.mff.cuni.cz; - "looks ok" dtucker@ - -20050512 - - (tim) [buildpkg.sh.in] missing ${PKG_INSTALL_ROOT} in init script - hard link section. Bug 1038. - -20050509 - - (dtucker) [contrib/cygwin/ssh-host-config] Add a test and warning for a - user-mode mounts in Cygwin installation. Patch from vinschen at redhat.com. - -20050504 - - (djm) [ssh.c] some systems return EADDRINUSE on a bind to an already-used - unix domain socket, so catch that too; from jakob@ ok dtucker@ - -20050503 - - (dtucker) [canohost.c] normalise socket addresses returned by - get_remote_hostname(). This means that IPv4 addresses in log messages - on IPv6 enabled machines will no longer be prefixed by "::ffff:" and - AllowUsers, DenyUsers, AllowGroups, DenyGroups will match IPv4-style - addresses only for 4-in-6 mapped connections, regardless of whether - or not the machine is IPv6 enabled. ok djm@ - -20050425 - - (dtucker) [regress/multiplex.sh] Use "kill -0 $pid" to check for the - existence of a process since it's more portable. Found by jbasney at - ncsa.uiuc.edu; ok tim@ - - (dtucker) [regress/multiplex.sh] Remove cleanup call since test-exec.sh - will clean up anyway. From tim@ - - (dtucker) [regress/multiplex.sh] Put control socket in /tmp so running - "make tests" works even if you're building on a filesystem that doesn't - support sockets. From deengert at anl.gov, ok djm@ - -20050424 - - (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or - 1.2.1.2 or higher. With tim@, ok djm@ - -20050423 - - (tim) [config.guess] Add support for OpenServer 6. - -20050421 - - (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if - UseLogin is set as PAM is not used to establish credentials in that - case. Found by Michael Selvesteen, ok djm@ - -20050419 - - (dtucker) [INSTALL] Reference README.privsep for the privilege separation - requirements. Pointed out by Bengt Svensson. - - (dtucker) [INSTALL] Put the s/key text and URL back together. - - (dtucker) [INSTALL] Fix s/key text too. - -20050411 - - (tim) [configure.ac] UnixWare needs PASSWD_NEEDS_USERNAME - -20050405 - - (dtucker) [configure.ac] Define HAVE_SO_PEERCRED if we have it. ok djm@ - - (dtucker) [auth-sia.c] Constify sys_auth_passwd, fixes build error on - Tru64. Patch from cmadams at hiwaay.net. - - (dtucker) [auth-passwd.c auth-sia.h] Remove duplicate definitions of - sys_auth_passwd, pointed out by cmadams at hiwaay.net. - -20050403 - - (djm) OpenBSD CVS Sync - - deraadt@cvs.openbsd.org 2005/03/31 18:39:21 - [scp.c] - copy argv[] element instead of smashing the one that ps will see; ok otto - - djm@cvs.openbsd.org 2005/04/02 12:41:16 - [scp.c] - since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror - build - - (dtucker) [monitor.c] Don't free buffers in audit functions, monitor_read - will free as needed. ok tim@ djm@ - -20050331 - - (dtucker) OpenBSD CVS Sync - - jmc@cvs.openbsd.org 2005/03/16 11:10:38 - [ssh_config.5] - get the syntax right for {Local,Remote}Forward; - based on a diff from markus; - problem report from ponraj; - ok dtucker@ markus@ deraadt@ - - markus@cvs.openbsd.org 2005/03/16 21:17:39 - [version.h] - 4.1 - - jmc@cvs.openbsd.org 2005/03/18 17:05:00 - [sshd_config.5] - typo; - - (dtucker) [auth.h sshd.c openbsd-compat/port-aix.c] Bug #1006: fix bug in - handling of password expiry messages returned by AIX's authentication - routines, originally reported by robvdwal at sara.nl. - - (dtucker) [ssh.c] Prevent null pointer deref in port forwarding debug - message on some platforms. Patch from pete at seebeyond.com via djm. - - (dtucker) [monitor.c] Remaining part of fix for bug #1006. - -20050329 - - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're - interested in which is much faster in large (eg LDAP or NIS) environments. - Patch from dleonard at vintela.com. - -20050321 - - (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes - and -Lyes to CFLAGS and LIBS. Pointed out by peter at slagheap.net, - with & ok tim@ - - (dtucker) [configure.ac] Make configure error out if the user specifies - --with-libedit but the required libs can't be found, rather than silently - ignoring and continuing. ok tim@ - - (dtucker) [configure.ac openbsd-compat/port-aix.h] Prevent redefinitions - of setauthdb on AIX 5.3, reported by anders.liljegren at its.uu.se. - -20050317 - - (tim) [configure.ac] Bug 998. Make path for --with-opensc optional. - Make --without-opensc work. - - (tim) [configure.ac] portability changes on test statements. Some shells - have problems with -a operator. - - (tim) [configure.ac] make some configure options a little more error proof. - - (tim) [configure.ac] remove trailing white space. - -20050314 - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2005/03/10 10:15:02 - [readconf.c] - Check listen addresses for null, prevents xfree from dying during - ClearAllForwardings (bz #996). From Craig Leres, ok markus@ - - deraadt@cvs.openbsd.org 2005/03/10 22:01:05 - [misc.c ssh-keygen.c servconf.c clientloop.c auth-options.c ssh-add.c - monitor.c sftp-client.c bufaux.h hostfile.c ssh.c sshconnect.c channels.c - readconf.c bufaux.c sftp.c] - spacing - - deraadt@cvs.openbsd.org 2005/03/10 22:40:38 - [auth-options.c] - spacing - - markus@cvs.openbsd.org 2005/03/11 14:59:06 - [ssh-keygen.c] - typo, missing \n; mpech - - jmc@cvs.openbsd.org 2005/03/12 11:55:03 - [ssh_config.5] - escape `.' at eol to avoid double spacing issues; - - dtucker@cvs.openbsd.org 2005/03/14 10:09:03 - [ssh-keygen.1] - Correct description of -H (bz #997); ok markus@, punctuation jmc@ - - dtucker@cvs.openbsd.org 2005/03/14 11:44:42 - [auth.c] - Populate host for log message for logins denied by AllowUsers and - DenyUsers (bz #999); ok markus@ (patch by tryponraj at gmail.com) - - markus@cvs.openbsd.org 2005/03/14 11:46:56 - [buffer.c buffer.h channels.c] - limit input buffer size for channels; bugzilla #896; with and ok dtucker@ - - (tim) [contrib/caldera/openssh.spec] links in rc?.d were getting trashed - with a rpm -F - -20050313 - - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the - localized name of the local administrators group more reliable. From - vinschen at redhat.com. - -20050312 - - (dtucker) [regress/test-exec.sh] DEBUG can cause problems where debug - output ends up in the client's output, causing regress failures. Found - by Corinna Vinschen. - -20050309 - - (dtucker) [regress/test-exec.sh] Set BIN_SH=xpg4 on OSF1/Digital Unix/Tru64 - so that regress tests behave. From Chris Adams. - - (djm) OpenBSD CVS Sync - - jmc@cvs.openbsd.org 2005/03/07 23:41:54 - [ssh.1 ssh_config.5] - more macro simplification; - - djm@cvs.openbsd.org 2005/03/08 23:49:48 - [version.h] - OpenSSH 4.0 - - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - [contrib/suse/openssh.spec] Update spec file versions - - (djm) [log.c] Fix dumb syntax error; ok dtucker@ - - (djm) Release OpenSSH 4.0p1 - -20050307 - - (dtucker) [configure.ac] Disable gettext search when configuring with - BSM audit support for the time being. ok djm@ - - (dtucker) OpenBSD CVS Sync (regress/) - - fgsch@cvs.openbsd.org 2004/12/10 01:31:30 - [Makefile sftp-glob.sh] - some globbing regress; prompted and ok djm@ - - david@cvs.openbsd.org 2005/01/14 04:21:18 - [Makefile test-exec.sh] - pass the SUDO make variable to the individual sh tests; ok dtucker@ markus@ - - dtucker@cvs.openbsd.org 2005/02/27 11:33:30 - [multiplex.sh test-exec.sh sshd-log-wrapper.sh] - Add optional capability to log output from regress commands; ok markus@ - Use with: make TEST_SSH_LOGFILE=/tmp/regress.log - - djm@cvs.openbsd.org 2005/02/27 23:13:36 - [login-timeout.sh] - avoid nameservice lookups in regress test; ok dtucker@ - - djm@cvs.openbsd.org 2005/03/04 08:48:46 - [Makefile envpass.sh] - regress test for SendEnv config parsing bug; ok dtucker@ - - (dtucker) [regress/test-exec.sh] Put SUDO in the right place. - - (tim) [configure.ac] SCO 3.2v4.2 no longer supported. - -20050306 - - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor - when attempting to audit disconnect events. Reported by Phil Dibowitz. - - (dtucker) [session.c sshd.c] Bug #125 comment #49: Send disconnect audit - events earlier, prevents mm_request_send errors reported by Matt Goebel. - -20050305 - - (djm) [contrib/cygwin/README] Improve Cygwin build documentation. Patch - from vinschen at redhat.com - - (djm) OpenBSD CVS Sync - - jmc@cvs.openbsd.org 2005/03/02 11:45:01 - [ssh.1] - missing word; - - djm@cvs.openbsd.org 2005/03/04 08:48:06 - [readconf.c] - fix SendEnv config parsing bug found by Roumen Petrov; ok dtucker@ - -20050302 - - (djm) OpenBSD CVS sync: - - jmc@cvs.openbsd.org 2005/03/01 14:47:58 - [ssh.1] - remove some unneccesary macros; - do not mark up punctuation; - - jmc@cvs.openbsd.org 2005/03/01 14:55:23 - [ssh_config.5] - do not mark up punctuation; - whitespace; - - jmc@cvs.openbsd.org 2005/03/01 14:59:49 - [sshd.8] - new sentence, new line; - whitespace; - - jmc@cvs.openbsd.org 2005/03/01 15:05:00 - [ssh-keygen.1] - whitespace; - - jmc@cvs.openbsd.org 2005/03/01 15:47:14 - [ssh-keyscan.1 ssh-keyscan.c] - sort options and sync usage(); - - jmc@cvs.openbsd.org 2005/03/01 17:19:35 - [scp.1 sftp.1] - add HashKnownHosts to -o list; - ok markus@ - - jmc@cvs.openbsd.org 2005/03/01 17:22:06 - [ssh.c] - sync usage() w/ man SYNOPSIS; - ok markus@ - - jmc@cvs.openbsd.org 2005/03/01 17:32:19 - [ssh-add.1] - sort options; - - jmc@cvs.openbsd.org 2005/03/01 18:15:56 - [ssh-keygen.1] - sort options (no attempt made at synopsis clean up though); - spelling (occurance -> occurrence); - use prompt before examples; - grammar; - - djm@cvs.openbsd.org 2005/03/02 01:00:06 - [sshconnect.c] - fix addition of new hashed hostnames when CheckHostIP=yes; - found and ok dtucker@ - - djm@cvs.openbsd.org 2005/03/02 01:27:41 - [ssh-keygen.c] - ignore hostnames with metachars when hashing; ok deraadt@ - - djm@cvs.openbsd.org 2005/03/02 02:21:07 - [ssh.1] - bz#987: mention ForwardX11Trusted in ssh.1, - reported by andrew.benham AT thus.net; ok deraadt@ - - (tim) [regress/agent-ptrace.sh] add another possible gdb error. - -20050301 - - (djm) OpenBSD CVS sync: - - otto@cvs.openbsd.org 2005/02/16 09:56:44 - [ssh.c] - Better diagnostic if an identity file is not accesible. ok markus@ djm@ - - djm@cvs.openbsd.org 2005/02/18 03:05:53 - [canohost.c] - better error messages for getnameinfo failures; ok dtucker@ - - djm@cvs.openbsd.org 2005/02/20 22:59:06 - [sftp.c] - turn on ssh batch mode when in sftp batch mode, patch from - jdmossh AT nand.net; - ok markus@ - - jmc@cvs.openbsd.org 2005/02/25 10:55:13 - [sshd.8] - add /etc/motd and $HOME/.hushlogin to FILES; - from michael knudsen; - - djm@cvs.openbsd.org 2005/02/28 00:54:10 - [ssh_config.5] - bz#849: document timeout on untrusted x11 forwarding sessions. Reported by - orion AT cora.nwra.com; ok markus@ - - djm@cvs.openbsd.org 2005/03/01 10:09:52 - [auth-options.c channels.c channels.h clientloop.c compat.c compat.h] - [misc.c misc.h readconf.c readconf.h servconf.c ssh.1 ssh.c ssh_config.5] - [sshd_config.5] - bz#413: allow optional specification of bind address for port forwardings. - Patch originally by Dan Astorian, but worked on by several people - Adds GatewayPorts=clientspecified option on server to allow remote - forwards to bind to client-specified ports. - - djm@cvs.openbsd.org 2005/03/01 10:40:27 - [hostfile.c hostfile.h readconf.c readconf.h ssh.1 ssh_config.5] - [sshconnect.c sshd.8] - add support for hashing host names and addresses added to known_hosts - files, to improve privacy of which hosts user have been visiting; ok - markus@ deraadt@ - - djm@cvs.openbsd.org 2005/03/01 10:41:28 - [ssh-keyscan.1 ssh-keyscan.c] - option to hash hostnames output by ssh-keyscan; ok markus@ deraadt@ - - djm@cvs.openbsd.org 2005/03/01 10:42:49 - [ssh-keygen.1 ssh-keygen.c ssh_config.5] - add tools for managing known_hosts files with hashed hostnames, including - hashing existing files and deleting hosts by name; ok markus@ deraadt@ - -20050226 - - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] - Remove two obsolete Cygwin #ifdefs. Patch from vinschen at redhat.com. - - (dtucker) [acconfig.h configure.ac openbsd-compat/bsd-misc.{c,h}] - Remove SETGROUPS_NOOP, was only used by Cygwin, which doesn't need it any - more. Patch from vinschen at redhat.com. - - (dtucker) [Makefile.in] Add a install-nosysconf target for installing the - binaries without the config files. Primarily useful for packaging. - Patch from phil at usc.edu. ok djm@ - -20050224 - - (djm) [configure.ac] in_addr_t test needs sys/types.h too - -20050222 - - (dtucker) [uidswap.c] Skip uid restore test on Cygwin. Patch from - vinschen at redhat.com. - -20050220 - - (dtucker) [LICENCE Makefile.in README.platform audit-bsm.c configure.ac - defines.h] Bug #125: Add *EXPERIMENTAL* BSM audit support. Configure - --with-audit=bsm to enable. Patch originally from Sun Microsystems, - parts by John R. Jackson. ok djm@ - - (dtucker) [configure.ac] Missing comma in AIX section, somehow causes - unrelated platforms to be configured incorrectly. - -20050216 - - (djm) write seed to temporary file and atomically rename into place; - ok dtucker@ - - (dtucker) [ssh-rand-helper.c] Provide seed_rng since it may be called - via mkstemp in some configurations. ok djm@ - - (dtucker) [auth-shadow.c] Prevent compiler warnings if "DAY" is defined - by the system headers. - - (dtucker) [configure.ac] Bug #893: check for libresolv early on Reliant - Unix; prevents problems relating to the location of -lresolv in the - link order. - - (dtucker) [session.c] Bug #918: store credentials from gssapi-with-mic - authentication early enough to be available to PAM session modules when - privsep=yes. Patch from deengert at anl.gov, ok'ed in principle by Sam - Hartman and similar to Debian's ssh-krb5 package. - - (dtucker) [configure.ac openbsd-compat/port-aix.{c,h}] Silence some more - compiler warnings on AIX. - -20050215 - - (dtucker) [config.sh.in] Collect oslevel -r too. - - (dtucker) [README.platform auth.c configure.ac loginrec.c - openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Bug #835: enable IPv6 - on AIX where possible (see README.platform for details) and work around - a misfeature of AIX's getnameinfo. ok djm@ - - (dtucker) [loginrec.c] Add missing #include. - -20050211 - - (dtucker) [configure.ac] Tidy up configure --help output. - - (dtucker) [openbsd-compat/fake-rfc2553.h] We now need EAI_SYSTEM too. - -20050210 - - (dtucker) [configure.ac] Bug #919: Provide visible feedback for the - --disable-etc-default-login configure option. - -20050209 - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2005/01/28 09:45:53 - [ssh_config] - Make it clear that the example entries in ssh_config are only some of the - commonly-used options and refer the user to ssh_config(5) for more - details; ok djm@ - - jmc@cvs.openbsd.org 2005/01/28 15:05:43 - [ssh_config.5] - grammar; - - jmc@cvs.openbsd.org 2005/01/28 18:14:09 - [ssh_config.5] - wording; - ok markus@ - - dtucker@cvs.openbsd.org 2005/01/30 11:18:08 - [monitor.c] - Make code match intent; ok djm@ - - dtucker@cvs.openbsd.org 2005/02/08 22:24:57 - [sshd.c] - Provide reason in error message if getnameinfo fails; ok markus@ - - (dtucker) [auth-passwd.c openbsd-compat/port-aix.c] Don't call - disable_forwarding() from compat library. Prevent linker errrors trying - to resolve it for binaries other than sshd. ok djm@ - - (dtucker) [configure.ac] Bug #854: prepend pwd to relative --with-ssl-dir - paths. ok djm@ - - (dtucker) [configure.ac session.c] Some platforms (eg some SCO) require - the username to be passed to the passwd command when changing expired - passwords. ok djm@ - -20050208 - - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the - regress tests so newer versions of GNU head(1) behave themselves. Patch - by djm, so ok me. - - (dtucker) [openbsd-compat/port-aix.c] Silence compiler warnings. - - (dtucker) [audit.c audit.h auth.c auth1.c auth2.c loginrec.c monitor.c - monitor_wrap.c monitor_wrap.h session.c sshd.c]: Prepend all of the audit - defines and enums with SSH_ to prevent namespace collisions on some - platforms (eg AIX). - -20050204 - - (dtucker) [monitor.c] Permit INVALID_USER audit events from slave too. - - (dtucker) [auth.c] Fix parens in audit log check. - -20050202 - - (dtucker) [configure.ac openbsd-compat/realpath.c] Sync up with realpath - rev 1.11 from OpenBSD and make it use fchdir if available. ok djm@ - - (dtucker) [auth.c loginrec.h openbsd-compat/{bsd-cray,port-aix}.{c,h}] - Make record_failed_login() call provide hostname rather than having the - implementations having to do lookups themselves. Only affects AIX and - UNICOS (the latter only uses the "user" parameter anyway). ok djm@ - - (dtucker) [session.c sshd.c] Bug #445: Propogate KRB5CCNAME if set to child - the process. Since we also unset KRB5CCNAME at startup, if it's set after - authentication it must have been set by the platform's native auth system. - This was already done for AIX; this enables it for the general case. - - (dtucker) [auth.c canohost.c canohost.h configure.ac defines.h loginrec.c] - Bug #974: Teach sshd to write failed login records to btmp for failed auth - attempts (currently only for password, kbdint and C/R, only on Linux and - HP-UX), based on code from login.c from util-linux. With ashok_kovai at - hotmail.com, ok djm@ - - (dtucker) [Makefile.in auth.c auth.h auth1.c auth2.c loginrec.c monitor.c - monitor.h monitor_wrap.c monitor_wrap.h session.c sshd.c] Bug #125: - (first stage) Add audit instrumentation to sshd, currently disabled by - default. with suggestions from and ok djm@ - -20050201 - - (dtucker) [log.c] Bug #973: force log_init() to open syslog, since on some - platforms syslog will revert to its default values. This may result in - messages from external libraries (eg libwrap) being sent to a different - facility. - - (dtucker) [sshd_config.5] Bug #701: remove warning about - keyboard-interactive since this is no longer the case. - -20050124 - - (dtucker) OpenBSD CVS Sync - - otto@cvs.openbsd.org 2005/01/21 08:32:02 - [auth-passwd.c sshd.c] - Warn in advance for password and account expiry; initialize loginmsg - buffer earlier and clear it after privsep fork. ok and help dtucker@ - markus@ - - dtucker@cvs.openbsd.org 2005/01/22 08:17:59 - [auth.c] - Log source of connections denied by AllowUsers, DenyUsers, AllowGroups and - DenyGroups. bz #909, ok djm@ - - djm@cvs.openbsd.org 2005/01/23 10:18:12 - [cipher.c] - config option "Ciphers" should be case-sensitive; ok dtucker@ - - dtucker@cvs.openbsd.org 2005/01/24 10:22:06 - [scp.c sftp.c] - Have scp and sftp wait for the spawned ssh to exit before they exit - themselves. This prevents ssh from being unable to restore terminal - modes (not normally a problem on OpenBSD but common with -Portable - on POSIX platforms). From peak at argo.troja.mff.cuni.cz (bz#950); - ok djm@ markus@ - - dtucker@cvs.openbsd.org 2005/01/24 10:29:06 - [moduli] - Import new moduli; requested by deraadt@ a week ago - - dtucker@cvs.openbsd.org 2005/01/24 11:47:13 - [auth-passwd.c] - #if -> #ifdef so builds without HAVE_LOGIN_CAP work too; ok djm@ otto@ - -20050120 - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/12/23 17:35:48 - [session.c] - check for NULL; from mpech - - markus@cvs.openbsd.org 2004/12/23 17:38:07 - [ssh-keygen.c] - leak; from mpech - - djm@cvs.openbsd.org 2004/12/23 23:11:00 - [servconf.c servconf.h sshd.c sshd_config sshd_config.5] - bz #898: support AddressFamily in sshd_config. from - peak@argo.troja.mff.cuni.cz; ok deraadt@ - - markus@cvs.openbsd.org 2005/01/05 08:51:32 - [sshconnect.c] - remove dead code, log connect() failures with level error, ok djm@ - - jmc@cvs.openbsd.org 2005/01/08 00:41:19 - [sshd_config.5] - `login'(n) -> `log in'(v); - - dtucker@cvs.openbsd.org 2005/01/17 03:25:46 - [moduli.c] - Correct spelling: SCHNOOR->SCHNORR; ok djm@ - - dtucker@cvs.openbsd.org 2005/01/17 22:48:39 - [sshd.c] - Make debugging output continue after reexec; ok djm@ - - dtucker@cvs.openbsd.org 2005/01/19 13:11:47 - [auth-bsdauth.c auth2-chall.c] - Have keyboard-interactive code call the drivers even for responses for - invalid logins. This allows the drivers themselves to decide how to - handle them and prevent leaking information where possible. Existing - behaviour for bsdauth is maintained by checking authctxt->valid in the - bsdauth driver. Note that any third-party kbdint drivers will now need - to be able to handle responses for invalid logins. ok markus@ - - djm@cvs.openbsd.org 2004/12/22 02:13:19 - [cipher-ctr.c cipher.c] - remove fallback AES support for old OpenSSL, as OpenBSD has had it for - many years now; ok deraadt@ - (Id sync only: Portable will continue to support older OpenSSLs) - - (dtucker) [auth-pam.c] Bug #971: Prevent leaking information about user - existence via keyboard-interactive/pam, in conjunction with previous - auth2-chall.c change; with Colin Watson and djm. - - (dtucker) [loginrec.h] Bug #952: Increase size of username field to 128 - bytes to prevent errors from login_init_entry() when the username is - exactly 64 bytes(!) long. From brhamon at cisco.com, ok djm@ - - (dtucker) [auth-chall.c auth.h auth2-chall.c] Bug #936: Remove pam from - the list of available kbdint devices if UsePAM=no. ok djm@ - -20050118 - - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement - "make survey" and "make send-survey". This will provide data on the - configure parameters, platform and platform features to the development - team, which will allow (among other things) better targetting of testing. - It's entirely voluntary and is off be default. ok djm@ - - (dtucker) [survey.sh.in] Remove any blank lines from the output of - ccver-v and ccver-V. - -20041220 - - (dtucker) [ssh-rand-helper.c] Fall back to command-based seeding if reading - from prngd is enabled at compile time but fails at run time, eg because - prngd is not running. Note that if you have prngd running when OpenSSH is - built, OpenSSL will consider itself internally seeded and rand-helper won't - be built at all unless explicitly enabled via --with-rand-helper. ok djm@ - - (dtucker) [regress/rekey.sh] Touch datafile before filling with dd, since - on some wacky platforms (eg old AIXes), dd will refuse to create an output - file if it doesn't exist. - -20041213 - - (dtucker) [contrib/findssh.sh] Clean up on interrupt; from - amarendra.godbole at ge com. - -20041211 - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/12/06 16:00:43 - [bufaux.c] - use 0x00 not \0 since buf[] is a bignum - - fgsch@cvs.openbsd.org 2004/12/10 03:10:42 - [sftp.c] - - fix globbed ls for paths the same lenght as the globbed path when - we have a unique matching. - - fix globbed ls in case of a directory when we have a unique matching. - - as a side effect, if the path does not exist error (used to silently - ignore). - - don't do extra do_lstat() if we only have one matching file. - djm@ ok - - dtucker@cvs.openbsd.org 2004/12/11 01:48:56 - [auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h] - Fix debug call in error path of authorized_keys processing and fix related - warnings; ok djm@ - -20041208 - - (tim) [configure.ac] Comment some non obvious platforms in the - target-specific case statement. Suggested and OK by dtucker@ - -20041207 - - (dtucker) [regress/scp.sh] Use portable-friendly $DIFFOPTs in new test. - -20041206 - - (dtucker) [TODO WARNING.RNG] Update to reflect current reality. ok djm@ - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/11/25 22:22:14 - [sftp-client.c sftp.c] - leak; from mpech - - jmc@cvs.openbsd.org 2004/11/29 00:05:17 - [sftp.1] - missing full stop; - - djm@cvs.openbsd.org 2004/11/29 07:41:24 - [sftp-client.h sftp.c] - Some small fixes from moritz@jodeit.org. ok deraadt@ - - jaredy@cvs.openbsd.org 2004/12/05 23:55:07 - [sftp.1] - - explain that patterns can be used as arguments in get/put/ls/etc - commands (prodded by Michael Knudsen) - - describe ls flags as a list - - other minor improvements - ok jmc, djm - - dtucker@cvs.openbsd.org 2004/12/06 11:41:03 - [auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h ssh.h sshd.8] - Discard over-length authorized_keys entries rather than complaining when - they don't decode. bz #884, with & ok djm@ - - (dtucker) OpenBSD CVS Sync (regress/) - - djm@cvs.openbsd.org 2004/06/26 06:16:07 - [reexec.sh] - don't change the name of the copied sshd for the reexec fallback test, - makes life simpler for portable - - dtucker@cvs.openbsd.org 2004/07/08 12:59:35 - [scp.sh] - Regress test for bz #863 (scp double-error), requires $SUDO. ok markus@ - - david@cvs.openbsd.org 2004/07/09 19:45:43 - [Makefile] - add a missing CLEANFILES used in the re-exec test - - djm@cvs.openbsd.org 2004/10/08 02:01:50 - [reexec.sh] - shrink and tidy; ok dtucker@ - - djm@cvs.openbsd.org 2004/10/29 23:59:22 - [Makefile added brokenkeys.sh] - regression test for handling of corrupt keys in authorized_keys file - - djm@cvs.openbsd.org 2004/11/07 00:32:41 - [multiplex.sh] - regression tests for new multiplex commands - - dtucker@cvs.openbsd.org 2004/11/25 09:39:27 - [test-exec.sh] - Remove obsolete RhostsAuthentication from test config; ok markus@ - - dtucker@cvs.openbsd.org 2004/12/06 10:49:56 - [test-exec.sh] - Check if TEST_SSH_SSHD is a full path to sshd before searching; ok markus@ - -20041203 - - (dtucker) OpenBSD CVS Sync - - jmc@cvs.openbsd.org 2004/11/07 17:42:36 - [ssh.1] - options sort, and whitespace; - - jmc@cvs.openbsd.org 2004/11/07 17:57:30 - [ssh.c] - usage(): - - add -O - - sync -S w/ manpage - - remove -h - - (dtucker) [auth1.c auth2.c] If the user successfully authenticates but is - subsequently denied by the PAM auth stack, send the PAM message to the - user via packet_disconnect (Protocol 1) or userauth_banner (Protocol 2). - ok djm@ - -20041107 - - (dtucker) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/11/05 12:19:56 - [sftp.c] - command editing and history support via libedit; ok markus@ - thanks to hshoexer@ and many testers on tech@ too - - djm@cvs.openbsd.org 2004/11/07 00:01:46 - [clientloop.c clientloop.h ssh.1 ssh.c] - add basic control of a running multiplex master connection; including the - ability to check its status and request it to exit; ok markus@ - - (dtucker) [INSTALL Makefile.in configure.ac] Add --with-libedit configure - option and supporting makefile bits and documentation. - -20041105 - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/08/30 09:18:08 - [LICENCE] - s/keygen/keyscan/ - - jmc@cvs.openbsd.org 2004/08/30 21:22:49 - [ssh-add.1 ssh.1] - .Xsession -> .xsession; - originally from a pr from f at obiit dot org, but missed by myself; - ok markus@ matthieu@ - - djm@cvs.openbsd.org 2004/09/07 23:41:30 - [clientloop.c ssh.c] - cleanup multiplex control socket on SIGHUP too, spotted by sturm@ - ok markus@ deraadt@ - - deraadt@cvs.openbsd.org 2004/09/15 00:46:01 - [ssh.c] - /* fallthrough */ is something a programmer understands. But - /* FALLTHROUGH */ is also understood by lint, so that is better. - - jaredy@cvs.openbsd.org 2004/09/15 03:25:41 - [sshd_config.5] - mention PrintLastLog only prints last login time for interactive - sessions, like PrintMotd mentions. - From Michael Knudsen, with wording changed slightly to match the - PrintMotd description. - ok djm - - mickey@cvs.openbsd.org 2004/09/15 18:42:27 - [sshd.c] - use less doubles in daemons; markus@ ok - - deraadt@cvs.openbsd.org 2004/09/15 18:46:04 - [scp.c] - scratch that do { } while (0) wrapper in this case - - djm@cvs.openbsd.org 2004/09/23 13:00:04 - [ssh.c] - correctly honour -n in multiplex client mode; spotted by sturm@ ok markus@ - - djm@cvs.openbsd.org 2004/09/25 03:45:14 - [sshd.c] - these printf args are no longer double; ok deraadt@ markus@ - - djm@cvs.openbsd.org 2004/10/07 10:10:24 - [scp.1 sftp.1 ssh.1 ssh_config.5] - document KbdInteractiveDevices; ok markus@ - - djm@cvs.openbsd.org 2004/10/07 10:12:36 - [ssh-agent.c] - don't unlink agent socket when bind() fails, spotted by rich AT - rich-paul.net, ok markus@ - - markus@cvs.openbsd.org 2004/10/20 11:48:53 - [packet.c ssh1.h] - disconnect for invalid (out of range) message types. - - djm@cvs.openbsd.org 2004/10/29 21:47:15 - [channels.c channels.h clientloop.c] - fix some window size change bugs for multiplexed connections: windows sizes - were not being updated if they had changed after ~^Z suspends and SIGWINCH - was not being processed unless the first connection had requested a tty; - ok markus - - djm@cvs.openbsd.org 2004/10/29 22:53:56 - [clientloop.c misc.h readpass.c ssh-agent.c] - factor out common permission-asking code to separate function; ok markus@ - - djm@cvs.openbsd.org 2004/10/29 23:56:17 - [bufaux.c bufaux.h buffer.c buffer.h] - introduce a new buffer API that returns an error rather than fatal()ing - when presented with bad data; ok markus@ - - djm@cvs.openbsd.org 2004/10/29 23:57:05 - [key.c] - use new buffer API to avoid fatal errors on corrupt keys in authorized_keys - files; ok markus@ - -20041102 - - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX - 10.x by testing for conflicts in shadow.h and undef'ing _INCLUDE__STDC__ - only if a conflict is detected. - -20041019 - - (dtucker) [uidswap.c] Don't test dropping of gids for the root user or - on Cygwin. Cygwin parts from vinschen at redhat com; ok djm@ - -20041016 - - (djm) [auth-pam.c] snprintf->strl*, fix server message length calculations; - ok dtucker@ - -20041006 - - (dtucker) [README.privsep] Bug #939: update info about HP-UX Trusted Mode - and other PAM platforms. - - (dtucker) [monitor_mm.c openbsd-compat/xmmap.c] Bug #940: cast constants - to void * to appease picky compilers (eg Tru64's "cc -std1"). - -20040930 - - (dtucker) [configure.ac] Set AC_PACKAGE_NAME. ok djm@ - -20040923 - - (dtucker) [openbsd-compat/bsd-snprintf.c] Previous change was off by one, - which could have caused the justification to be wrong. ok djm@ - -20040921 - - (dtucker) [openbsd-compat/bsd-snprintf.c] Check for max length too. - ok djm@ - - (dtucker) [contrib/cygwin/ssh-host-config] Update to match current Cygwin - install process. Patch from vinschen at redhat.com. - -20040912 - - (djm) [loginrec.c] Start KNF and tidy up of this long-neglected file. - No change in resultant binary - - (djm) [loginrec.c] __func__ifiy - - (djm) [loginrec.c] xmalloc - - (djm) [ssh.c sshd.c version.h] Don't divulge portable version in protocol - banner. Suggested by deraadt@, ok mouring@, dtucker@ - - (dtucker) [configure.ac] Fix incorrect quoting and tests for cross-compile. - Partly by & ok djm@. - -20040911 - - (djm) [ssh-agent.c] unifdef some cygwin code; ok dtucker@ - - (dtucker) [auth-pam.c auth-pam.h session.c] Bug #890: Send output from - failing PAM session modules to user then exit, similar to the way - /etc/nologin is handled. ok djm@ - - (dtucker) [auth-pam.c] Relocate sshpam_store_conv(), no code change. - - (djm) [auth2-kbdint.c auth2-none.c auth2-passwd.c auth2-pubkey.c] - Make cygwin code more consistent with that which surrounds it - - (dtucker) [auth-pam.c auth.h auth2-none.c auth2.c monitor.c monitor_wrap.c] - Bug #892: Send messages from failing PAM account modules to the client via - SSH2_MSG_USERAUTH_BANNER messages. Note that this will not happen with - SSH2 kbdint authentication, which need to be dealt with separately. ok djm@ - - (dtucker) [session.c] Bug #927: make .hushlogin silent again. ok djm@ - - (dtucker) [configure.ac] Bug #321: Add cross-compile support to configure. - Parts by chua at ayrnetworks.com, astrand at lysator.liu.se and me. ok djm@ - - (dtucker) [auth-krb5.c] Bug #922: Pass KRB5CCNAME to PAM. From deengert - at anl.gov, ok djm@ - -20040830 - - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only - copy required environment variables on Cygwin. Patch from vinschen at - redhat.com, ok djm@ - - (dtucker) [regress/Makefile] Clean scp-ssh-wrapper.scp too. Patch from - vinschen at redhat.com. - - (dtucker) [Makefile.in contrib/ssh-copy-id] Bug #894: Improve portability - of shell constructs. Patch from cjwatson at debian.org. - -20040829 - - (dtucker) [openbsd-compat/getrrsetbyname.c] Prevent getrrsetbyname from - failing with NOMEMORY if no sigs are returned and malloc(0) returns NULL. - From Martin.Kraemer at Fujitsu-Siemens.com; ok djm@ - - (dtucker) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/08/23 11:48:09 - [authfile.c] - fix error path, spotted by Martin.Kraemer AT Fujitsu-Siemens.com; ok markus - - djm@cvs.openbsd.org 2004/08/23 11:48:47 - [channels.c] - typo, spotted by Martin.Kraemer AT Fujitsu-Siemens.com; ok markus - - dtucker@cvs.openbsd.org 2004/08/23 14:26:38 - [ssh-keysign.c ssh.c] - Use permanently_set_uid() in ssh and ssh-keysign for consistency, matches - change in Portable; ok markus@ (CVS ID sync only) - - dtucker@cvs.openbsd.org 2004/08/23 14:29:23 - [ssh-keysign.c] - Remove duplicate getuid(), suggested by & ok markus@ - - markus@cvs.openbsd.org 2004/08/26 16:00:55 - [ssh.1 sshd.8] - get rid of references to rhosts authentication; with jmc@ - - djm@cvs.openbsd.org 2004/08/28 01:01:48 - [sshd.c] - don't erroneously close stdin for !reexec case, from Dave Johnson; - ok markus@ - - (dtucker) [configure.ac] Include sys/stream.h in sys/ptms.h header check, - fixes configure warning on Solaris reported by wknox at mitre.org. - - (dtucker) [regress/multiplex.sh] Skip test on platforms that do not - support FD passing since multiplex requires it. Noted by tim@ - - (dtucker) [regress/dynamic-forward.sh] Allow time for connections to be torn - down, needed on some platforms, should be harmless on others. Patch from - jason at devrandom.org. - - (dtucker) [regress/scp.sh] Make this work on Cygwin too, which doesn't like - files ending in .exe that aren't binaries; patch from vinschen at redhat.com. - - (dtucker) [Makefile.in] Get regress/Makefile symlink right for out-of-tree - builds too, from vinschen at redhat.com. - - (dtucker) [regress/agent-ptrace.sh] Skip ptrace test on OSF1/DUnix/Tru64 - too; patch from cmadams at hiwaay.net. - - (dtucker) [configure.ac] Replace non-portable echo \n with extra echo. - - (dtucker) [openbsd-compat/port-aix.c] Bug #712: Explicitly check for - accounts with authentication configs that sshd can't support (ie - SYSTEM=NONE and AUTH1=something). - -20040828 - - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from - vinschen at redhat.com. - -20040823 - - (djm) [ssh-rand-helper.c] Typo. Found by - Martin.Kraemer AT Fujitsu-Siemens.com - - (djm) [loginrec.c] Typo and bad args in error messages; Spotted by - Martin.Kraemer AT Fujitsu-Siemens.com - -20040817 - - (dtucker) [regress/README.regress] Note compatibility issues with GNU head. - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/08/16 08:17:01 - [version.h] - 3.9 - - (djm) Crank RPM spec version numbers - - (djm) Release 3.9p1 - -20040816 - - (dtucker) [acconfig.h auth-pam.c configure.ac] Set real uid to non-root - to convince Solaris PAM to honour password complexity rules. ok djm@ - -20040815 - - (dtucker) [Makefile.in ssh-keysign.c ssh.c] Use permanently_set_uid() since - it does the right thing on all platforms. ok djm@ - - (djm) [acconfig.h configure.ac openbsd-compat/Makefile.in - openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-misc.c - openbsd-compat/bsd-misc.h openbsd-compat/openbsd-compat.h] Use smarter - closefrom() replacement from sudo; ok dtucker@ - - (djm) [loginrec.c] Check that seek succeeded here too; ok dtucker - - (dtucker) [Makefile.in] Fix typo. - -20040814 - - (dtucker) [auth-krb5.c gss-serv-krb5.c openbsd-compat/xmmap.c] - Explicitly set umask for mkstemp; ok djm@ - - (dtucker) [includes.h] Undef _INCLUDE__STDC__ on HP-UX, otherwise - prot.h and shadow.h provide conflicting declarations of getspnam. ok djm@ - - (dtucker) [loginrec.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h] - Plug AIX login recording into login_write so logins will be recorded for - all auth types. - -20040813 - - (dtucker) [openbsd-compat/bsd-misc.c] Typo in #ifdef; from vinschen at - redhat.com -- (dtucker) OpenBSD CVS Sync - - avsm@cvs.openbsd.org 2004/08/11 21:43:05 - [channels.c channels.h clientloop.c misc.c misc.h serverloop.c ssh-agent.c] - some signed/unsigned int comparison cleanups; markus@ ok - - avsm@cvs.openbsd.org 2004/08/11 21:44:32 - [authfd.c scp.c ssh-keyscan.c] - use atomicio instead of homegrown equivalents or read/write. - markus@ ok - - djm@cvs.openbsd.org 2004/08/12 09:18:24 - [sshlogin.c] - typo in error message, spotted by moritz AT jodeit.org (Id sync only) - - jakob@cvs.openbsd.org 2004/08/12 21:41:13 - [ssh-keygen.1 ssh.1] - improve SSHFP documentation; ok deraadt@ - - jmc@cvs.openbsd.org 2004/08/13 00:01:43 - [ssh-keygen.1] - kill whitespace at eol; - - djm@cvs.openbsd.org 2004/08/13 02:51:48 - [monitor_fdpass.c] - extra check for no message case; ok markus, deraadt, hshoexer, henning - - dtucker@cvs.openbsd.org 2004/08/13 11:09:24 - [servconf.c] - Fix line numbers off-by-one in error messages, from tortay at cc.in2p3.fr - ok markus@, djm@ - -20040812 - - (dtucker) [sshd.c] Remove duplicate variable imported during sync. - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/07/28 08:56:22 - [sshd.c] - call setsid() _before_ re-exec - - markus@cvs.openbsd.org 2004/07/28 09:40:29 - [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c - sshconnect1.c] - more s/illegal/invalid/ - - djm@cvs.openbsd.org 2004/08/04 10:37:52 - [dh.c] - return group14 when no primes found - fixes hang on empty /etc/moduli; - ok markus@ - - dtucker@cvs.openbsd.org 2004/08/11 11:09:54 - [servconf.c] - Fix minor leak; "looks right" deraadt@ - - dtucker@cvs.openbsd.org 2004/08/11 11:50:09 - [sshd.c] - Don't try to close startup_pipe if it's not open; ok djm@ - - djm@cvs.openbsd.org 2004/08/11 11:59:22 - [sshlogin.c] - check that lseek went were we told it to; ok markus@ - (Id sync only, but similar changes are needed in loginrec.c) - - djm@cvs.openbsd.org 2004/08/11 12:01:16 - [sshlogin.c] - make store_lastlog_message() static to appease -Wall; ok markus - - (dtucker) [sshd.c] Clear loginmsg in postauth monitor, prevents doubling - messages generated before the postauth privsep split. - -20040720 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/07/21 08:56:12 - [auth.c] - s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas, - miod, ... - - djm@cvs.openbsd.org 2004/07/21 10:33:31 - [auth1.c auth2.c] - bz#899: Don't display invalid usernames in setproctitle - from peak AT argo.troja.mff.cuni.cz; ok markus@ - - djm@cvs.openbsd.org 2004/07/21 10:36:23 - [gss-serv-krb5.c] - fix function declaration - - djm@cvs.openbsd.org 2004/07/21 11:51:29 - [canohost.c] - bz#902: cache remote port so we don't fatal() in auth_log when remote - connection goes away quickly. from peak AT argo.troja.mff.cuni.cz; - ok markus@ - - (djm) [auth-pam.c] Portable parts of bz#899: Don't display invalid - usernames in setproctitle from peak AT argo.troja.mff.cuni.cz; - -20040720 - - (djm) [log.c] bz #111: Escape more control characters when sending data - to syslog; from peak AT argo.troja.mff.cuni.cz - - (djm) [contrib/redhat/sshd.pam] bz #903: Remove redundant entries; from - peak AT argo.troja.mff.cuni.cz - - (djm) [regress/README.regress] Remove caveat regarding TCP wrappers, now - that sshd is fixed to behave better; suggested by tim - -20040719 - - (djm) [openbsd-compat/bsd-arc4random.c] Discard early keystream, like OpenBSD - ok dtucker@ - - (djm) [auth-pam.c] Avoid use of xstrdup and friends in conversation function, - instead return PAM_CONV_ERR, avoiding another path to fatal(); ok dtucker@ - - (tim) [configure.ac] updwtmpx() on OpenServer seems to add duplicate entry. - Report by rac AT tenzing.org - -20040717 - - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c - ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c - openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c. Reduces - diff vs OpenBSD; ok mouring@, tested by tim@ too. - - (dtucker) OpenBSD CVS Sync - - deraadt@cvs.openbsd.org 2004/07/11 17:48:47 - [channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c - readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c - session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h - sshd.c ttymodes.h] - spaces - - brad@cvs.openbsd.org 2004/07/12 23:34:25 - [ssh-keyscan.1] - Fix incorrect macro, .I -> .Em - From: Eric S. Raymond - ok jmc@ - - dtucker@cvs.openbsd.org 2004/07/17 05:31:41 - [monitor.c monitor_wrap.c session.c session.h sshd.c sshlogin.c] - Move "Last logged in at.." message generation to the monitor, right - before recording the new login. Fixes missing lastlog message when - /var/log/lastlog is not world-readable and incorrect datestamp when - multiple sessions are used (bz #463); much assistance & ok markus@ - -20040711 - - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows - the monitor to properly clean up the PAM thread (Debian bug #252676). - -20040709 - - (tim) [contrib/cygwin/README] add minires-devel requirement. Patch from - vinschen AT redhat.com - -20040708 - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2004/07/03 05:11:33 - [sshlogin.c] (RCSID sync only, the corresponding code is not in Portable) - Use '\0' not 0 for string; ok djm@, deraadt@ - - dtucker@cvs.openbsd.org 2004/07/03 11:02:25 - [monitor_wrap.c] - Put s/key functions inside #ifdef SKEY same as monitor.c, - from des@freebsd via bz #330, ok markus@ - - dtucker@cvs.openbsd.org 2004/07/08 12:47:21 - [scp.c] - Prevent scp from skipping the file following a double-error. - bz #863, ok markus@ - -20040702 - - (dtucker) [mdoc2man.awk] Teach it to ignore .Bk -words, reported by - strube at physik3.gwdg.de a long time ago. - -20040701 - - (dtucker) [session.c] Call display_loginmsg again after do_pam_session. - Ensures messages from PAM modules are displayed when privsep=no. - - (dtucker) [auth-pam.c] Bug #705: Make arguments match PAM specs, fixes - warnings on compliant platforms. From paul.a.bolton at bt.com. ok djm@ - - (dtucker) [auth-pam.c] Bug #559 (last piece): Pass DISALLOW_NULL_AUTHTOK - to pam_authenticate for challenge-response auth too. Originally from - fcusack at fcusack.com, ok djm@ - - (tim) [buildpkg.sh.in] Add $REV to bump the package revision within - the same version. Handle the case where someone uses --with-privsep-user= - and the user name does not match the group name. ok dtucker@ - -20040630 - - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL - appdata_ptr to the conversation function. ok djm@ - - (djm) OpenBSD CVS Sync - - jmc@cvs.openbsd.org 2004/06/26 09:03:21 - [ssh.1] - - remove double word - - rearrange .Bk to keep SYNOPSIS nice - - -M before -m in options description - - jmc@cvs.openbsd.org 2004/06/26 09:11:14 - [ssh_config.5] - punctuation and grammar fixes. also, keep the options in order. - - jmc@cvs.openbsd.org 2004/06/26 09:14:40 - [sshd_config.5] - new sentence, new line; - - avsm@cvs.openbsd.org 2004/06/26 20:07:16 - [sshd.c] - initialise some fd variables to -1, djm@ ok - - djm@cvs.openbsd.org 2004/06/30 08:36:59 - [session.c] - unbreak TTY break, diagnosed by darren AT dazwin.com; ok markus@ - -20040627 - - (tim) update README files. - - (dtucker) [mdoc2man.awk] Bug #883: correctly recognise .Pa and .Ev macros. - - (dtucker) [regress/README.regress] Document new variables. - - (dtucker) [acconfig.h configure.ac sftp-server.c] Bug #823: add sftp - rename handling for Linux which returns EPERM for link() on (at least some) - filesystems that do not support hard links. sftp-server will fall back to - stat+rename() in such cases. - - (dtucker) [openbsd-compat/port-aix.c] Missing __func__. - -20040626 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/06/25 18:43:36 - [sshd.c] - fix broken fd handling in the re-exec fallback path, particularly when - /dev/crypto is in use; ok deraadt@ markus@ - - djm@cvs.openbsd.org 2004/06/25 23:21:38 - [sftp.c] - bz #875: fix bad escape char error message; reported by f_mohr AT yahoo.de - -20040625 - - (dtucker) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/06/24 19:30:54 - [servconf.c servconf.h sshd.c] - re-exec sshd on accept(); initial work, final debugging and ok markus@ - - djm@cvs.openbsd.org 2004/06/25 01:16:09 - [sshd.c] - only perform tcp wrappers checks when the incoming connection is on a - socket. silences useless warnings from regress tests that use - proxycommand="sshd -i". prompted by david@ ok markus@ - - djm@cvs.openbsd.org 2004/06/24 19:32:00 - [regress/Makefile regress/test-exec.sh, added regress/reexec.sh] - regress test for re-exec corner cases - - djm@cvs.openbsd.org 2004/06/25 01:25:12 - [regress/test-exec.sh] - clean reexec-specific junk out of text-exec.sh and simplify; idea markus@ - - dtucker@cvs.openbsd.org 2004/06/25 05:38:48 - [sftp-server.c] - Fall back to stat+rename if filesystem doesn't doesn't support hard - links. bz#823, ok djm@ - - (dtucker) [configure.ac openbsd-compat/misc.c [openbsd-compat/misc.h] - Add closefrom() for platforms that don't have it. - - (dtucker) [sshd.c] add line missing from reexec sync. - -20040623 - - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1 - connections with empty passwords. Patch from davidwu at nbttech.com, - ok djm@ - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2004/06/22 22:42:02 - [regress/envpass.sh] - Add quoting for test -z; ok markus@ - - dtucker@cvs.openbsd.org 2004/06/22 22:45:52 - [regress/test-exec.sh] - Add TEST_SSH_SSHD_CONFOPTS and TEST_SSH_SSH_CONFOPTS to allow adding - arbitary options to sshd_config and ssh_config during tests. ok markus@ - - dtucker@cvs.openbsd.org 2004/06/22 22:55:56 - [regress/dynamic-forward.sh regress/test-exec.sh] - Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@ - - mouring@cvs.openbsd.org 2004/06/23 00:39:38 - [rijndael.c] - -Wshadow fix up s/encrypt/do_encrypt/. OK djm@, markus@ - - dtucker@cvs.openbsd.org 2004/06/23 14:31:01 - [ssh.c] - Fix counting in master/slave when passing environment variables; ok djm@ - - (dtucker) [cipher.c] encrypt->do_encrypt inside SSH_OLD_EVP to match - -Wshadow change. - - (bal) [Makefile.in] Remove opensshd.init on 'make distclean' - - (dtucker) [auth.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h] - Move loginrestrictions test to port-aix.c, replace with a generic hook. - - (tim) [regress/try-ciphers.sh] "if ! some_command" is not portable. - - (bal) [contrib/README] Removed "mdoc2man.pl" reference and added - reference to "findssl.sh" - -20040622 - - (dtucker) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/06/20 17:36:59 - [ssh.c] - filter passed env vars at slave in connection sharing case; ok markus@ - - djm@cvs.openbsd.org 2004/06/20 18:53:39 - [sftp.c] - make "ls -l" listings print user/group names, add "ls -n" to show uid/gid - (like /bin/ls); idea & ok markus@ - - djm@cvs.openbsd.org 2004/06/20 19:28:12 - [sftp.1] - mention new -n flag - - avsm@cvs.openbsd.org 2004/06/21 17:36:31 - [auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c - cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c - monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c - ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c - sshpty.c] - make ssh -Wshadow clean, no functional changes - markus@ ok - - djm@cvs.openbsd.org 2004/06/21 17:53:03 - [session.c] - fix fd leak for multiple subsystem connections; with markus@ - - djm@cvs.openbsd.org 2004/06/21 22:02:58 - [log.h] - mark fatal and cleanup exit as __dead; ok markus@ - - djm@cvs.openbsd.org 2004/06/21 22:04:50 - [sftp.c] - introduce sorting for ls, same options as /bin/ls; ok markus@ - - djm@cvs.openbsd.org 2004/06/21 22:30:45 - [sftp.c] - prefix ls option flags with LS_ - - djm@cvs.openbsd.org 2004/06/21 22:41:31 - [sftp.1] - document sort options - - djm@cvs.openbsd.org 2004/06/22 01:16:39 - [sftp.c] - don't show .files by default in ls, add -a option to turn them back on; - ok markus - - markus@cvs.openbsd.org 2004/06/22 03:12:13 - [regress/envpass.sh regress/multiplex.sh] - more portable env passing tests - - dtucker@cvs.openbsd.org 2004/06/22 05:05:45 - [monitor.c monitor_wrap.c] - Change login->username, will prevent -Wshadow errors in Portable; - ok markus@ - - (dtucker) [monitor.c] Fix Portable-specific -Wshadow warnings on "socket". - - (dtucker) [defines.h] Define __dead if not already defined. - - (bal) [auth-passwd.c auth1.c] Clean up unused variables. - -20040620 - - (tim) [configure.ac Makefile.in] Only change TEST_SHELL on broken platforms. - -20040619 - - (dtucker) [auth-pam.c] Don't use PAM namespace for - pam_password_change_required either. - - (tim) [configure.ac buildpkg.sh.in contrib/solaris/README] move opensshd - init script to top level directory. Add opensshd.init.in. - Remove contrib/solaris/buildpkg.sh, contrib/solaris/opensshd.in - -20040618 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/06/17 14:52:48 - [clientloop.c clientloop.h ssh.c] - support environment passing over shared connections; ok markus@ - - djm@cvs.openbsd.org 2004/06/17 15:10:14 - [clientloop.c misc.h readconf.c readpass.c ssh.c ssh_config.5] - Add option for confirmation (ControlMaster=ask) via ssh-askpass before - opening shared connections; ok markus@ - - djm@cvs.openbsd.org 2004/06/17 14:53:27 - [regress/multiplex.sh] - shared connection env passing regress test - - (dtucker) [regress/README.regress] Add detail on how to run a single - test from the top-level Makefile. - - (dtucker) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/06/17 23:56:57 - [ssh.1 ssh.c] - sync usage() and SYNPOSIS with connection sharing changes - - dtucker@cvs.openbsd.org 2004/06/18 06:13:25 - [sftp.c] - Use execvp instead of execv so sftp -S ssh works. "makes sense" markus@ - - dtucker@cvs.openbsd.org 2004/06/18 06:15:51 - [multiplex.sh] - Use -S for scp/sftp to force the use of the ssh being tested. - ok djm@,markus@ - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/06/18 10:40:19 - [ssh.c] - delay signal handler setup until we have finished talking to the master. - allow interrupting of setup (e.g. if master is stuck); ok markus@ - - markus@cvs.openbsd.org 2004/06/18 10:55:43 - [ssh.1 ssh.c] - trim synopsis for -S, allow -S and -oControlMaster, -MM means 'ask'; - ok djm - - djm@cvs.openbsd.org 2004/06/18 11:11:54 - [channels.c clientloop.c] - Don't explode in clientloop when we receive a bogus channel id, but - also don't generate them to begin with; ok markus@ - -20040617 - - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some - platforms), so test if diff understands it. Pointed out by tim@, ok djm@ - - (dtucker) OpenBSD CVS Sync regress/ - - dtucker@cvs.openbsd.org 2004/06/17 05:51:59 - [regress/multiplex.sh] - Remove datafile between and after tests, kill sshd rather than wait; - ok djm@ - - dtucker@cvs.openbsd.org 2004/06/17 06:00:05 - [regress/multiplex.sh] - Use DATA and COPY for test data rather than hard-coded paths; ok djm@ - - dtucker@cvs.openbsd.org 2004/06/17 06:19:06 - [regress/multiplex.sh] - Add small description of failing test to failure message; ok djm@ - - (dtucker) [regress/multiplex.sh] add EXEEXT for those platforms that need - it. - - (dtucker) [regress/multiplex.sh] Increase sleep time to 120 sec (60 is not - enough for slow systems, especially if they don't have a kernel RNG). - -20040616 - - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No - code changes. - - (dtucker) OpenBSD CVS Sync regress/ - - djm@cvs.openbsd.org 2004/04/27 09:47:30 - [regress/Makefile regress/test-exec.sh, added regress/envpass.sh] - regress test for environment passing, SendEnv & AcceptEnv options; - ok markus@ - - dtucker@cvs.openbsd.org 2004/06/13 13:51:02 - [regress/Makefile regress/test-exec.sh, added regress/scp-ssh-wrapper.sh - regress/scp.sh] - Add scp regression test; with & ok markus@ - - djm@cvs.openbsd.org 2004/06/13 15:04:08 - [regress/Makefile regress/test-exec.sh, added regress/envpass.sh] - regress test for client multiplexing; ok markus@ - - djm@cvs.openbsd.org 2004/06/13 15:16:54 - [regress/test-exec.sh] - remove duplicate setting of $SCP; spotted by markus@ - - dtucker@cvs.openbsd.org 2004/06/16 13:15:09 - [regress/scp.sh] - Make scp -r tests use diff -rN not cmp (which won't do dirs. ok markus@ - - dtucker@cvs.openbsd.org 2004/06/16 13:16:40 - [regress/multiplex.sh] - Silence multiplex sftp and scp tests. ok markus@ - - (dtucker) [regress/test-exec.sh] - Move Portable-only StrictModes to top of list to make syncs easier. - - (dtucker) [regress/README.regress] - Add $TEST_SHELL to readme. - -20040615 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/05/26 08:59:57 - [sftp.c] - exit -> _exit in forked child on error; from andrushock AT korovino.net - - markus@cvs.openbsd.org 2004/05/26 23:02:39 - [channels.c] - missing freeaddrinfo; Andrey Matveev - - dtucker@cvs.openbsd.org 2004/05/27 00:50:13 - [readconf.c] - Kill dead code after fatal(); ok djm@ - - dtucker@cvs.openbsd.org 2004/06/01 14:20:45 - [auth2-chall.c] - Remove redundant #include; ok markus@ - - pedro@cvs.openbsd.org 2004/06/03 12:22:20 - [sftp-client.c sftp.c] - initialize pointers, ok markus@ - - djm@cvs.openbsd.org 2004/06/13 12:53:24 - [dh.c dh.h kex.c kex.h kexdhc.c kexdhs.c monitor.c myproposal.h] - [ssh-keyscan.c sshconnect2.c sshd.c] - implement diffie-hellman-group14-sha1 kex method (trivial extension to - existing diffie-hellman-group1-sha1); ok markus@ - - dtucker@cvs.openbsd.org 2004/06/13 14:01:42 - [ssh.1 ssh_config.5 sshd_config.5] - List supported ciphers in man pages, tidy up ssh -c; - "looks fine" jmc@, ok markus@ - - djm@cvs.openbsd.org 2004/06/13 15:03:02 - [channels.c channels.h clientloop.c clientloop.h includes.h readconf.c] - [readconf.h scp.1 sftp.1 ssh.1 ssh.c ssh_config.5] - implement session multiplexing in the client (the server has supported - this since 2.0); ok markus@ - - djm@cvs.openbsd.org 2004/06/14 01:44:39 - [channels.c clientloop.c misc.c misc.h packet.c ssh-agent.c ssh-keyscan.c] - [sshd.c] - set_nonblock() instead of fnctl(...,O_NONBLOCK); "looks sane" deraadt@ - - djm@cvs.openbsd.org 2004/06/15 05:45:04 - [clientloop.c] - missed one unset_nonblock; spotted by Tim Rice - - (djm) Fix Makefile.in for connection sharing changes - - (djm) [ssh.c] Use separate var for address length - -20040603 - - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions. - ok djm@ - -20040601 - - (djm) [auth-pam.c] Add copyright for local changes - -20040530 - - (dtucker) [auth-pam.c auth-pam.h auth-passwd.c] Bug #874: Re-add PAM - support for PasswordAuthentication=yes. ok djm@ - - (dtucker) [auth-pam.c] Use an invalid password for root if - PermitRootLogin != yes or the login is invalid, to prevent leaking - information. Based on Openwall's owl-always-auth patch. ok djm@ - - (tim) [configure.ac Makefile.in] Add support for "make package" ok djm@ - - (tim) [buildpkg.sh.in] New file. A more flexible version of - contrib/solaris/buildpkg.sh used for "make package". - - (tim) [buildpkg.sh.in] Last minute fix didn't make it in the .in file. - -20040527 - - (dtucker) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec - contrib/README CREDITS INSTALL] Bug #873: Correct URLs for x11-ssh-askpass - and Jim Knoble's email address , from Jim himself. - -20040524 - - (dtucker) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/05/19 12:17:33 - [sftp-client.c sftp.c] - gracefully abort transfers on receipt of SIGINT, also ignore SIGINT while - waiting for a command; ok markus@ - - dtucker@cvs.openbsd.org 2004/05/20 10:58:05 - [clientloop.c] - Trivial type fix 0 -> '\0'; ok markus@ - - markus@cvs.openbsd.org 2004/05/21 08:43:03 - [kex.h moduli.c tildexpand.c] - add prototypes for -Wall; ok djm - - djm@cvs.openbsd.org 2004/05/21 11:33:11 - [channels.c channels.h clientloop.c serverloop.c ssh.1] - bz #756: add support for the cancel-tcpip-forward request for the server - and the client (through the ~C commandline). reported by z3p AT - twistedmatrix.com; ok markus@ - - djm@cvs.openbsd.org 2004/05/22 06:32:12 - [clientloop.c ssh.1] - use '-h' for help in ~C commandline instead of '-?'; inspired by jmc@ - - jmc@cvs.openbsd.org 2004/05/22 16:01:05 - [ssh.1] - kill whitespace at eol; - - dtucker@cvs.openbsd.org 2004/05/23 23:59:53 - [auth.c auth.h auth1.c auth2.c servconf.c servconf.h sshd_config - sshd_config.5] - Add MaxAuthTries sshd config option; ok markus@ - - (dtucker) [auth-pam.c] Bug #839: Ensure that pam authentication "thread" - is terminated if the privsep slave exits during keyboard-interactive - authentication. ok djm@ - - (dtucker) [sshd.c] Fix typo in comment. - -20040523 - - (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in - sshd_config; ok dtucker@ - - (djm) [configure.ac] Warn if the system has no known way of figuring out - which user is on the other end of a Unix domain socket; ok dtucker@ - - (bal) [openbsd-compat/sys-queue.h] Reintroduce machinary to handle - old/broken/incomplete . - -20040513 - - (dtucker) [configure.ac] Bug #867: Additional tests for res_query in - libresolv, fixes problems detecting it on some platforms - (eg Linux/x86-64). From Kurt Roeckx via Debian, ok mouring@ - - (dtucker) OpenBSD CVS Sync - - jmc@cvs.openbsd.org 2004/05/04 18:36:07 - [scp.1] - SendEnv here too; - - jmc@cvs.openbsd.org 2004/05/06 11:24:23 - [ssh_config.5] - typo from John Cosimano (PR 3770); - - deraadt@cvs.openbsd.org 2004/05/08 00:01:37 - [auth.c clientloop.c misc.h servconf.c ssh.c sshpty.h sshtty.c - tildexpand.c], removed: sshtty.h tildexpand.h - make two tiny header files go away; djm ok - - djm@cvs.openbsd.org 2004/05/08 00:21:31 - [clientloop.c misc.h readpass.c scard.c ssh-add.c ssh-agent.c ssh-keygen.c - sshconnect.c sshconnect1.c sshconnect2.c] removed: readpass.h - kill a tiny header; ok deraadt@ - - djm@cvs.openbsd.org 2004/05/09 00:06:47 - [moduli.c ssh-keygen.c] removed: moduli.h - zap another tiny header; ok deraadt@ - - djm@cvs.openbsd.org 2004/05/09 01:19:28 - [OVERVIEW auth-rsa.c auth1.c kex.c monitor.c session.c sshconnect1.c - sshd.c] removed: mpaux.c mpaux.h - kill some more tiny files; ok deraadt@ - - djm@cvs.openbsd.org 2004/05/09 01:26:48 - [kex.c] - don't overwrite what we are trying to compute - - deraadt@cvs.openbsd.org 2004/05/11 19:01:43 - [auth.c auth2-none.c authfile.c channels.c monitor.c monitor_mm.c - packet.c packet.h progressmeter.c session.c openbsd-compat/xmmap.c] - improve some code lint did not like; djm millert ok - - dtucker@cvs.openbsd.org 2004/05/13 02:47:50 - [ssh-agent.1] - Add examples to ssh-agent.1, bz#481 from Ralf Hauser; ok deraadt@ - - (dtucker) [sshd.8] Bug #843: Add warning about PasswordAuthentication to - UsePAM section. Parts from djm@ and jmc@. - - (dtucker) [auth-pam.c scard-opensc.c] Tinderbox says auth-pam.c uses - readpass.h, grep says scard-opensc.c does too. Replace with misc.h. - - (dtucker) [openbsd-compat/getrrsetbyname.c] Check that HAVE_DECL_H_ERROR - is defined before using. - - (dtucker) [openbsd-compat/getrrsetbyname.c] Fix typo too: HAVE_DECL_H_ERROR - -> HAVE_DECL_H_ERRNO. - -20040502 - - (dtucker) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/04/22 11:56:57 - [moduli.c] - Bugzilla #850: Sophie Germain is the correct name of the French - mathematician, "Sophie Germaine" isn't; from Luc.Maisonobe@c-s.fr - - djm@cvs.openbsd.org 2004/04/27 09:46:37 - [readconf.c readconf.h servconf.c servconf.h session.c session.h ssh.c - ssh_config.5 sshd_config.5] - bz #815: implement ability to pass specified environment variables from - the client to the server; ok markus@ - - djm@cvs.openbsd.org 2004/04/28 05:17:10 - [ssh_config.5 sshd_config.5] - manpage fixes in envpass stuff from Brian Poole (raj AT cerias.purdue.edu) - - jmc@cvs.openbsd.org 2004/04/28 07:02:56 - [sshd_config.5] - remove unnecessary .Pp; - - jmc@cvs.openbsd.org 2004/04/28 07:13:42 - [sftp.1 ssh.1] - add SendEnv to -o list; - - dtucker@cvs.openbsd.org 2004/05/02 11:54:31 - [sshd.8] - Man page grammar fix (bz #858), from damerell at chiark.greenend.org.uk - via Debian; ok djm@ - - dtucker@cvs.openbsd.org 2004/05/02 11:57:52 - [ssh.1] - ConnectionTimeout -> ConnectTimeout, from m.a.ellis at ncl.ac.uk via - Debian. ok djm@ - - dtucker@cvs.openbsd.org 2004/05/02 23:02:17 - [sftp.1] - ConnectionTimeout -> ConnectTimeout here too, pointed out by jmc@ - - dtucker@cvs.openbsd.org 2004/05/02 23:17:51 - [scp.1] - ConnectionTimeout -> ConnectTimeout for scp.1 too. - -20040423 - - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno - as extern int if not already declared. Fixes compile errors on old SCO - platforms. ok tim@ - - (dtucker) [README.platform] List prereqs for building on Cygwin. - -20040421 - - (djm) Update config.guess and config.sub to autoconf-2.59 versions; ok tim@ - -20040420 - - (djm) OpenBSD CVS Sync - - henning@cvs.openbsd.org 2004/04/08 16:08:21 - [sshconnect2.c] - swap the last two parameters to TAILQ_FOREACH_REVERSE. matches what - FreeBSD and NetBSD do. - ok millert@ mcbride@ markus@ ho@, checked to not affect ports by naddy@ - - djm@cvs.openbsd.org 2004/04/18 23:10:26 - [readconf.c readconf.h ssh-keysign.c ssh.c] - perform strict ownership and modes checks for ~/.ssh/config files, - as these can be used to execute arbitrary programs; ok markus@ - NB. ssh will now exit when it detects a config with poor permissions - - djm@cvs.openbsd.org 2004/04/19 13:02:40 - [ssh.1 ssh_config.5] - document strict permission checks on ~/.ssh/config; prompted by, - with & ok jmc@ - - jmc@cvs.openbsd.org 2004/04/19 16:12:14 - [ssh_config.5] - kill whitespace at eol; - - djm@cvs.openbsd.org 2004/04/19 21:51:49 - [ssh.c] - fix idiot typo that i introduced in my last commit; - spotted by cschneid AT cschneid.com - - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for - above change - - (djm) [configure.ac] Check whether libroken is required when building - with Heimdal - -20040419 - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2004/02/29 22:04:45 - [regress/login-timeout.sh] - Use sudo when restarting daemon during test. ok markus@ - - dtucker@cvs.openbsd.org 2004/03/08 10:17:12 - [regress/login-timeout.sh] - Missing OBJ, from tim@. ok markus@ (Already fixed, ID sync only) - - djm@cvs.openbsd.org 2004/03/30 12:41:56 - [sftp-client.c] - sync comment with reality - - djm@cvs.openbsd.org 2004/03/31 21:58:47 - [canohost.c] - don't skip ip options check when UseDNS=no; ok markus@ (ID sync only) - - markus@cvs.openbsd.org 2004/04/01 12:19:57 - [scp.c] - limit trust between local and remote rcp/scp process, - noticed by lcamtuf; ok deraadt@, djm@ - -20040418 - - (dtucker) [auth-pam.c] Log username and source host for failed PAM - authentication attempts. With & ok djm@ - - (djm) [openbsd-compat/bsd-cygwin_util.c] Recent versions of Cygwin allow - change of user context without a password, so relax auth method - restrictions; from vinschen AT redhat.com; ok dtucker@ - -20040416 - - (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since - FAT/NTFS does not permit quotes in filenames. From vinschen at redhat.com - - (djm) [auth-krb5.c auth.h session.c] Explicitly refer to Kerberos ccache - file using FILE: method, fixes problems on Mac OSX. - Patch from simon@sxw.org.uk; ok dtucker@ - - (tim) [configure.ac] Set SETEUID_BREAKS_SETUID, BROKEN_SETREUID and - BROKEN_SETREGID for SCO OpenServer 3 - -20040412 - - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning - from bug #701 (text from jfh at cise.ufl.edu). - - (dtucker) [acconfig.h configure.ac defines.h] Bug #673: check for 4-arg - skeychallenge(), eg on NetBSD. ok mouring@ - - (dtucker) [auth-skey.c defines.h monitor.c] Make skeychallenge explicitly - 4-arg, with compatibility for 3-arg versions. From djm@, ok me. - - (djm) [configure.ac] Fix detection of libwrap on OpenBSD; ok dtucker@ - -20040408 - - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating - pty name on Linux 2.6.x systems. Patch from jpe at eisenmenger.org. - - (bal) [monitor.c monitor_wrap.c] Second try. Put the zlib.h headers - back and #undef TARGET_OS_MAC instead. (Bug report pending with Apple) - - (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and - simplify loginrec.c. ok tim@ - - (bal) [monitor.c monitor_wrap.c] Ok.. Last time. Promise. Tim suggested - limiting scope and dtucker@ agreed. - -20040407 - - (dtucker) [session.c] Flush stdout after displaying loginmsg. From - f_mohr at yahoo.de. - - (bal) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Check to see - if Krb5 library exports krb5_init_etc() since some OSes (like MacOS/X) - are starting to restrict it as internal since it is not needed by - developers any more. (Patch based on Apple tree) - - (bal) [monitor.c monitor_wrap.c] monitor_wrap.c] moved zlib.h higher since - krb5 on MacOS/X conflicts. There may be a better solution, but this will - work for now. - -20040406 - - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use - updwtmpx() on IRIX since it seems to clobber utmp. ok djm@ - - (dtucker) [configure.ac] Bug #816, #748 (again): Attempt to detect - broken getaddrinfo and friends on HP-UX. ok djm@ - -20040330 - - (dtucker) [configure.ac] Bug #811: Use "!" for LOCKED_PASSWD_PREFIX on - Linuxes, since that's what many use. ok djm@ - - (dtucker) [auth-pam.c] rename the_authctxt to sshpam_authctxt in auth-pam.c - to reduce potential confusion with the one in sshd.c. ok djm@ - - (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection; - with & ok dtucker@ - -20040327 - - (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent - duplicate login messages for mutli-session logins. ok djm@ - -20040322 - - (djm) [sshd.c] Drop supplemental groups if started as root - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/03/09 22:11:05 - [ssh.c] - increase x11 cookie lifetime to 20 minutes; ok djm - - markus@cvs.openbsd.org 2004/03/10 09:45:06 - [ssh.c] - trim usage to match ssh(1) and look more like unix. ok djm@ - - markus@cvs.openbsd.org 2004/03/11 08:36:26 - [sshd.c] - trim usage; ok deraadt - - markus@cvs.openbsd.org 2004/03/11 10:21:17 - [ssh.c sshd.c] - ssh, sshd: sync version output, ok djm - - markus@cvs.openbsd.org 2004/03/20 10:40:59 - [version.h] - 3.8.1 - - (djm) Crank RPM spec versions - -20040311 - - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker - -20040310 - - (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #812: #undef getaddrinfo - before redefining it, silences warnings on Tru64. - -20040308 - - (dtucker) [sshd.c] Back out rev 1.270 as it caused problems on some - platforms (eg SCO, HP-UX) with logging in the wrong TZ. ok djm@ - - (dtucker) [configure.ac sshd.c openbsd-compat/bsd-misc.h - openbsd-compat/setenv.c] Unset KRB5CCNAME on AIX to prevent it from being - inherited by the child. ok djm@ - - (dtucker) [auth-pam.c auth-pam.h auth1.c auth2.c monitor.c monitor_wrap.c - monitor_wrap.h] Bug #808: Ensure force_pwchange is correctly initialized - even if keyboard-interactive is not used by the client. Prevents - segfaults in some cases where the user's password is expired (note this - is not considered a security exposure). ok djm@ - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/03/03 06:47:52 - [sshd.c] - change proctiltle after accept(2); ok henning, deraadt, djm - - djm@cvs.openbsd.org 2004/03/03 09:30:42 - [sftp-client.c] - Don't print duplicate messages when progressmeter is off - Spotted by job317 AT mailvault.com; ok markus@ - - djm@cvs.openbsd.org 2004/03/03 09:31:20 - [sftp.c] - Fix initialisation of progress meter; ok markus@ - - markus@cvs.openbsd.org 2004/03/05 10:53:58 - [readconf.c readconf.h scp.1 sftp.1 ssh.1 ssh_config.5 sshconnect2.c] - add IdentitiesOnly; ok djm@, pb@ - - djm@cvs.openbsd.org 2004/03/08 09:38:05 - [ssh-keyscan.c] - explicitly initialise remote_major and remote_minor. - from cjwatson AT debian.org; ok markus@ - - dtucker@cvs.openbsd.org 2004/03/08 10:18:57 - [sshd_config.5] - Document KerberosGetAFSToken; ok markus@ - - (tim) [regress/README.regress] Document ssh-rand-helper issue. ok bal - -20040307 - - (tim) [regress/login-timeout.sh] fix building outside of source tree. - -20040304 - - (dtucker) [auth-pam.c] Don't try to export PAM when compiled with - -DUSE_POSIX_THREADS. From antoine.verheijen at ualbert ca. ok djm@ - - (dtucker) [auth-pam.c] Reset signal status when starting pam auth thread, - prevent hanging during PAM keyboard-interactive authentications. ok djm@ - - (dtucker) [auth-passwd.c auth-sia.c auth-sia.h defines.h - openbsd-compat/xcrypt.c] Bug #802: Fix build error on Tru64 when - configured --with-osfsia. ok djm@ - -20040303 - - (djm) [configure.ac ssh-agent.c] Use prctl to prevent ptrace on ssh-agent - ok dtucker - -20040229 - - (tim) [configure.ac] Put back bits mistakenly removed from Rev 1.188 - -20040229 - - (dtucker) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/02/25 00:22:45 - [sshd.c] - typo in comment - - dtucker@cvs.openbsd.org 2004/02/27 22:42:47 - [dh.c] - Prevent sshd from sending DH groups with a primitive generator of zero or - one, even if they are listed in /etc/moduli. ok markus@ - - dtucker@cvs.openbsd.org 2004/02/27 22:44:56 - [dh.c] - Make /etc/moduli line buffer big enough for 8kbit primes, in case anyone - ever uses one. ok markus@ - - dtucker@cvs.openbsd.org 2004/02/27 22:49:27 - [dh.c] - Reset bit counter at the right time, fixes debug output in the case where - the DH group is rejected. ok markus@ - - dtucker@cvs.openbsd.org 2004/02/17 08:23:20 - [regress/Makefile regress/login-timeout.sh] - Add regression test for LoginGraceTime; ok markus@ - - markus@cvs.openbsd.org 2004/02/24 16:56:30 - [regress/test-exec.sh] - allow arguments in ${TEST_SSH_XXX} - - markus@cvs.openbsd.org 2004/02/24 17:06:52 - [regress/ssh-com-client.sh regress/ssh-com-keygen.sh - regress/ssh-com-sftp.sh regress/ssh-com.sh] - test against recent ssh.com releases - - dtucker@cvs.openbsd.org 2004/02/28 12:16:57 - [regress/dynamic-forward.sh] - Make dynamic-forward understand nc's new output. ok markus@ - - dtucker@cvs.openbsd.org 2004/02/28 13:44:45 - [regress/try-ciphers.sh] - Test acss too; ok markus@ - - (dtucker) [regress/try-ciphers.sh] Skip acss if not compiled in (eg if we - built with openssl < 0.9.7) - -20040226 - - (bal) KNF our sshlogin.c even if the code looks nothing like upstream - code due to diversity issues. - -20040225 - - (djm) Trim ChangeLog - - (djm) Don't specify path to PAM modules in Redhat sshd.pam; from Fedora - -20040224 - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/02/19 21:15:04 - [sftp-server.c] - switch to new license.template - - markus@cvs.openbsd.org 2004/02/23 12:02:33 - [sshd.c] - backout revision 1.279; set listen socket to non-block; ok henning. - - markus@cvs.openbsd.org 2004/02/23 15:12:46 - [bufaux.c] - encode 0 correctly in buffer_put_bignum2; noted by Mikulas Patocka - and drop support for negative BNs; ok otto@ - - markus@cvs.openbsd.org 2004/02/23 15:16:46 - [version.h] - enter 3.8 - - (dtucker) [configure.ac gss-serv-krb5.c ssh-gss.h] Define GSSAPI when found - with krb5-config, hunt down gssapi.h and friends. Based partially on patch - from deengert at anl.gov. ok djm@ - - (djm) [groupaccess.c uidswap.c] Bug #787: Size group arrays at runtime - using sysconf() if available Based on patches from - holger AT van-lengerich.de and openssh_bugzilla AT hockin.org - - (dtucker) [uidswap.c] Minor KNF. ok djm@ - - (tim) [openbsd-compat/getrrsetbyname.c] Make gcc 2.7.2.3 happy. ok djm@ - - (djm) Crank RPM spec versions - - (dtucker) [README] Add pointer to release notes. ok djm@ - - (dtucker) {README.platform] Add platform-specific notes. - - (tim) [configure.ac] SCO3 needs -lcrypt_i for -lprot - - (djm) Release 3.8p1 - -20040223 - - (dtucker) [session.c] Bug #789: Only make setcred call for !privsep in the - non-interactive path. ok djm@ - -20040222 - - (dtucker) [auth-shadow.c auth.c auth.h] Move shadow account expiry test - to auth-shadow.c, no functional change. ok djm@ - - (dtucker) [auth-shadow.c auth.h] Provide warnings of impending account or - password expiry. ok djm@ - - (dtucker) [auth-passwd.c] Only check password expiry once. Prevents - multiple warnings if a wrong password is entered. - - (dtucker) [configure.ac] Apply krb5-config --libs fix to non-gssapi path - too. - -20040220 - - (djm) [openbsd-compat/setproctitle.c] fix comments; from grange@ - -20040218 - - (dtucker) [configure.ac] Handle case where krb5-config --libs returns a - path with a "-" in it. From Sergio.Gelato at astro.su.se. - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/02/17 07:17:29 - [sftp-glob.c sftp.c] - Remove useless headers; ok deraadt@ - - djm@cvs.openbsd.org 2004/02/17 11:03:08 - [sftp.c] - sftp.c and sftp-int.c, together at last; ok markus@ - - jmc@cvs.openbsd.org 2004/02/17 19:35:21 - [sshd_config.5] - remove cruft left over from RhostsAuthentication removal; - ok markus@ - - (djm) [log.c] Correct use of HAVE_OPENLOG_R - - (djm) [log.c] Tighten openlog_r tests - -20040217 - - (djm) Simplify the license on code I have written. No code changes. - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/02/17 05:39:51 - [sftp-client.c sftp-client.h sftp-glob.c sftp-glob.h sftp-int.c] - [sftp-int.h sftp.c] - switch to license.template for code written by me (belated, I know...) - - (djm) Bug #698: Specify FILE: for KRB5CCNAME; patch from - stadal@suse.cz and simon@sxw.org.uk - - (dtucker) [auth-pam.c] Tidy up PAM debugging. ok djm@ - - (dtucker) [auth-pam.c] Store output from pam_session and pam_setcred for - display after login. Should fix problems like pam_motd not displaying - anything, noticed by cjwatson at debian.org. ok djm@ - -20040212 - - (tim) [Makefile.in regress/sftp-badcmds.sh regress/test-exec.sh] - Portablity fixes. Data sftp transfers needs to be world readable. Some - older shells hang on while loops when doing sh -n some_script. OK dtucker@ - - (tim) [configure.ac] Make sure -lcrypto is before -lsocket for sco3. - ok mouring@ - -20040211 - - (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check - if HAS_SHADOW_EXPIRY is set. - - (tim) [configure.ac] Fix comment to match code changes in ver 1.117 - -20040210 - - (dtucker) [auth-passwd.c auth.h openbsd-compat/port-aix.c - openbsd-compat/port-aix.h] Bug #14: Use do_pwchange to support AIX's - native password expiry. - - (dtucker) [LICENCE Makefile.in auth-passwd.c auth-shadow.c auth.c auth.h - defines.h] Bug #14: Use do_pwchange to support password expiry and force - change for platforms using /etc/shadow. ok djm@ - - (dtucker) [openbsd-compat/fake-rfc2553.h] Bug #563: Prepend ssh_ to compat - functions to avoid conflicts with Heimdal's libroken. ok djm@ - - (dtucker) [auth-pam.c auth-pam.h session.c] Bug #14: Use do_pwchange to - change expired PAM passwords for SSHv1 connections without privsep. - pam_chauthtok is still used when privsep is disabled. ok djm@ - - (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Move - include from port-aix.h to port-aix.c and remove unnecessary function - definition. Fixes build errors on AIX. - - (dtucker) [configure.ac loginrec.c] Bug #464: Use updwtmpx on platforms - that support it. from & ok mouring@ - - (dtucker) [configure.ac] Bug #345: Do not disable utmp on HP-UX 10.x. - ok djm@ - -20040207 - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2004/02/06 23:41:13 - [cipher-ctr.c] - Use EVP_CIPHER_CTX_key_length for key length. ok markus@ - (This will fix builds with OpenSSL 0.9.5) - - (dtucker) [cipher.c] enable AES counter modes with OpenSSL 0.9.5. - ok djm@, markus@ - -20040206 - - (dtucker) [acss.c acss.h] Fix $Id tags. - - (dtucker) [cipher-acss.c cipher.c] Enable acss only if building with - OpenSSL >= 0.9.7. ok djm@ - - (dtucker) [session.c] Bug #789: Do not call do_pam_setcred as a non-root - user, since some modules might fail due to lack of privilege. ok djm@ - - (dtucker) [configure.ac] Bug #748: Always define BROKEN_GETADDRINFO - for HP-UX 11.11. If there are known-good configs where this is not - required, please report them. ok djm@ - - (dtucker) [sshd.c] Bug #757: Clear child's environment to prevent - accidentally inheriting from root's environment. ok djm@ - - (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Bug #796: - Restore previous authdb setting after auth calls. Fixes problems with - setpcred failing on accounts that use AFS or NIS password registries. - - (dtucker) [configure.ac includes.h] Include if present, - required on Solaris 2.5.1 for queue_t, which is used by . - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2004/01/30 09:48:57 - [auth-passwd.c auth.h pathnames.h session.c] - support for password change; ok dtucker@ - (set password-dead=1w in login.conf to use this). - In -Portable, this is currently only platforms using bsdauth. - - dtucker@cvs.openbsd.org 2004/02/05 05:37:17 - [monitor.c sshd.c] - Pass SIGALRM through to privsep child if LoginGraceTime expires. ok markus@ - - markus@cvs.openbsd.org 2004/02/05 15:33:33 - [progressmeter.c] - fix ETA for > 4GB; bugzilla #791; ok henning@ deraadt@ - -20040129 - - (dtucker) OpenBSD CVS Sync regress/ - - dtucker@cvs.openbsd.org 2003/10/11 11:49:49 - [Makefile banner.sh] - Test missing banner file, suppression of banner with ssh -q, check return - code from ssh. ok markus@ - - jmc@cvs.openbsd.org 2003/11/07 10:16:44 - [ssh-com.sh] - adress -> address, and a few more; all from Jonathon Gray; - - djm@cvs.openbsd.org 2004/01/13 09:49:06 - [sftp-batch.sh] - - (dtucker) [configure.ac] Add --without-zlib-version-check. Feedback from - tim@, ok several - - (dtucker) [configure.ac openbsd-compat/bsd-cray.c openbsd-compat/bsd-cray.h] - Bug #775: Cray fixes from wendy at cray.com - -20040128 - - (dtucker) [regress/README.regress] Add tcpwrappers issue, noted by tim@ - - (dtucker) [moduli] Import new moduli file from OpenBSD. - -20040127 - - (djm) OpenBSD CVS Sync - - hshoexer@cvs.openbsd.org 2004/01/23 17:06:03 - [cipher.c] - enable acss for ssh - ok deraadt@ markus@ - - mouring@cvs.openbsd.org 2004/01/23 17:57:48 - [sftp-int.c] - Fix issue pointed out with ls not handling large directories - with embeded paths correctly. OK damien@ - - hshoexer@cvs.openbsd.org 2004/01/23 19:26:33 - [cipher.c] - rename acss@opebsd.org to acss@openssh.org - ok deraadt@ - - djm@cvs.openbsd.org 2004/01/25 03:49:09 - [sshconnect.c] - reset nonblocking flag after ConnectTimeout > 0 connect; (bugzilla #785) - from jclonguet AT free.fr; ok millert@ - - djm@cvs.openbsd.org 2004/01/27 10:08:10 - [sftp.c] - reorder parsing so user:skey@host:file works (bugzilla #777) - patch from admorten AT umich.edu; ok markus@ - - (djm) [acss.c acss.h cipher-acss.c] Portable support for ACSS - if libcrypto lacks it - -20040126 - - (tim) Typo in regress/README.regress - - (tim) [regress/test-exec.sh] RhostsAuthentication is deprecated. - - (tim) [defines.h] Add defines for HFIXEDSZ and T_SIG - - (tim) [configure.ac includes.h] add for grantpt() and friends. - - (tim) [defines.h openbsd-compat/getrrsetbyname.h] Move defines for HFIXEDSZ - and T_SIG to getrrsetbyname.h - -20040124 - - (djm) Typo in openbsd-compat/bsd-openpty.c; from wendyp AT cray.com - -20040123 - - (djm) Do pam_session processing for systems with HAVE_LOGIN_CAP; from - ralf.hack AT pipex.net; ok dtucker@ - - (djm) Bug #776: Update contrib/redhat/openssh.spec to dynamically detect - Kerberos location (and thus work with Fedora Core 1); - from jason AT devrandom.org - - (dtucker) [configure.ac] Bug #788: Test for zlib.h presence and for - zlib >= 1.1.4. Partly from jbasney at ncsa.uiuc.edu. ok djm@ - - (dtucker) [contrib/cygwin/README] Document new ssh-host-config options. - Patch from vinschen at redhat.com. - - (dtucker) [acconfig.h configure.ac includes.h servconf.c session.c] - Change AFS symbol to USE_AFS to prevent namespace collisions, do not - include kafs.h unless necessary. From deengert at anl.gov. - - (tim) [configure.ac] Remove hard coded -L/usr/local/lib and - -I/usr/local/include. Users can do LDFLAGS="-L/usr/local/lib" \ - CPPFLAGS="-I/usr/local/include" ./configure if needed. - -20040122 - - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/ - GSSAPI detection, libs and includes. ok djm@ - - (dtucker) [session.c] Enable AFS support in conjunction with KRB5 not - just HEIMDAL. - - (tim) [contrib/solaris/buildpkg.sh] Allow for the possibility of - /usr/local being a symbolic link. Fixes problem reported by Henry Grebler. - -20040121 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2004/01/13 09:25:05 - [sftp-int.c sftp.1 sftp.c] - Tidy sftp batchmode handling, eliminate junk to stderr (bugzilla #754) and - enable use of "-b -" to accept batchfile from stdin; ok markus@ - - jmc@cvs.openbsd.org 2004/01/13 12:17:33 - [sftp.1] - remove unnecessary Ic's; - kill whitespace at EOL; - ok djm@ - - markus@cvs.openbsd.org 2004/01/13 19:23:15 - [compress.c session.c] - -Wall; ok henning - - markus@cvs.openbsd.org 2004/01/13 19:45:15 - [compress.c] - cast for portability; millert@ - - markus@cvs.openbsd.org 2004/01/19 09:24:21 - [channels.c] - fake consumption for half closed channels since the peer is waiting for - window adjust messages; bugzilla #790 Matthew Dillon; test + ok dtucker@ - reproduce with sh -c 'ulimit -f 10; ssh host -n od /bsd | cat > foo' - - markus@cvs.openbsd.org 2004/01/19 21:25:15 - [auth2-hostbased.c auth2-pubkey.c serverloop.c ssh-keysign.c sshconnect2.c] - fix mem leaks; some fixes from Pete Flugstad; tested dtucker@ - - djm@cvs.openbsd.org 2004/01/21 03:07:59 - [sftp.c] - initialise infile in main, rather than statically - from portable - - deraadt@cvs.openbsd.org 2004/01/11 21:55:06 - [sshpty.c] - for pty opening, only use the openpty() path. the other stuff only needs - to be in openssh-p; markus ok - - (djm) [openbsd-compat/bsd-openpty.c] Rework old sshpty.c code into an - openpty() replacement - -20040114 - - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits - unexpectedly. with & ok djm@ - - (dtucker) [auth-pam.c] Reset signal handler in pthread_cancel too, add - test for case where cleanup has already run. - - (dtucker) [auth-pam.c] Add minor debugging. - -20040113 - - (dtucker) [auth-pam.c] Relocate struct pam_ctxt and prototypes. No - functional changes. - -20040108 - - (dtucker) [auth-pam.c defines.h] Bug #783: move __unused to defines.h and - only define if not already. From des at freebsd.org. - - (dtucker) [configure.ac] Remove extra (typo) comma. - -20040105 - - (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails. Patch from - cjwatson at debian.org. - - (dtucker) [acconfig.h configure.ac includes.h servconf.c session.c] - Only enable KerberosGetAFSToken if Heimdal's libkafs is found. with jakob@ - -20040102 - - (djm) OSX/Darwin needs BIND_8_COMPAT to build getrrsetbyname. Report from - jakob@ - - (djm) Remove useless DNS support configure summary message. from jakob@ - - (djm) OSX/Darwin put the PAM headers in a different place, detect this. - Report from jakob@ - -20031231 - - (dtucker) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2003/12/22 09:16:58 - [moduli.c ssh-keygen.1 ssh-keygen.c] - tidy up moduli generation debugging, add -v (verbose/debug) option to - ssh-keygen; ok markus@ - - markus@cvs.openbsd.org 2003/12/22 20:29:55 - [cipher-3des1.c] - EVP_CIPHER_CTX_cleanup() for the des contexts; pruiksma@freesurf.fr - - jakob@cvs.openbsd.org 2003/12/23 16:12:10 - [servconf.c servconf.h session.c sshd_config] - implement KerberosGetAFSToken server option. ok markus@, beck@ - - millert@cvs.openbsd.org 2003/12/29 16:39:50 - [sshd_config] - KeepAlive has been obsoleted, use TCPKeepAlive instead; markus@ OK - - dtucker@cvs.openbsd.org 2003/12/31 00:24:50 - [auth2-passwd.c] - Ignore password change request during password auth (which we currently - don't support) and discard proposed new password. corrections/ok markus@ - - (dtucker) [configure.ac] Only test setresuid and setresgid if they exist. - -20031219 - - (dtucker) [defines.h] Bug #458: Define SIZE_T_MAX as UINT_MAX if we - typedef size_t ourselves. - -20031218 - - (dtucker) [configure.ac] Don't use setre[ug]id on DG-UX, from Tom Orban. - - (dtucker) [auth-pam.c] Do PAM chauthtok during SSH2 keyboard-interactive - authentication. Partially fixes bug #423. Feedback & ok djm@ - -20031217 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/12/09 15:28:43 - [serverloop.c] - make ClientKeepAlive work for ssh -N, too (no login shell requested). - 1) send a bogus channel request if we find a channel - 2) send a bogus global request if we don't have a channel - ok + test beck@ - - markus@cvs.openbsd.org 2003/12/09 17:29:04 - [sshd.c] - fix -o and HUP; ok henning@ - - markus@cvs.openbsd.org 2003/12/09 17:30:05 - [ssh.c] - don't modify argv for ssh -o; similar to sshd.c 1.283 - - markus@cvs.openbsd.org 2003/12/09 21:53:37 - [readconf.c readconf.h scp.1 servconf.c servconf.h sftp.1 ssh.1] - [ssh_config.5 sshconnect.c sshd.c sshd_config.5] - rename keepalive to tcpkeepalive; the old name causes too much - confusion; ok djm, dtucker; with help from jmc@ - - dtucker@cvs.openbsd.org 2003/12/09 23:45:32 - [clientloop.c] - Clear exit code when ssh -N is terminated with a SIGTERM. ok markus@ - - markus@cvs.openbsd.org 2003/12/14 12:37:21 - [ssh_config.5] - we don't support GSS KEX; from Simon Wilkinson - - markus@cvs.openbsd.org 2003/12/16 15:49:51 - [clientloop.c clientloop.h readconf.c readconf.h scp.1 sftp.1 ssh.1] - [ssh.c ssh_config.5] - application layer keep alive (ServerAliveInterval ServerAliveCountMax) - for ssh(1), similar to the sshd(8) option; ok beck@; with help from - jmc and dtucker@ - - markus@cvs.openbsd.org 2003/12/16 15:51:54 - [dh.c] - use <= instead of < in dh_estimate; ok provos/hshoexer; - do not return < DH_GRP_MIN - - (dtucker) [acconfig.h configure.ac uidswap.c] Bug #645: Check for - setres[ug]id() present but not implemented (eg some Linux/glibc - combinations). - - (bal) [openbsd-compat/bsd-misc.c] unset 'signal' defined if we are - using a real 'signal()' (Noticed by a NeXT Compile) - -20031209 - - (dtucker) OpenBSD CVS Sync - - matthieu@cvs.openbsd.org 2003/11/25 23:10:08 - [ssh-add.1] - ssh-add doesn't need to be a descendant of ssh-agent. Ok markus@, jmc@. - - djm@cvs.openbsd.org 2003/11/26 21:44:29 - [cipher-aes.c] - fix #ifdef before #define; ok markus@ - (RCS ID sync only, Portable already had this) - - markus@cvs.openbsd.org 2003/12/02 12:15:10 - [progressmeter.c] - improvments from andreas@: - * saner speed estimate for transfers that takes less than a second by - rounding the time to 1 second. - * when the transfer is finished calculate the actual total speed - rather than the current speed which is given during the transfer - - markus@cvs.openbsd.org 2003/12/02 17:01:15 - [channels.c session.c ssh-agent.c ssh.h sshd.c] - use SSH_LISTEN_BACKLOG (=128) in listen(2). - - djm@cvs.openbsd.org 2003/12/07 06:34:18 - [moduli.c] - remove unused debugging #define templates - - markus@cvs.openbsd.org 2003/12/08 11:00:47 - [kexgexc.c] - print requested group size in debug; ok djm - - dtucker@cvs.openbsd.org 2003/12/09 13:52:55 - [moduli.c] - Prevent ssh-keygen -T from outputting moduli with a generator of 0, since - they can't be used for Diffie-Hellman. Assistance and ok djm@ - - (dtucker) [ssh-keyscan.c] Sync RCSIDs, missed in SSH_SSFDMAX change below. - -20031208 - - (tim) [configure.ac] Bug 770. Fix --without-rpath. - -20031123 - - (djm) [canohost.c] Move IPv4inV6 mapped address normalisation to its own - function and call it unconditionally - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2003/11/23 23:17:34 - [ssh-keyscan.c] - from portable - use sysconf to detect fd limit; ok markus@ - (tidy diff by adding SSH_SSFDMAX macro to defines.h) - - djm@cvs.openbsd.org 2003/11/23 23:18:45 - [ssh-keygen.c] - consistency PATH_MAX -> MAXPATHLEN; ok markus@ - (RCS ID sync only) - - djm@cvs.openbsd.org 2003/11/23 23:21:21 - [scp.c] - from portable: rename clashing variable limit-> limit_rate; ok markus@ - (RCS ID sync only) - - dtucker@cvs.openbsd.org 2003/11/24 00:16:35 - [ssh.1 ssh.c] - Make ssh -k mean GSSAPIDelegateCredentials=no. Suggestion & ok markus@ - - (djm) Annotate OpenBSD-derived files in openbsd-compat/ with original - source file path (in OpenBSD tree). - -20031122 - - (dtucker) [channels.c] Make AIX write limit code clearer. Suggested by djm@ - - (dtucker) [auth-passwd.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h] - Move AIX specific password authentication code to port-aix.c, call - authenticate() until reenter flag is clear. - - (dtucker) [auth-sia.c configure.ac] Tru64 update from cmadams at hiwaay.net. - Use permanently_set_uid for SIA, only define DISABLE_FD_PASSING when SIA - is enabled, rely on SIA to check for locked accounts if enabled. ok djm@ - - (djm) [scp.c] Rename limitbw -> limit_rate to match upstreamed patch - - (djm) [sftp-int.c] Remove duplicated code from bogus sync - - (djm) [packet.c] Shuffle #ifdef to reduce conditionally compiled code - -20031121 - - (djm) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/11/20 11:39:28 - [progressmeter.c] - fix rounding errors; from andreas@ - - djm@cvs.openbsd.org 2003/11/21 11:57:03 - [everything] - unexpand and delete whitespace at EOL; ok markus@ - (done locally and RCS IDs synced) - -20031118 - - (djm) Fix early exit for root auth success when UsePAM=yes and - PermitRootLogin=no - - (dtucker) [auth-pam.c] Convert chauthtok_conv into a generic tty_conv, - and use it for do_pam_session. Fixes problems like pam_motd not - displaying anything. ok djm@ - - (dtucker) [auth-pam.c] Only use pam_putenv if our platform has it. ok djm@ - - (djm) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2003/11/18 00:40:05 - [serverloop.c] - Correct check for authctxt->valid. ok djm@ - - djm@cvs.openbsd.org 2003/11/18 10:53:07 - [monitor.c] - unbreak fake authloop for non-existent users (my screwup). Spotted and - tested by dtucker@; ok markus@ - -20031117 - - (djm) OpenBSD CVS Sync - - djm@cvs.openbsd.org 2003/11/03 09:03:37 - [auth-chall.c] - make this a little more idiot-proof; ok markus@ - (includes portable-specific changes) - - jakob@cvs.openbsd.org 2003/11/03 09:09:41 - [sshconnect.c] - move changed key warning into warn_changed_key(). ok markus@ - - jakob@cvs.openbsd.org 2003/11/03 09:37:32 - [sshconnect.c] - do not free static type pointer in warn_changed_key() - - djm@cvs.openbsd.org 2003/11/04 08:54:09 - [auth1.c auth2.c auth2-pubkey.c auth.h auth-krb5.c auth-passwd.c] - [auth-rhosts.c auth-rh-rsa.c auth-rsa.c monitor.c serverloop.c] - [session.c] - standardise arguments to auth methods - they should all take authctxt. - check authctxt->valid rather then pw != NULL; ok markus@ - - jakob@cvs.openbsd.org 2003/11/08 16:02:40 - [auth1.c] - remove unused variable (pw). ok djm@ - (id sync only - still used in portable) - - jmc@cvs.openbsd.org 2003/11/08 19:17:29 - [sftp-int.c] - typos from Jonathon Gray; - - jakob@cvs.openbsd.org 2003/11/10 16:23:41 - [bufaux.c bufaux.h cipher.c cipher.h hostfile.c hostfile.h key.c] - [key.h sftp-common.c sftp-common.h sftp-server.c sshconnect.c sshd.c] - [ssh-dss.c ssh-rsa.c uuencode.c uuencode.h] - constify. ok markus@ & djm@ - - dtucker@cvs.openbsd.org 2003/11/12 10:12:15 - [scp.c] - When called with -q, pass -q to ssh; suppresses SSH2 banner. ok markus@ - - jakob@cvs.openbsd.org 2003/11/12 16:39:58 - [dns.c dns.h readconf.c ssh_config.5 sshconnect.c] - update SSHFP validation. ok markus@ - - jmc@cvs.openbsd.org 2003/11/12 20:14:51 - [ssh_config.5] - make verb agree with subject, and kill some whitespace; - - markus@cvs.openbsd.org 2003/11/14 13:19:09 - [sshconnect2.c] - cleanup and minor fixes for the client code; from Simon Wilkinson - - djm@cvs.openbsd.org 2003/11/17 09:45:39 - [msg.c msg.h sshconnect2.c ssh-keysign.c] - return error on msg send/receive failure (rather than fatal); ok markus@ - - markus@cvs.openbsd.org 2003/11/17 11:06:07 - [auth2-gss.c gss-genr.c gss-serv.c monitor.c monitor.h monitor_wrap.c] - [monitor_wrap.h sshconnect2.c ssh-gss.h] - replace "gssapi" with "gssapi-with-mic"; from Simon Wilkinson; - test + ok jakob. - - (djm) Bug #632: Don't call pam_end indirectly from within kbd-int - conversation function - - (djm) Export environment variables from authentication subprocess to - parent. Part of Bug #717 - -20031115 - - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and - HP-UX, skip test on AIX. - -20031113 - - (dtucker) [auth-pam.c] Append newlines to lines output by the - pam_chauthtok_conv(). - - (dtucker) [README ssh-host-config ssh-user-config Makefile] (All - contrib/cygwin). Major update from vinschen at redhat.com. - - Makefile provides a `cygwin-postinstall' target to run right after - `make install'. - - Better support for Windows 2003 Server. - - Try to get permissions as correct as possible. - - New command line options to allow full automated host configuration. - - Create configs from skeletons in /etc/defaults/etc. - - Use /bin/bash, allows reading user input with readline support. - - Remove really old configs from /usr/local. - - (dtucker) [auth-pam.c] Add newline to accumulated PAM_TEXT_INFO and - PAM_ERROR_MSG messages. - -20031106 - - (djm) Clarify UsePAM consequences a little more - -20031103 - - (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services - are created correctly with CRLF line terminations. Patch from vinschen at - redhat.com. - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/10/15 09:48:45 - [monitor_wrap.c] - check pmonitor != NULL - - markus@cvs.openbsd.org 2003/10/21 09:50:06 - [auth2-gss.c] - make sure the doid is larger than 2 - - avsm@cvs.openbsd.org 2003/10/26 16:57:43 - [sshconnect2.c] - rename 'supported' static var in userauth_gssapi() to 'gss_supported' - to avoid shadowing the global version. markus@ ok - - markus@cvs.openbsd.org 2003/10/28 09:08:06 - [misc.c] - error->debug for getsockopt+TCP_NODELAY; several requests - - markus@cvs.openbsd.org 2003/11/02 11:01:03 - [auth2-gss.c compat.c compat.h sshconnect2.c] - remove support for SSH_BUG_GSSAPI_BER; simon@sxw.org.uk - - (dtucker) [regress/agent-ptrace.sh] Use numeric uid and gid. - -20031021 - - (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords - directly. Noted by Darren.Moffat at sun.com. - - (dtucker) [regress/agent-ptrace.sh] Skip agent-test unless SUDO is set, - make agent setgid during test. - -20031017 - - (dtucker) [INSTALL] Note that --with-md5 is now required on platforms with - MD5 passwords even if PAM support is enabled. From steev at detritus.net. - -20031015 - - (dtucker) OpenBSD CVS Sync - - jmc@cvs.openbsd.org 2003/10/08 08:27:36 - [scp.1 scp.c sftp-server.8 sftp.1 sftp.c ssh.1 sshd.8] - scp and sftp: add options list and sort options. options list requested - by deraadt@ - sshd: use same format as ssh - ssh: remove wrong option from list - sftp-server: Subsystem is documented in ssh_config(5), not sshd(8) - ok deraadt@ markus@ - - markus@cvs.openbsd.org 2003/10/08 15:21:24 - [readconf.c ssh_config.5] - default GSS API to no in client, too; ok jakob, deraadt@ - - markus@cvs.openbsd.org 2003/10/11 08:24:08 - [readconf.c readconf.h ssh.1 ssh.c ssh_config.5] - remote x11 clients are now untrusted by default, uses xauth(8) to generate - untrusted cookies; ForwardX11Trusted=yes restores old behaviour. - ok deraadt; feedback and ok djm/fries - - markus@cvs.openbsd.org 2003/10/11 08:26:43 - [sshconnect2.c] - search keys in reverse order; fixes #684 - - markus@cvs.openbsd.org 2003/10/11 11:36:23 - [monitor_wrap.c] - return NULL for missing banner; ok djm@ - - jmc@cvs.openbsd.org 2003/10/12 13:12:13 - [ssh_config.5] - note that EnableSSHKeySign should be in the non-hostspecific section; - remove unnecessary .Pp; - ok markus@ - - markus@cvs.openbsd.org 2003/10/13 08:22:25 - [scp.1 sftp.1] - don't refer to options related to forwarding; ok jmc@ - - jakob@cvs.openbsd.org 2003/10/14 19:42:10 - [dns.c dns.h readconf.c ssh-keygen.c sshconnect.c] - include SSHFP lookup code (not enabled by default). ok markus@ - - jakob@cvs.openbsd.org 2003/10/14 19:43:23 - [README.dns] - update - - markus@cvs.openbsd.org 2003/10/14 19:54:39 - [session.c ssh-agent.c] - 10X for mkdtemp; djm@ - - (dtucker) [acconfig.h configure.ac dns.c openbsd-compat/getrrsetbyname.c - openbsd-compat/getrrsetbyname.h] DNS fingerprint support is now always - compiled in but disabled in config. - - (dtucker) [auth.c] Check for disabled password expiry on HP-UX Trusted Mode. - - (tim) [regress/banner.sh] portability fix. - -20031009 - - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@ - -20031008 - - (dtucker) OpenBSD CVS Sync - - dtucker@cvs.openbsd.org 2003/10/07 01:47:27 - [sshconnect2.c] - Don't use logit for banner, since it truncates to MSGBUFSIZ; bz #668 & - #707. ok markus@ - - djm@cvs.openbsd.org 2003/10/07 07:04:16 - [sftp-int.c] - sftp quoting fix from admorten AT umich.edu; ok markus@ - - deraadt@cvs.openbsd.org 2003/10/07 21:58:28 - [sshconnect2.c] - set ptr to NULL after free - - dtucker@cvs.openbsd.org 2003/10/07 01:52:13 - [regress/Makefile regress/banner.sh] - Test SSH2 banner. ok markus@ - - djm@cvs.openbsd.org 2003/10/07 07:04:52 - [regress/sftp-cmds.sh] - more sftp quoting regress tests; ok markus - -20031007 - - (djm) Delete autom4te.cache after autoreconf - - (dtucker) [auth-pam.c auth-pam.h session.c] Make PAM use the new static - cleanup functions. With & ok djm@ - - (dtucker) [contrib/redhat/openssh.spec] Bug #714: Now that UsePAM is a - run-time switch, always build --with-md5-passwords. - - (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoul.c] - Bug #670: add strtoul() to openbsd-compat for platforms lacking it. ok djm@ - - (dtucker) [configure.ac] Bug #715: Set BROKEN_SETREUID and BROKEN_SETREGID - on Reliant Unix. Patch from Robert.Dahlem at siemens.com. - - (dtucker) [configure.ac] Bug #710: Check for dlsym() in libdl on - Reliant Unix. Based on patch from Robert.Dahlem at siemens.com. - -20031003 - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/10/02 10:41:59 - [sshd.c] - print openssl version, too, several requests; ok henning/djm. - - markus@cvs.openbsd.org 2003/10/02 08:26:53 - [ssh-gss.h] - missing $OpenBSD:; dtucker - - (tim) [contrib/caldera/openssh.spec] Remove obsolete --with-ipv4-default - option. - -20031002 - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/09/23 20:17:11 - [Makefile.in auth1.c auth2.c auth.c auth.h auth-krb5.c canohost.c - cleanup.c clientloop.c fatal.c gss-serv.c log.c log.h monitor.c monitor.h - monitor_wrap.c monitor_wrap.h packet.c serverloop.c session.c session.h - ssh-agent.c sshd.c] - replace fatal_cleanup() and linked list of fatal callbacks with static - cleanup_exit() function. re-refine cleanup_exit() where appropriate, - allocate sshd's authctxt eary to allow simpler cleanup in sshd. - tested by many, ok deraadt@ - - markus@cvs.openbsd.org 2003/09/23 20:18:52 - [progressmeter.c] - don't print trailing \0; bug #709; Robert.Dahlem@siemens.com - ok millert/deraadt@ - - markus@cvs.openbsd.org 2003/09/23 20:41:11 - [channels.c channels.h clientloop.c] - move client only agent code to clientloop.c - - markus@cvs.openbsd.org 2003/09/26 08:19:29 - [sshd.c] - no need to set the listen sockets to non-block; ok deraadt@ - - jmc@cvs.openbsd.org 2003/09/29 11:40:51 - [ssh.1] - - add list of options to -o and .Xr ssh_config(5) - - some other cleanup - requested by deraadt@; - ok deraadt@ markus@ - - markus@cvs.openbsd.org 2003/09/29 20:19:57 - [servconf.c sshd_config] - GSSAPICleanupCreds -> GSSAPICleanupCredentials - - (dtucker) [configure.ac] Don't set DISABLE_SHADOW when configuring - --with-pam. ok djm@ - - (dtucker) [ssh-gss.h] Prototype change missed in sync. - - (dtucker) [session.c] Fix bus errors on some 64-bit Solaris configurations. - Based on patches by Matthias Koeppe and Thomas Baden. ok djm@ - -20030930 - - (bal) Fix issues in openbsd-compat/realpath.c - -20030925 - - (dtucker) [configure.ac openbsd-compat/xcrypt.c] Bug #633: Remove - DISABLE_SHADOW for HP-UX, use getspnam instead of getprpwnam. Patch from - michael_steffens at hp.com, ok djm@ - - (tim) [sshd_config] UsePAM defaults to no. - -20030924 - - (djm) Update version.h and spec files for HEAD - - (dtucker) [configure.ac] IRIX5 needs the same setre[ug]id defines as IRIX6. - -20030923 - - (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree - builds. Portability corrections from tim@. - - (dtucker) [configure.ac] Bug #665: uid swapping issues on Mac OS X. - Patch from max at quendi.de. - - (dtucker) [configure.ac] Bug #657: uid swapping issues on BSDi. - - (dtucker) [configure.ac] Bug #653: uid swapping issues on Tru64. - - (dtucker) [configure.ac] Bug #693: uid swapping issues on NCR MP-RAS. - Patch from david.haughton at ncr.com - - (dtucker) [configure.ac] Bug #659: uid swapping issues on IRIX 6. - Part of patch supplied by bugzilla-openssh at thewrittenword.com - - (dtucker) [configure.ac openbsd-compat/fake-rfc2553.c - openbsd-compat/fake-rfc2553.h] Bug #659: Test for and handle systems with - where gai_strerror is defined as "const char *". Part of patch supplied - by bugzilla-openssh at thewrittenword.com - - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config] Update - ssh-host-config to match current defaults, bump README version. Patch from - vinschen at redhat.com. - - (dtucker) [uidswap.c] Don't test restoration of uid on Cygwin since the - OS does not support permanently dropping privileges. Patch from - vinschen at redhat.com. - - (dtucker) [openbsd-compat/port-aix.c] Use correct include for xmalloc.h, - add canohost.h to stop warning. Based on patch from openssh-unix-dev at - thewrittenword.com - - (dtucker) [INSTALL] Bug #686: Document requirement for zlib 1.1.4 or - higher. - - (tim) Fix typo. s/SETEIUD_BREAKS_SETUID/SETEUID_BREAKS_SETUID/ - - (tim) [configure.ac] Bug 665: move 3 new AC_DEFINES outside of AC_TRY_RUN. - Report by distler AT golem ph utexas edu. - - (dtucker) [contrib/aix/pam.conf] Include example pam.conf for AIX from - article by genty at austin.ibm.com, included with the author's permission. - - (dtucker) OpenBSD CVS Sync - - markus@cvs.openbsd.org 2003/09/18 07:52:54 - [sshconnect.c] - missing {}; bug #656; jclonguet at free.fr - - markus@cvs.openbsd.org 2003/09/18 07:54:48 - [buffer.c] - protect against double free; #660; zardoz at users.sf.net - - markus@cvs.openbsd.org 2003/09/18 07:56:05 - [authfile.c] - missing buffer_free(&encrypted); #662; zardoz at users.sf.net - - markus@cvs.openbsd.org 2003/09/18 08:49:45 - [deattack.c misc.c session.c ssh-agent.c] - more buffer allocation fixes; from Solar Designer; CAN-2003-0682; - ok millert@ - - miod@cvs.openbsd.org 2003/09/18 13:02:21 - [authfd.c bufaux.c dh.c mac.c ssh-keygen.c] - A few signedness fixes for harmless situations; markus@ ok - - markus@cvs.openbsd.org 2003/09/19 09:02:02 - [packet.c] - buffer_dump only if PACKET_DEBUG is defined; Jedi/Sector One; pr 3471 - - markus@cvs.openbsd.org 2003/09/19 09:03:00 - [buffer.c] - sign fix in buffer_dump; Jedi/Sector One; pr 3473 - - markus@cvs.openbsd.org 2003/09/19 11:29:40 - [ssh-agent.c] - provide a ssh-agent specific fatal() function; ok deraadt - - markus@cvs.openbsd.org 2003/09/19 11:30:39 - [ssh-keyscan.c] - avoid fatal_cleanup, just call exit(); ok deraadt - - markus@cvs.openbsd.org 2003/09/19 11:31:33 - [channels.c] - do not call channel_free_all on fatal; ok deraadt - - markus@cvs.openbsd.org 2003/09/19 11:33:09 - [packet.c sshd.c] - do not call packet_close on fatal; ok deraadt - - markus@cvs.openbsd.org 2003/09/19 17:40:20 - [scp.c] - error handling for remote-remote copy; #638; report Harald Koenig; - ok millert, fgs, henning, deraadt - - markus@cvs.openbsd.org 2003/09/19 17:43:35 - [clientloop.c sshtty.c sshtty.h] - remove fatal callbacks from client code; ok deraadt - - (bal) "extration" -> "extraction" in ssh-rand-helper.c; repoted by john - on #unixhelp@efnet - - (tim) [configure.ac] add --disable-etc-default-login option. ok djm - - (djm) Sync with V_3_7 branch: - - (djm) Fix SSH1 challenge kludge - - (djm) Bug #671: Fix builds on OpenBSD - - (djm) Bug #676: Fix PAM stack corruption - - (djm) Fix bad free() in PAM code - - (djm) Don't call pam_end before pam_init - - (djm) Enable build with old OpenSSL again - - (djm) Trim deprecated options from INSTALL. Mention UsePAM - - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - -$Id: ChangeLog,v 1.4558.2.2 2006/09/26 10:57:05 dtucker Exp $ +$Id: ChangeLog,v 1.4588.2.1 2006/11/07 13:02:59 dtucker Exp $ diff --git a/crypto/openssh/Makefile.in b/crypto/openssh/Makefile.in index 71f3623..fb6426b 100644 --- a/crypto/openssh/Makefile.in +++ b/crypto/openssh/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.282 2006/09/12 11:54:10 djm Exp $ +# $Id: Makefile.in,v 1.283 2006/10/23 21:44:47 tim Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -11,6 +11,7 @@ bindir=@bindir@ sbindir=@sbindir@ libexecdir=@libexecdir@ datadir=@datadir@ +datarootdir=@datarootdir@ mandir=@mandir@ mansubdir=@mansubdir@ sysconfdir=@sysconfdir@ diff --git a/crypto/openssh/README b/crypto/openssh/README index d0bacc5..fb53b55 100644 --- a/crypto/openssh/README +++ b/crypto/openssh/README @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-4.4 for the release notes. +See http://www.openssh.com/txt/release-4.5 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ References - [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.63 2006/09/01 11:32:53 dtucker Exp $ +$Id: README,v 1.64 2006/11/07 12:25:45 dtucker Exp $ diff --git a/crypto/openssh/audit-bsm.c b/crypto/openssh/audit-bsm.c index d5cf302..c26b4ca 100644 --- a/crypto/openssh/audit-bsm.c +++ b/crypto/openssh/audit-bsm.c @@ -1,4 +1,4 @@ -/* $Id: audit-bsm.c,v 1.4 2006/09/01 05:38:36 djm Exp $ */ +/* $Id: audit-bsm.c,v 1.5 2006/09/30 22:09:50 dtucker Exp $ */ /* * TODO @@ -39,6 +39,7 @@ #include +#include #include #include diff --git a/crypto/openssh/auth-rsa.c b/crypto/openssh/auth-rsa.c index 8c43458..69f9a58 100644 --- a/crypto/openssh/auth-rsa.c +++ b/crypto/openssh/auth-rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-rsa.c,v 1.71 2006/08/03 03:34:41 deraadt Exp $ */ +/* $OpenBSD: auth-rsa.c,v 1.72 2006/11/06 21:25:27 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -76,10 +76,12 @@ auth_rsa_generate_challenge(Key *key) if ((challenge = BN_new()) == NULL) fatal("auth_rsa_generate_challenge: BN_new() failed"); /* Generate a random challenge. */ - BN_rand(challenge, 256, 0, 0); + if (BN_rand(challenge, 256, 0, 0) == 0) + fatal("auth_rsa_generate_challenge: BN_rand failed"); if ((ctx = BN_CTX_new()) == NULL) - fatal("auth_rsa_generate_challenge: BN_CTX_new() failed"); - BN_mod(challenge, challenge, key->rsa->n, ctx); + fatal("auth_rsa_generate_challenge: BN_CTX_new failed"); + if (BN_mod(challenge, challenge, key->rsa->n, ctx) == 0) + fatal("auth_rsa_generate_challenge: BN_mod failed"); BN_CTX_free(ctx); return challenge; diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c index db2aa7b..5d23343 100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@ -569,8 +569,6 @@ fakepw(void) fake.pw_passwd = "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK"; fake.pw_gecos = "NOUSER"; - fake.pw_uid = (uid_t)-1; - fake.pw_gid = (gid_t)-1; fake.pw_uid = privsep_pw->pw_uid; fake.pw_gid = privsep_pw->pw_gid; #ifdef HAVE_PW_CLASS_IN_PASSWD diff --git a/crypto/openssh/bufbn.c b/crypto/openssh/bufbn.c index 6cf65d3..9706ba8 100644 --- a/crypto/openssh/bufbn.c +++ b/crypto/openssh/bufbn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bufbn.c,v 1.3 2006/08/03 03:34:41 deraadt Exp $*/ +/* $OpenBSD: bufbn.c,v 1.4 2006/11/06 21:25:28 markus Exp $*/ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -118,7 +118,10 @@ buffer_get_bignum_ret(Buffer *buffer, BIGNUM *value) return (-1); } bin = buffer_ptr(buffer); - BN_bin2bn(bin, bytes, value); + if (BN_bin2bn(bin, bytes, value) == NULL) { + error("buffer_get_bignum_ret: BN_bin2bn failed"); + return (-1); + } if (buffer_consume_ret(buffer, bytes) == -1) { error("buffer_get_bignum_ret: buffer_consume failed"); return (-1); @@ -202,7 +205,10 @@ buffer_get_bignum2_ret(Buffer *buffer, BIGNUM *value) xfree(bin); return (-1); } - BN_bin2bn(bin, len, value); + if (BN_bin2bn(bin, len, value) == NULL) { + error("buffer_get_bignum2_ret: BN_bin2bn failed"); + return (-1); + } xfree(bin); return (0); } diff --git a/crypto/openssh/buildpkg.sh.in b/crypto/openssh/buildpkg.sh.in index a3b9014b..17349f7 100644 --- a/crypto/openssh/buildpkg.sh.in +++ b/crypto/openssh/buildpkg.sh.in @@ -24,6 +24,7 @@ PKGNAME=OpenSSH # revisions within the same version (REV=a) #REV= SYSVINIT_NAME=opensshd +AWK=${AWK:="nawk"} MAKE=${MAKE:="make"} SSHDUID=67 # Default privsep uid SSHDGID=67 # Default privsep gid @@ -154,15 +155,22 @@ ARCH=`uname -m` DEF_MSG="\n" OS_VER=`uname -v` SCRIPT_SHELL=/sbin/sh +UNAME_R=`uname -r` UNAME_S=`uname -s` case ${UNAME_S} in SunOS) UNAME_S=Solaris + OS_VER=${UNAME_R} ARCH=`uname -p` RCS_D=yes DEF_MSG="(default: n)" ;; - SCO_SV) UNAME_S=OpenServer + SCO_SV) case ${UNAME_R} in + 3.2) UNAME_S=OpenServer5 OS_VER=`uname -X | grep Release | sed -e 's/^Rel.*3.2v//'` + ;; + 5) UNAME_S=OpenServer6 + ;; + esac SCRIPT_SHELL=/bin/sh RC1_D=no DEF_MSG="(default: n)" @@ -481,7 +489,7 @@ _EOF [ -x /usr/bin/ckyorn ] || cat >> request << _EOF ckyorn() { -# for some strange reason OpenServer has no ckyorn +# for some strange reason OpenServer5 has no ckyorn # We build a striped down version here DEFAULT=n @@ -638,7 +646,7 @@ cat >mk-proto.awk << _EOF _EOF find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \ - pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype + pkgproto $PROTO_ARGS | ${AWK} -f mk-proto.awk > prototype # /usr/local is a symlink on some systems [ "${USR_LOCAL_IS_SYMLINK}" = yes ] && { diff --git a/crypto/openssh/clientloop.c b/crypto/openssh/clientloop.c index 88dfb1f..4c51081 100644 --- a/crypto/openssh/clientloop.c +++ b/crypto/openssh/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.175 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: clientloop.c,v 1.176 2006/10/11 12:38:03 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -464,8 +464,10 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt) static void server_alive_check(void) { - if (++server_alive_timeouts > options.server_alive_count_max) - packet_disconnect("Timeout, server not responding."); + if (++server_alive_timeouts > options.server_alive_count_max) { + logit("Timeout, server not responding."); + cleanup_exit(255); + } packet_start(SSH2_MSG_GLOBAL_REQUEST); packet_put_cstring("keepalive@openssh.com"); packet_put_char(1); /* boolean: want reply */ diff --git a/crypto/openssh/configure.ac b/crypto/openssh/configure.ac index ecfa50c..c596a7b 100644 --- a/crypto/openssh/configure.ac +++ b/crypto/openssh/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.369 2006/10/03 16:34:35 tim Exp $ +# $Id: configure.ac,v 1.370 2006/10/06 23:07:21 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.369 $) +AC_REVISION($Revision: 1.370 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -3145,7 +3145,10 @@ AC_ARG_WITH(selinux, AC_MSG_ERROR(SELinux support requires selinux.h header)) AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ], AC_MSG_ERROR(SELinux support requires libselinux library)) + save_LIBS="$LIBS" + LIBS="$LIBS $LIBSELINUX" AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level) + LIBS="$save_LIBS" fi ] ) AC_SUBST(LIBSELINUX) diff --git a/crypto/openssh/dh.c b/crypto/openssh/dh.c index f6ef05c..02b9a40 100644 --- a/crypto/openssh/dh.c +++ b/crypto/openssh/dh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.42 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: dh.c,v 1.43 2006/11/06 21:25:28 markus Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * diff --git a/crypto/openssh/entropy.c b/crypto/openssh/entropy.c index 4f19c87..ccabb13 100644 --- a/crypto/openssh/entropy.c +++ b/crypto/openssh/entropy.c @@ -36,6 +36,7 @@ #endif #include #include +#include #include #include diff --git a/crypto/openssh/kexdhc.c b/crypto/openssh/kexdhc.c index 64de7af..d384c80 100644 --- a/crypto/openssh/kexdhc.c +++ b/crypto/openssh/kexdhc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexdhc.c,v 1.9 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: kexdhc.c,v 1.11 2006/11/06 21:25:28 markus Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -50,7 +50,8 @@ kexdh_client(Kex *kex) Key *server_host_key; u_char *server_host_key_blob = NULL, *signature = NULL; u_char *kbuf, *hash; - u_int klen, kout, slen, sbloblen, hashlen; + u_int klen, slen, sbloblen, hashlen; + int kout; /* generate and send 'e', client DH public key */ switch (kex->kex_type) { @@ -112,13 +113,15 @@ kexdh_client(Kex *kex) klen = DH_size(dh); kbuf = xmalloc(klen); - kout = DH_compute_key(kbuf, dh_server_pub, dh); + if ((kout = DH_compute_key(kbuf, dh_server_pub, dh)) < 0) + fatal("DH_compute_key: failed"); #ifdef DEBUG_KEXDH dump_digest("shared secret", kbuf, kout); #endif if ((shared_secret = BN_new()) == NULL) fatal("kexdh_client: BN_new failed"); - BN_bin2bn(kbuf, kout, shared_secret); + if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) + fatal("kexdh_client: BN_bin2bn failed"); memset(kbuf, 0, klen); xfree(kbuf); diff --git a/crypto/openssh/kexdhs.c b/crypto/openssh/kexdhs.c index 93ec97f..8617088 100644 --- a/crypto/openssh/kexdhs.c +++ b/crypto/openssh/kexdhs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexdhs.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: kexdhs.c,v 1.9 2006/11/06 21:25:28 markus Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -52,8 +52,8 @@ kexdh_server(Kex *kex) DH *dh; Key *server_host_key; u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; - u_int sbloblen, klen, kout, hashlen; - u_int slen; + u_int sbloblen, klen, hashlen, slen; + int kout; /* generate server DH public key */ switch (kex->kex_type) { @@ -101,13 +101,15 @@ kexdh_server(Kex *kex) klen = DH_size(dh); kbuf = xmalloc(klen); - kout = DH_compute_key(kbuf, dh_client_pub, dh); + if ((kout = DH_compute_key(kbuf, dh_client_pub, dh)) < 0) + fatal("DH_compute_key: failed"); #ifdef DEBUG_KEXDH dump_digest("shared secret", kbuf, kout); #endif if ((shared_secret = BN_new()) == NULL) fatal("kexdh_server: BN_new failed"); - BN_bin2bn(kbuf, kout, shared_secret); + if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) + fatal("kexdh_server: BN_bin2bn failed"); memset(kbuf, 0, klen); xfree(kbuf); diff --git a/crypto/openssh/kexgexc.c b/crypto/openssh/kexgexc.c index 2c19713..adb973d 100644 --- a/crypto/openssh/kexgexc.c +++ b/crypto/openssh/kexgexc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexgexc.c,v 1.9 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: kexgexc.c,v 1.11 2006/11/06 21:25:28 markus Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -51,7 +51,8 @@ kexgex_client(Kex *kex) BIGNUM *p = NULL, *g = NULL; Key *server_host_key; u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; - u_int klen, kout, slen, sbloblen, hashlen; + u_int klen, slen, sbloblen, hashlen; + int kout; int min, max, nbits; DH *dh; @@ -150,13 +151,15 @@ kexgex_client(Kex *kex) klen = DH_size(dh); kbuf = xmalloc(klen); - kout = DH_compute_key(kbuf, dh_server_pub, dh); + if ((kout = DH_compute_key(kbuf, dh_server_pub, dh)) < 0) + fatal("DH_compute_key: failed"); #ifdef DEBUG_KEXDH dump_digest("shared secret", kbuf, kout); #endif if ((shared_secret = BN_new()) == NULL) fatal("kexgex_client: BN_new failed"); - BN_bin2bn(kbuf, kout, shared_secret); + if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) + fatal("kexgex_client: BN_bin2bn failed"); memset(kbuf, 0, klen); xfree(kbuf); diff --git a/crypto/openssh/kexgexs.c b/crypto/openssh/kexgexs.c index 5373a63..a037f57 100644 --- a/crypto/openssh/kexgexs.c +++ b/crypto/openssh/kexgexs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexgexs.c,v 1.8 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: kexgexs.c,v 1.10 2006/11/06 21:25:28 markus Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -55,8 +55,8 @@ kexgex_server(Kex *kex) Key *server_host_key; DH *dh; u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; - u_int sbloblen, klen, kout, slen, hashlen; - int min = -1, max = -1, nbits = -1, type; + u_int sbloblen, klen, slen, hashlen; + int min = -1, max = -1, nbits = -1, type, kout; if (kex->load_host_key == NULL) fatal("Cannot load hostkey"); @@ -134,13 +134,15 @@ kexgex_server(Kex *kex) klen = DH_size(dh); kbuf = xmalloc(klen); - kout = DH_compute_key(kbuf, dh_client_pub, dh); + if ((kout = DH_compute_key(kbuf, dh_client_pub, dh)) < 0) + fatal("DH_compute_key: failed"); #ifdef DEBUG_KEXDH dump_digest("shared secret", kbuf, kout); #endif if ((shared_secret = BN_new()) == NULL) fatal("kexgex_server: BN_new failed"); - BN_bin2bn(kbuf, kout, shared_secret); + if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) + fatal("kexgex_server: BN_bin2bn failed"); memset(kbuf, 0, klen); xfree(kbuf); diff --git a/crypto/openssh/key.c b/crypto/openssh/key.c index f3b3d6b..93b2d41 100644 --- a/crypto/openssh/key.c +++ b/crypto/openssh/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.67 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: key.c,v 1.68 2006/11/06 21:25:28 markus Exp $ */ /* * read_bignum(): * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -617,16 +617,18 @@ key_from_private(const Key *k) switch (k->type) { case KEY_DSA: n = key_new(k->type); - BN_copy(n->dsa->p, k->dsa->p); - BN_copy(n->dsa->q, k->dsa->q); - BN_copy(n->dsa->g, k->dsa->g); - BN_copy(n->dsa->pub_key, k->dsa->pub_key); + if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) || + (BN_copy(n->dsa->q, k->dsa->q) == NULL) || + (BN_copy(n->dsa->g, k->dsa->g) == NULL) || + (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL)) + fatal("key_from_private: BN_copy failed"); break; case KEY_RSA: case KEY_RSA1: n = key_new(k->type); - BN_copy(n->rsa->n, k->rsa->n); - BN_copy(n->rsa->e, k->rsa->e); + if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) || + (BN_copy(n->rsa->e, k->rsa->e) == NULL)) + fatal("key_from_private: BN_copy failed"); break; default: fatal("key_from_private: unknown type %d", k->type); diff --git a/crypto/openssh/moduli.c b/crypto/openssh/moduli.c index e18929b..44e5ddf 100644 --- a/crypto/openssh/moduli.c +++ b/crypto/openssh/moduli.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moduli.c,v 1.18 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: moduli.c,v 1.19 2006/11/06 21:25:28 markus Exp $ */ /* * Copyright 1994 Phil Karn * Copyright 1996-1998, 2003 William Allen Simpson @@ -327,20 +327,26 @@ gen_candidates(FILE *out, u_int32_t memory, u_int32_t power, BIGNUM *start) /* validation check: count the number of primes tried */ largetries = 0; - q = BN_new(); + if ((q = BN_new()) == NULL) + fatal("BN_new failed"); /* * Generate random starting point for subprime search, or use * specified parameter. */ - largebase = BN_new(); - if (start == NULL) - BN_rand(largebase, power, 1, 1); - else - BN_copy(largebase, start); + if ((largebase = BN_new()) == NULL) + fatal("BN_new failed"); + if (start == NULL) { + if (BN_rand(largebase, power, 1, 1) == 0) + fatal("BN_rand failed"); + } else { + if (BN_copy(largebase, start) == NULL) + fatal("BN_copy: failed"); + } /* ensure odd */ - BN_set_bit(largebase, 0); + if (BN_set_bit(largebase, 0) == 0) + fatal("BN_set_bit: failed"); time(&time_start); @@ -424,8 +430,10 @@ gen_candidates(FILE *out, u_int32_t memory, u_int32_t power, BIGNUM *start) continue; /* Definitely composite, skip */ debug2("test q = largebase+%u", 2 * j); - BN_set_word(q, 2 * j); - BN_add(q, q, largebase); + if (BN_set_word(q, 2 * j) == 0) + fatal("BN_set_word failed"); + if (BN_add(q, q, largebase) == 0) + fatal("BN_add failed"); if (qfileout(out, QTYPE_SOPHIE_GERMAIN, QTEST_SIEVE, largetries, (power - 1) /* MSB */, (0), q) == -1) { ret = -1; @@ -470,9 +478,12 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted) time(&time_start); - p = BN_new(); - q = BN_new(); - ctx = BN_CTX_new(); + if ((p = BN_new()) == NULL) + fatal("BN_new failed"); + if ((q = BN_new()) == NULL) + fatal("BN_new failed"); + if ((ctx = BN_CTX_new()) == NULL) + fatal("BN_CTX_new failed"); debug2("%.24s Final %u Miller-Rabin trials (%x generator)", ctime(&time_start), trials, generator_wanted); @@ -520,10 +531,13 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted) case QTYPE_SOPHIE_GERMAIN: debug2("%10u: (%u) Sophie-Germain", count_in, in_type); a = q; - BN_hex2bn(&a, cp); + if (BN_hex2bn(&a, cp) == 0) + fatal("BN_hex2bn failed"); /* p = 2*q + 1 */ - BN_lshift(p, q, 1); - BN_add_word(p, 1); + if (BN_lshift(p, q, 1) == 0) + fatal("BN_lshift failed"); + if (BN_add_word(p, 1) == 0) + fatal("BN_add_word failed"); in_size += 1; generator_known = 0; break; @@ -534,9 +548,11 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted) case QTYPE_UNKNOWN: debug2("%10u: (%u)", count_in, in_type); a = p; - BN_hex2bn(&a, cp); + if (BN_hex2bn(&a, cp) == 0) + fatal("BN_hex2bn failed"); /* q = (p-1) / 2 */ - BN_rshift(q, p, 1); + if (BN_rshift(q, p, 1) == 0) + fatal("BN_rshift failed"); break; default: debug2("Unknown prime type"); diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c index b20d0c7..48ae46c 100644 --- a/crypto/openssh/monitor.c +++ b/crypto/openssh/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.88 2006/08/12 20:46:46 miod Exp $ */ +/* $OpenBSD: monitor.c,v 1.89 2006/11/07 10:31:31 markus Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -350,7 +350,7 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor) /* The first few requests do not require asynchronous access */ while (!authenticated) { auth_method = "unknown"; - authenticated = monitor_read(pmonitor, mon_dispatch, &ent); + authenticated = (monitor_read(pmonitor, mon_dispatch, &ent) == 1); if (authenticated) { if (!(ent->flags & MON_AUTHDECIDE)) fatal("%s: unexpected authentication from %d", @@ -1217,7 +1217,7 @@ mm_answer_keyverify(int sock, Buffer *m) verified = key_verify(key, signature, signaturelen, data, datalen); debug3("%s: key %p signature %s", - __func__, key, verified ? "verified" : "unverified"); + __func__, key, (verified == 1) ? "verified" : "unverified"); key_free(key); xfree(blob); @@ -1232,7 +1232,7 @@ mm_answer_keyverify(int sock, Buffer *m) buffer_put_int(m, verified); mm_request_send(sock, MONITOR_ANS_KEYVERIFY, m); - return (verified); + return (verified == 1); } static void diff --git a/crypto/openssh/monitor_fdpass.c b/crypto/openssh/monitor_fdpass.c index c5fc4c3..9f8e9cd 100644 --- a/crypto/openssh/monitor_fdpass.c +++ b/crypto/openssh/monitor_fdpass.c @@ -29,6 +29,9 @@ #include #include #include +#ifdef HAVE_SYS_UN_H +#include +#endif #include #include diff --git a/crypto/openssh/openbsd-compat/port-solaris.c b/crypto/openssh/openbsd-compat/port-solaris.c index f57433e..2ab64d4 100644 --- a/crypto/openssh/openbsd-compat/port-solaris.c +++ b/crypto/openssh/openbsd-compat/port-solaris.c @@ -1,4 +1,4 @@ -/* $Id: port-solaris.c,v 1.2 2006/09/01 05:38:41 djm Exp $ */ +/* $Id: port-solaris.c,v 1.3 2006/10/31 23:28:49 dtucker Exp $ */ /* * Copyright (c) 2006 Chad Mynhier. @@ -86,18 +86,27 @@ solaris_contract_pre_fork(void) debug2("%s: setting up process contract template on fd %d", __func__, tmpl_fd); - /* We have to set certain attributes before activating the template */ - if (ct_pr_tmpl_set_fatal(tmpl_fd, - CT_PR_EV_HWERR|CT_PR_EV_SIGNAL|CT_PR_EV_CORE) != 0) { + /* First we set the template parameters and event sets. */ + if (ct_pr_tmpl_set_param(tmpl_fd, CT_PR_PGRPONLY) != 0) { + error("%s: Error setting process contract parameter set " + "(pgrponly): %s", __func__, strerror(errno)); + goto fail; + } + if (ct_pr_tmpl_set_fatal(tmpl_fd, CT_PR_EV_HWERR) != 0) { error("%s: Error setting process contract template " "fatal events: %s", __func__, strerror(errno)); goto fail; } - if (ct_tmpl_set_critical(tmpl_fd, CT_PR_EV_HWERR) != 0) { + if (ct_tmpl_set_critical(tmpl_fd, 0) != 0) { error("%s: Error setting process contract template " "critical events: %s", __func__, strerror(errno)); goto fail; } + if (ct_tmpl_set_informative(tmpl_fd, CT_PR_EV_HWERR) != 0) { + error("%s: Error setting process contract template " + "informative events: %s", __func__, strerror(errno)); + goto fail; + } /* Now make this the active template for this process. */ if (ct_tmpl_activate(tmpl_fd) != 0) { diff --git a/crypto/openssh/rsa.c b/crypto/openssh/rsa.c index 08cc820..bec1d19 100644 --- a/crypto/openssh/rsa.c +++ b/crypto/openssh/rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa.c,v 1.28 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: rsa.c,v 1.29 2006/11/06 21:25:28 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -91,7 +91,8 @@ rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key) RSA_PKCS1_PADDING)) <= 0) fatal("rsa_public_encrypt() failed"); - BN_bin2bn(outbuf, len, out); + if (BN_bin2bn(outbuf, len, out) == NULL) + fatal("rsa_public_encrypt: BN_bin2bn failed"); memset(outbuf, 0, olen); memset(inbuf, 0, ilen); @@ -116,7 +117,8 @@ rsa_private_decrypt(BIGNUM *out, BIGNUM *in, RSA *key) RSA_PKCS1_PADDING)) <= 0) { error("rsa_private_decrypt() failed"); } else { - BN_bin2bn(outbuf, len, out); + if (BN_bin2bn(outbuf, len, out) == NULL) + fatal("rsa_private_decrypt: BN_bin2bn failed"); } memset(outbuf, 0, olen); memset(inbuf, 0, ilen); @@ -137,11 +139,11 @@ rsa_generate_additional_parameters(RSA *rsa) if ((ctx = BN_CTX_new()) == NULL) fatal("rsa_generate_additional_parameters: BN_CTX_new failed"); - BN_sub(aux, rsa->q, BN_value_one()); - BN_mod(rsa->dmq1, rsa->d, aux, ctx); - - BN_sub(aux, rsa->p, BN_value_one()); - BN_mod(rsa->dmp1, rsa->d, aux, ctx); + if ((BN_sub(aux, rsa->q, BN_value_one()) == 0) || + (BN_mod(rsa->dmq1, rsa->d, aux, ctx) == 0) || + (BN_sub(aux, rsa->p, BN_value_one()) == 0) || + (BN_mod(rsa->dmp1, rsa->d, aux, ctx) == 0)) + fatal("rsa_generate_additional_parameters: BN_sub/mod failed"); BN_clear_free(aux); BN_CTX_free(ctx); diff --git a/crypto/openssh/scard.c b/crypto/openssh/scard.c index 328655e..9fd3ca1 100644 --- a/crypto/openssh/scard.c +++ b/crypto/openssh/scard.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scard.c,v 1.35 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: scard.c,v 1.36 2006/11/06 21:25:28 markus Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -391,15 +391,17 @@ sc_get_keys(const char *id, const char *pin) keys = xcalloc((nkeys+1), sizeof(Key *)); n = key_new(KEY_RSA1); - BN_copy(n->rsa->n, k->rsa->n); - BN_copy(n->rsa->e, k->rsa->e); + if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) || + (BN_copy(n->rsa->e, k->rsa->e) == NULL)) + fatal("sc_get_keys: BN_copy failed"); RSA_set_method(n->rsa, sc_get_rsa()); n->flags |= KEY_FLAG_EXT; keys[0] = n; n = key_new(KEY_RSA); - BN_copy(n->rsa->n, k->rsa->n); - BN_copy(n->rsa->e, k->rsa->e); + if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) || + (BN_copy(n->rsa->e, k->rsa->e) == NULL)) + fatal("sc_get_keys: BN_copy failed"); RSA_set_method(n->rsa, sc_get_rsa()); n->flags |= KEY_FLAG_EXT; keys[1] = n; diff --git a/crypto/openssh/scard/Makefile.in b/crypto/openssh/scard/Makefile.in index ab4e220..8519e20 100644 --- a/crypto/openssh/scard/Makefile.in +++ b/crypto/openssh/scard/Makefile.in @@ -1,7 +1,8 @@ -# $Id: Makefile.in,v 1.4 2002/04/26 01:25:41 djm Exp $ +# $Id: Makefile.in,v 1.5 2006/10/23 21:44:47 tim Exp $ prefix=@prefix@ datadir=@datadir@ +datarootdir=@datarootdir@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ diff --git a/crypto/openssh/serverloop.c b/crypto/openssh/serverloop.c index 6e5fdc2..69304b5 100644 --- a/crypto/openssh/serverloop.c +++ b/crypto/openssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.144 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: serverloop.c,v 1.145 2006/10/11 12:38:03 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -248,8 +248,10 @@ client_alive_check(void) int channel_id; /* timeout, check to see how many we have had */ - if (++client_alive_timeouts > options.client_alive_count_max) - packet_disconnect("Timeout, your session not responding."); + if (++client_alive_timeouts > options.client_alive_count_max) { + logit("Timeout, client not responding."); + cleanup_exit(255); + } /* * send a bogus global/channel request with "wantreply", diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index 15c5ca9..69153ad 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.219 2006/08/29 10:40:19 djm Exp $ */ +/* $OpenBSD: session.c,v 1.220 2006/10/09 23:36:11 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved diff --git a/crypto/openssh/sftp-client.c b/crypto/openssh/sftp-client.c index e31b2cf..42eb2b4 100644 --- a/crypto/openssh/sftp-client.c +++ b/crypto/openssh/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.74 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.75 2006/10/22 02:25:50 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -1134,6 +1134,8 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, if (status != SSH2_FX_OK) { error("Couldn't write to remote file \"%s\": %s", remote_path, fx2txt(status)); + if (showprogress) + stop_progress_meter(); do_close(conn, handle, handle_len); close(local_fd); xfree(data); diff --git a/crypto/openssh/sftp.c b/crypto/openssh/sftp.c index c018615..a39c782 100644 --- a/crypto/openssh/sftp.c +++ b/crypto/openssh/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.92 2006/09/19 05:52:23 otto Exp $ */ +/* $OpenBSD: sftp.c,v 1.93 2006/09/30 17:48:22 ray Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -977,6 +977,7 @@ parse_args(const char **cpp, int *pflag, int *lflag, int *iflag, case I_CHOWN: case I_CHGRP: /* Get numeric arg (mandatory) */ + errno = 0; l = strtol(cp, &cp2, base); if (cp2 == cp || ((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE) || l < 0) { diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c index 08b0721..ef95eb8 100644 --- a/crypto/openssh/ssh-agent.c +++ b/crypto/openssh/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.152 2006/08/04 20:46:05 stevesk Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.153 2006/10/06 02:29:19 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland diff --git a/crypto/openssh/ssh-dss.c b/crypto/openssh/ssh-dss.c index fbc078e..51a06e9 100644 --- a/crypto/openssh/ssh-dss.c +++ b/crypto/openssh/ssh-dss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-dss.c,v 1.23 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: ssh-dss.c,v 1.24 2006/11/06 21:25:28 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -161,8 +161,9 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen, fatal("ssh_dss_verify: BN_new failed"); if ((sig->s = BN_new()) == NULL) fatal("ssh_dss_verify: BN_new failed"); - BN_bin2bn(sigblob, INTBLOB_LEN, sig->r); - BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s); + if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) || + (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL)) + fatal("ssh_dss_verify: BN_bin2bn failed"); /* clean up */ memset(sigblob, 0, len); diff --git a/crypto/openssh/ssh-keygen.c b/crypto/openssh/ssh-keygen.c index 969bd23..1f42b93 100644 --- a/crypto/openssh/ssh-keygen.c +++ b/crypto/openssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.154 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.155 2006/11/06 21:25:28 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -222,7 +222,8 @@ buffer_get_bignum_bits(Buffer *b, BIGNUM *value) if (buffer_len(b) < bytes) fatal("buffer_get_bignum_bits: input buffer too small: " "need %d have %d", bytes, buffer_len(b)); - BN_bin2bn(buffer_ptr(b), bytes, value); + if (BN_bin2bn(buffer_ptr(b), bytes, value) == NULL) + fatal("buffer_get_bignum_bits: BN_bin2bn failed"); buffer_consume(b, bytes); } diff --git a/crypto/openssh/ssh-keyscan.1 b/crypto/openssh/ssh-keyscan.1 index 80fc8cd..a3656fc 100644 --- a/crypto/openssh/ssh-keyscan.1 +++ b/crypto/openssh/ssh-keyscan.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keyscan.1,v 1.21 2005/09/30 20:34:26 jaredy Exp $ +.\" $OpenBSD: ssh-keyscan.1,v 1.22 2006/09/25 04:55:38 ray Exp $ .\" .\" Copyright 1995, 1996 by David Mazieres . .\" @@ -102,7 +102,7 @@ Causes to print debugging messages about its progress. .El .Sh SECURITY -If a ssh_known_hosts file is constructed using +If an ssh_known_hosts file is constructed using .Nm without verifying the keys, users will be vulnerable to .Em man in the middle diff --git a/crypto/openssh/ssh-keyscan.c b/crypto/openssh/ssh-keyscan.c index 416d3f5..b198640 100644 --- a/crypto/openssh/ssh-keyscan.c +++ b/crypto/openssh/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.73 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.74 2006/10/06 02:29:19 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres . * diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1 index 6e41bcd..93be52f 100644 --- a/crypto/openssh/ssh.1 +++ b/crypto/openssh/ssh.1 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.263 2006/07/11 18:50:48 markus Exp $ +.\" $OpenBSD: ssh.1,v 1.265 2006/10/28 18:08:10 otto Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -1077,12 +1077,22 @@ controls whether the server supports this, and at what level (layer 2 or 3 traffic). .Pp The following example would connect client network 10.0.50.0/24 -with remote network 10.0.99.0/24, provided that the SSH server -running on the gateway to the remote network, -at 192.168.1.15, allows it: +with remote network 10.0.99.0/24 using a point-to-point connection +from 10.1.1.1 to 10.1.1.2, +provided that the SSH server running on the gateway to the remote network, +at 192.168.1.15, allows it. +.Pp +On the client: .Bd -literal -offset indent # ssh -f -w 0:1 192.168.1.15 true -# ifconfig tun0 10.0.50.1 10.0.99.1 netmask 255.255.255.252 +# ifconfig tun0 10.1.1.1 10.1.1.2 netmask 255.255.255.252 +# route add 10.0.99.0/24 10.1.1.2 +.Ed +.Pp +On the server: +.Bd -literal -offset indent +# ifconfig tun1 10.1.1.2 10.1.1.1 netmask 255.255.255.252 +# route add 10.0.50.0/24 10.1.1.1 .Ed .Pp Client access may be more finely tuned via the @@ -1105,7 +1115,7 @@ tunnel="1",command="sh /etc/netstart tun1" ssh-rsa ... jane tunnel="2",command="sh /etc/netstart tun2" ssh-rsa ... john .Ed .Pp -Since a SSH-based setup entails a fair amount of overhead, +Since an SSH-based setup entails a fair amount of overhead, it may be more suited to temporary setups, such as for wireless VPNs. More permanent VPNs are better provided by tools such as diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index efc4af6..47297ed 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.293 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: ssh.c,v 1.294 2006/10/06 02:29:19 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c index a7a4e8a..a222233 100644 --- a/crypto/openssh/sshconnect.c +++ b/crypto/openssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.199 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.200 2006/10/10 10:12:45 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -324,9 +324,11 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, gai_strerror(gaierr)); for (attempt = 0; attempt < connection_attempts; attempt++) { - if (attempt > 0) + if (attempt > 0) { + /* Sleep a moment before retrying. */ + sleep(1); debug("Trying again..."); - + } /* * Loop through addresses for this host, and try each one in * sequence until the connection succeeds. @@ -363,9 +365,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, } if (sock != -1) break; /* Successful connection. */ - - /* Sleep a moment before retrying. */ - sleep(1); } freeaddrinfo(aitop); diff --git a/crypto/openssh/sshconnect1.c b/crypto/openssh/sshconnect1.c index 90fcb34..fd07bbf 100644 --- a/crypto/openssh/sshconnect1.c +++ b/crypto/openssh/sshconnect1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect1.c,v 1.69 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: sshconnect1.c,v 1.70 2006/11/06 21:25:28 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -563,14 +563,20 @@ ssh_kex(char *host, struct sockaddr *hostaddr) * the first 16 bytes of the session id. */ if ((key = BN_new()) == NULL) - fatal("respond_to_rsa_challenge: BN_new failed"); - BN_set_word(key, 0); + fatal("ssh_kex: BN_new failed"); + if (BN_set_word(key, 0) == 0) + fatal("ssh_kex: BN_set_word failed"); for (i = 0; i < SSH_SESSION_KEY_LENGTH; i++) { - BN_lshift(key, key, 8); - if (i < 16) - BN_add_word(key, session_key[i] ^ session_id[i]); - else - BN_add_word(key, session_key[i]); + if (BN_lshift(key, key, 8) == 0) + fatal("ssh_kex: BN_lshift failed"); + if (i < 16) { + if (BN_add_word(key, session_key[i] ^ session_id[i]) + == 0) + fatal("ssh_kex: BN_add_word failed"); + } else { + if (BN_add_word(key, session_key[i]) == 0) + fatal("ssh_kex: BN_add_word failed"); + } } /* diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index 6159a5b..4aa1c98 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.347 2006/08/18 09:15:20 markus Exp $ */ +/* $OpenBSD: sshd.c,v 1.348 2006/11/06 21:25:28 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1431,13 +1431,17 @@ main(int ac, char **av) debug("sshd version %.100s", SSH_RELEASE); - /* Store privilege separation user for later use */ - if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) - fatal("Privilege separation user %s does not exist", - SSH_PRIVSEP_USER); - memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd)); - privsep_pw->pw_passwd = "*"; - privsep_pw = pwcopy(privsep_pw); + /* Store privilege separation user for later use if required. */ + if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) { + if (use_privsep || options.kerberos_authentication) + fatal("Privilege separation user %s does not exist", + SSH_PRIVSEP_USER); + } else { + memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd)); + privsep_pw = pwcopy(privsep_pw); + xfree(privsep_pw->pw_passwd); + privsep_pw->pw_passwd = xstrdup("*"); + } endpwent(); /* load private host keys */ @@ -2009,10 +2013,10 @@ do_ssh1_kex(void) * key is in the highest bits. */ if (!rsafail) { - BN_mask_bits(session_key_int, sizeof(session_key) * 8); + (void) BN_mask_bits(session_key_int, sizeof(session_key) * 8); len = BN_num_bytes(session_key_int); if (len < 0 || (u_int)len > sizeof(session_key)) { - error("do_connection: bad session key len from %s: " + error("do_ssh1_kex: bad session key len from %s: " "session_key_int %d > sizeof(session_key) %lu", get_remote_ipaddr(), len, (u_long)sizeof(session_key)); rsafail++; diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index 363e510..d16990a 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -1,6 +1,6 @@ -/* $OpenBSD: version.h,v 1.47 2006/08/30 00:14:37 djm Exp $ */ +/* $OpenBSD: version.h,v 1.48 2006/11/07 10:31:31 markus Exp $ */ -#define SSH_VERSION "OpenSSH_4.4" +#define SSH_VERSION "OpenSSH_4.5" #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -- cgit v1.1