tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-26 03:18:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2003/11/21 11:57:03

Browse Source 
[everything]
     unexpand and delete whitespace at EOL; ok markus@
     (done locally and RCS IDs synced)
This commit is contained in:
Damien Miller 2003-11-21 23:48:55 +11:00
parent 8c5e91c03f
commit a8e06cef35
82 changed files with 854 additions and 850 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CREDITS
View File

@ -94,5 +94,5 @@ Apologies to anyone I have missed.
Damien Miller <djm@mindrot.org> Damien Miller <djm@mindrot.org>
$Id: CREDITS,v 1.74 2003/09/07 02:34:54 dtucker Exp $ $Id: CREDITS,v 1.75 2003/11/21 12:48:55 djm Exp $

6
ChangeLog
View File

@ -3,6 +3,10 @@
- markus@cvs.openbsd.org 2003/11/20 11:39:28 - markus@cvs.openbsd.org 2003/11/20 11:39:28
[progressmeter.c] [progressmeter.c]
fix rounding errors; from andreas@ 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 20031118
- (djm) Fix early exit for root auth success when UsePAM=yes and - (djm) Fix early exit for root auth success when UsePAM=yes and
@ -1494,4 +1498,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3118 2003/11/21 12:09:10 djm Exp $ $Id: ChangeLog,v 1.3119 2003/11/21 12:48:55 djm Exp $

2
INSTALL
View File

@ -200,4 +200,4 @@ Please refer to the "reporting bugs" section of the webpage at
http://www.openssh.com/ http://www.openssh.com/
$Id: INSTALL,v 1.62 2003/10/21 02:41:14 dtucker Exp $ $Id: INSTALL,v 1.63 2003/11/21 12:48:55 djm Exp $

4
LICENCE
View File

@ -53,7 +53,7 @@ OpenSSH contains no GPL code.
your country, and I am not taking any responsibility on your behalf. your country, and I am not taking any responsibility on your behalf.
NO WARRANTY NO WARRANTY
BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@ -329,4 +329,4 @@ OpenSSH contains no GPL code.
------ ------
$OpenBSD: LICENCE,v 1.17 2003/08/22 20:55:06 markus Exp $ $OpenBSD: LICENCE,v 1.18 2003/11/21 11:57:02 djm Exp $

2
Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.252 2003/10/07 00:18:22 djm Exp $ # $Id: Makefile.in,v 1.253 2003/11/21 12:48:55 djm Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh # uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@ #SHELL = @SH@

8
OVERVIEW
View File

@ -150,7 +150,7 @@ these programs.
- The code for the server is in sshd.c. It contains a lot of - The code for the server is in sshd.c. It contains a lot of
stuff, including: stuff, including:
- server main program - server main program
- waiting for connections - waiting for connections
- processing new connection - processing new connection
- authentication - authentication
@ -162,9 +162,9 @@ these programs.
- There are several other files in the distribution that contain - There are several other files in the distribution that contain
various auxiliary routines: various auxiliary routines:
ssh.h the main header file for ssh (various definitions) ssh.h the main header file for ssh (various definitions)
getput.h byte-order independent storage of integers getput.h byte-order independent storage of integers
includes.h includes most system headers. Lots of #ifdefs. includes.h includes most system headers. Lots of #ifdefs.
tildexpand.c expand tilde in file names tildexpand.c expand tilde in file names
uidswap.c uid-swapping uidswap.c uid-swapping
xmalloc.c "safe" malloc routines xmalloc.c "safe" malloc routines

2
README
View File

@ -63,4 +63,4 @@ References -
[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
[7] http://www.openssh.com/faq.html [7] http://www.openssh.com/faq.html
$Id: README,v 1.51 2003/01/08 12:28:40 djm Exp $ $Id: README,v 1.52 2003/11/21 12:48:55 djm Exp $

2
README.privsep
View File

@ -61,4 +61,4 @@ process 1005 is the sshd process listening for new connections.
process 6917 is the privileged monitor process, 6919 is the user owned process 6917 is the privileged monitor process, 6919 is the user owned
sshd process and 6921 is the shell process. sshd process and 6921 is the shell process.
$Id: README.privsep,v 1.12 2003/08/26 00:48:15 djm Exp $ $Id: README.privsep,v 1.13 2003/11/21 12:48:55 djm Exp $

2
README.smartcard
View File

@ -90,4 +90,4 @@ Common operations:
-markus, -markus,
Tue Jul 17 23:54:51 CEST 2001 Tue Jul 17 23:54:51 CEST 2001
$OpenBSD: README.smartcard,v 1.8 2002/03/26 18:56:23 rees Exp $ $OpenBSD: README.smartcard,v 1.9 2003/11/21 11:57:02 djm Exp $

2
TODO
View File

@ -96,4 +96,4 @@ PrivSep Issues:
- Cygwin - Cygwin
+ Privsep for Pre-auth only (no fd passing) + Privsep for Pre-auth only (no fd passing)
$Id: TODO,v 1.55 2003/06/11 13:56:41 dtucker Exp $ $Id: TODO,v 1.56 2003/11/21 12:48:55 djm Exp $

2
WARNING.RNG
View File

@ -93,4 +93,4 @@ If you are forced to use ssh-rand-helper consider still downloading
prngd/egd and configure OpenSSH using --with-prngd-port=xx or prngd/egd and configure OpenSSH using --with-prngd-port=xx or
--with-prngd-socket=xx (refer to INSTALL for more information). --with-prngd-socket=xx (refer to INSTALL for more information).
$Id: WARNING.RNG,v 1.5 2002/04/14 13:16:05 djm Exp $ $Id: WARNING.RNG,v 1.6 2003/11/21 12:48:55 djm Exp $

2
auth-krb5.c
View File

@ -28,7 +28,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth-krb5.c,v 1.14 2003/11/04 08:54:09 djm Exp $"); RCSID("$OpenBSD: auth-krb5.c,v 1.15 2003/11/21 11:57:02 djm Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"

10
auth-pam.c
View File

@ -31,7 +31,7 @@
/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-pam.c,v 1.82 2003/11/18 01:45:36 dtucker Exp $"); RCSID("$Id: auth-pam.c,v 1.83 2003/11/21 12:48:55 djm Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#include <security/pam_appl.h> #include <security/pam_appl.h>
@ -402,11 +402,11 @@ sshpam_init(const char *user)
return (-1); return (-1);
} }
#ifdef PAM_TTY_KLUDGE #ifdef PAM_TTY_KLUDGE
/* /*
* Some silly PAM modules (e.g. pam_time) require a TTY to operate. * Some silly PAM modules (e.g. pam_time) require a TTY to operate.
* sshd doesn't set the tty until too late in the auth process and * sshd doesn't set the tty until too late in the auth process and
* may not even set one (for tty-less connections) * may not even set one (for tty-less connections)
*/ */
debug("PAM: setting PAM_TTY to \"ssh\""); debug("PAM: setting PAM_TTY to \"ssh\"");
sshpam_err = pam_set_item(sshpam_handle, PAM_TTY, "ssh"); sshpam_err = pam_set_item(sshpam_handle, PAM_TTY, "ssh");
if (sshpam_err != PAM_SUCCESS) { if (sshpam_err != PAM_SUCCESS) {

4
auth-passwd.c
View File

@ -106,9 +106,9 @@ auth_password(Authctxt *authctxt, const char *password)
debug3("AIX/authenticate succeeded for user %s: %.100s", debug3("AIX/authenticate succeeded for user %s: %.100s",
pw->pw_name, authmsg); pw->pw_name, authmsg);
/* No pty yet, so just label the line as "ssh" */ /* No pty yet, so just label the line as "ssh" */
aix_setauthdb(authctxt->user); aix_setauthdb(authctxt->user);
if (loginsuccess(authctxt->user, host, "ssh", if (loginsuccess(authctxt->user, host, "ssh",
&msg) == 0) { &msg) == 0) {
if (msg != NULL) { if (msg != NULL) {
debug("%s: msg %s", __func__, msg); debug("%s: msg %s", __func__, msg);

8
auth.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth.c,v 1.50 2003/09/23 20:17:11 markus Exp $"); RCSID("$OpenBSD: auth.c,v 1.51 2003/11/21 11:57:02 djm Exp $");
#ifdef HAVE_LOGIN_H #ifdef HAVE_LOGIN_H
#include <login.h> #include <login.h>
@ -129,7 +129,7 @@ allowed_user(struct passwd * pw)
#endif /* HAS_SHADOW_EXPIRE */ #endif /* HAS_SHADOW_EXPIRE */
#endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */ #endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
/* grab passwd field for locked account check */ /* grab passwd field for locked account check */
#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
if (spw != NULL) if (spw != NULL)
passwd = spw->sp_pwdp; passwd = spw->sp_pwdp;
@ -249,7 +249,7 @@ allowed_user(struct passwd * pw)
if ((pw->pw_uid != 0) && (geteuid() == 0)) { if ((pw->pw_uid != 0) && (geteuid() == 0)) {
char *msg; char *msg;
if (loginrestrictions(pw->pw_name, S_RLOGIN, NULL, &msg) != 0) { if (loginrestrictions(pw->pw_name, S_RLOGIN, NULL, &msg) != 0) {
int loginrestrict_errno = errno; int loginrestrict_errno = errno;
if (msg && *msg) { if (msg && *msg) {
@ -259,7 +259,7 @@ allowed_user(struct passwd * pw)
pw->pw_name, msg); pw->pw_name, msg);
} }
/* Don't fail if /etc/nologin set */ /* Don't fail if /etc/nologin set */
if (!(loginrestrict_errno == EPERM && if (!(loginrestrict_errno == EPERM &&
stat(_PATH_NOLOGIN, &st) == 0)) stat(_PATH_NOLOGIN, &st) == 0))
return 0; return 0;
} }

6
auth2-gss.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-gss.c,v 1.6 2003/11/17 11:06:07 markus Exp $ */ /* $OpenBSD: auth2-gss.c,v 1.7 2003/11/21 11:57:03 djm Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -85,8 +85,8 @@ userauth_gssapi(Authctxt *authctxt)
if (len > 2 && if (len > 2 &&
doid[0] == SSH_GSS_OIDTYPE && doid[0] == SSH_GSS_OIDTYPE &&
doid[1] == len - 2) { doid[1] == len - 2) {
oid.elements = doid + 2; oid.elements = doid + 2;
oid.length = len - 2; oid.length = len - 2;
gss_test_oid_set_member(&ms, &oid, supported, gss_test_oid_set_member(&ms, &oid, supported,
&present); &present);
} else { } else {

2
authfd.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: authfd.c,v 1.62 2003/09/18 13:02:21 miod Exp $"); RCSID("$OpenBSD: authfd.c,v 1.63 2003/11/21 11:57:03 djm Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>

2
authfd.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfd.h,v 1.33 2003/06/11 11:18:38 djm Exp $ */ /* $OpenBSD: authfd.h,v 1.34 2003/11/21 11:57:03 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>

2
buffer.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: buffer.c,v 1.20 2003/09/19 09:03:00 markus Exp $"); RCSID("$OpenBSD: buffer.c,v 1.21 2003/11/21 11:57:03 djm Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"

2
channels.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.197 2003/09/23 20:41:11 markus Exp $"); RCSID("$OpenBSD: channels.c,v 1.198 2003/11/21 11:57:03 djm Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"

4
cipher-ctr.c
View File

@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: cipher-ctr.c,v 1.2 2003/06/17 18:14:23 markus Exp $"); RCSID("$OpenBSD: cipher-ctr.c,v 1.3 2003/11/21 11:57:03 djm Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
@ -94,7 +94,7 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
EVP_CIPHER_CTX_set_app_data(ctx, c); EVP_CIPHER_CTX_set_app_data(ctx, c);
} }
if (key != NULL) if (key != NULL)
AES_set_encrypt_key(key, ctx->key_len * 8, &c->aes_ctx); AES_set_encrypt_key(key, ctx->key_len * 8, &c->aes_ctx);
if (iv != NULL) if (iv != NULL)
memcpy(c->aes_counter, iv, AES_BLOCK_SIZE); memcpy(c->aes_counter, iv, AES_BLOCK_SIZE);
return (1); return (1);

158
config.guess vendored
View File

@ -174,7 +174,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
fi fi
;; ;;
*) *)
os=netbsd os=netbsd
;; ;;
esac esac
# The OS release # The OS release
@ -382,23 +382,23 @@ EOF
# MiNT. But MiNT is downward compatible to TOS, so this should # MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem. # be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE} echo m68k-atari-mint${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE} echo m68k-atari-mint${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE} echo m68k-atari-mint${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE} echo m68k-milan-mint${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE} echo m68k-hades-mint${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE} echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
powerpc:machten:*:*) powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE} echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
@ -462,8 +462,8 @@ EOF
echo m88k-motorola-sysv3 echo m88k-motorola-sysv3
exit 0 ;; exit 0 ;;
AViiON:dgux:*:*) AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures # DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p` UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@ -476,7 +476,7 @@ EOF
else else
echo i586-dg-dgux${UNAME_RELEASE} echo i586-dg-dgux${UNAME_RELEASE}
fi fi
exit 0 ;; exit 0 ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3) M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3 echo m88k-dolphin-sysv3
exit 0 ;; exit 0 ;;
@ -573,52 +573,52 @@ EOF
9000/[678][0-9][0-9]) 9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in case "${sc_cpu_version}" in
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0 532) # CPU_PA_RISC2_0
case "${sc_kernel_bits}" in case "${sc_kernel_bits}" in
32) HP_ARCH="hppa2.0n" ;; 32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;; 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;; esac ;;
esac esac
fi fi
if [ "${HP_ARCH}" = "" ]; then if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE #define _HPUX_SOURCE
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
int main () int main ()
{ {
#if defined(_SC_KERNEL_BITS) #if defined(_SC_KERNEL_BITS)
long bits = sysconf(_SC_KERNEL_BITS); long bits = sysconf(_SC_KERNEL_BITS);
#endif #endif
long cpu = sysconf (_SC_CPU_VERSION); long cpu = sysconf (_SC_CPU_VERSION);
switch (cpu) switch (cpu)
{ {
case CPU_PA_RISC1_0: puts ("hppa1.0"); break; case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
case CPU_PA_RISC1_1: puts ("hppa1.1"); break; case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
case CPU_PA_RISC2_0: case CPU_PA_RISC2_0:
#if defined(_SC_KERNEL_BITS) #if defined(_SC_KERNEL_BITS)
switch (bits) switch (bits)
{ {
case 64: puts ("hppa2.0w"); break; case 64: puts ("hppa2.0w"); break;
case 32: puts ("hppa2.0n"); break; case 32: puts ("hppa2.0n"); break;
default: puts ("hppa2.0"); break; default: puts ("hppa2.0"); break;
} break; } break;
#else /* !defined(_SC_KERNEL_BITS) */ #else /* !defined(_SC_KERNEL_BITS) */
puts ("hppa2.0"); break; puts ("hppa2.0"); break;
#endif #endif
default: puts ("hppa1.0"); break; default: puts ("hppa1.0"); break;
} }
exit (0); exit (0);
} }
EOF EOF
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy` (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy`
if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
@ -689,22 +689,22 @@ EOF
exit 0 ;; exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd echo c1-convex-bsd
exit 0 ;; exit 0 ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc if getsysinfo -f scalar_acc
then echo c32-convex-bsd then echo c32-convex-bsd
else echo c2-convex-bsd else echo c2-convex-bsd
fi fi
exit 0 ;; exit 0 ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd echo c34-convex-bsd
exit 0 ;; exit 0 ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd echo c38-convex-bsd
exit 0 ;; exit 0 ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd echo c4-convex-bsd
exit 0 ;; exit 0 ;;
CRAY*Y-MP:*:*:*) CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;; exit 0 ;;
@ -731,10 +731,10 @@ EOF
exit 0 ;; exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;; exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
@ -836,7 +836,7 @@ EOF
EV6) UNAME_MACHINE=alphaev6 ;; EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;; EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;; EV68*) UNAME_MACHINE=alphaev68 ;;
esac esac
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@ -875,7 +875,7 @@ EOF
s/.*supported targets: *// s/.*supported targets: *//
s/ .*// s/ .*//
p'` p'`
case "$ld_supported_targets" in case "$ld_supported_targets" in
elf32-i386) elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;; ;;
@ -925,11 +925,11 @@ EOF
echo i386-sequent-sysv4 echo i386-sequent-sysv4
exit 0 ;; exit 0 ;;
i*86:UNIX_SV:4.2MP:2.*) i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version # Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2... # number series starting with 2...
# I am not positive that other SVR4 systems won't match this, # I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms. # I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it. # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;; exit 0 ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
@ -971,10 +971,10 @@ EOF
exit 0 ;; exit 0 ;;
pc:*:*:*) pc:*:*:*)
# Left here for compatibility: # Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about # uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386. # the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp echo i386-pc-msdosdjgpp
exit 0 ;; exit 0 ;;
Intel:Mach:3*:*) Intel:Mach:3*:*)
echo i386-pc-mach3 echo i386-pc-mach3
exit 0 ;; exit 0 ;;
@ -1003,8 +1003,8 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& echo i486-ncr-sysv4 && exit 0 ;; && echo i486-ncr-sysv4 && exit 0 ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE} echo m68k-unknown-lynxos${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
@ -1041,9 +1041,9 @@ EOF
fi fi
exit 0 ;; exit 0 ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel@ccMail.Census.GOV> # says <Richard.M.Bartel@ccMail.Census.GOV>
echo i586-unisys-sysv4 echo i586-unisys-sysv4
exit 0 ;; exit 0 ;;
*:UNIX_System_V:4*:FTX*) *:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes@openmarket.com>. # From Gerald Hewes <hewes@openmarket.com>.
# How about differentiating between stratus architectures? -djm # How about differentiating between stratus architectures? -djm
@ -1065,11 +1065,11 @@ EOF
exit 0 ;; exit 0 ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE} echo mips-nec-sysv${UNAME_RELEASE}
else else
echo mips-unknown-sysv${UNAME_RELEASE} echo mips-unknown-sysv${UNAME_RELEASE}
fi fi
exit 0 ;; exit 0 ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos echo powerpc-be-beos
exit 0 ;; exit 0 ;;
@ -1179,11 +1179,11 @@ main ()
#include <sys/param.h> #include <sys/param.h>
printf ("m68k-sony-newsos%s\n", printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4 #ifdef NEWSOS4
"4" "4"
#else #else
"" ""
#endif #endif
); exit (0); ); exit (0);
#endif #endif
#endif #endif

48
config.sub vendored
View File

@ -162,10 +162,10 @@ case $os in
os=-chorusos os=-chorusos
basic_machine=$1 basic_machine=$1
;; ;;
-chorusrdb) -chorusrdb)
os=-chorusrdb os=-chorusrdb
basic_machine=$1 basic_machine=$1
;; ;;
-hiux*) -hiux*)
os=-hiuxwe2 os=-hiuxwe2
;; ;;
@ -748,7 +748,7 @@ case $basic_machine in
pbb) pbb)
basic_machine=m68k-tti basic_machine=m68k-tti
;; ;;
pc532 | pc532-*) pc532 | pc532-*)
basic_machine=ns32k-pc532 basic_machine=ns32k-pc532
;; ;;
pentium | p5 | k5 | k6 | nexgen | viac3) pentium | p5 | k5 | k6 | nexgen | viac3)
@ -775,22 +775,22 @@ case $basic_machine in
power) basic_machine=power-ibm power) basic_machine=power-ibm
;; ;;
ppc) basic_machine=powerpc-unknown ppc) basic_machine=powerpc-unknown
;; ;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
ppcle | powerpclittle | ppc-le | powerpc-little) ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown basic_machine=powerpcle-unknown
;; ;;
ppcle-* | powerpclittle-*) ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
ppc64) basic_machine=powerpc64-unknown ppc64) basic_machine=powerpc64-unknown
;; ;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little) ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown basic_machine=powerpc64le-unknown
;; ;;
ppc64le-* | powerpc64little-*) ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
@ -886,11 +886,11 @@ case $basic_machine in
sun386 | sun386i | roadrunner) sun386 | sun386i | roadrunner)
basic_machine=i386-sun basic_machine=i386-sun
;; ;;
sv1) sv1)
basic_machine=sv1-cray basic_machine=sv1-cray
os=-unicos os=-unicos
;; ;;
sx*-nec) sx*-nec)
basic_machine=sx6-nec basic_machine=sx6-nec
os=-sysv os=-sysv
;; ;;
@ -948,8 +948,8 @@ case $basic_machine in
os=-vms os=-vms
;; ;;
vpp*|vx|vx-*) vpp*|vx|vx-*)
basic_machine=f301-fujitsu basic_machine=f301-fujitsu
;; ;;
vxworks960) vxworks960)
basic_machine=i960-wrs basic_machine=i960-wrs
os=-vxworks os=-vxworks
@ -974,7 +974,7 @@ case $basic_machine in
basic_machine=i386-pc basic_machine=i386-pc
os=-windows32-msvcrt os=-windows32-msvcrt
;; ;;
xps | xps100) xps | xps100)
basic_machine=xps100-honeywell basic_machine=xps100-honeywell
;; ;;
ymp) ymp)
@ -1029,7 +1029,7 @@ case $basic_machine in
sparc | sparcv9 | sparcv9b) sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun basic_machine=sparc-sun
;; ;;
cydra) cydra)
basic_machine=cydra-cydrome basic_machine=cydra-cydrome
;; ;;
orion) orion)
@ -1074,8 +1074,8 @@ esac
if [ x"$os" != x"" ] if [ x"$os" != x"" ]
then then
case $os in case $os in
# First match some system type aliases # First match some system type aliases
# that might get confused with valid system types. # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception. # -solaris* is a basic system type, with this one exception.
-solaris1 | -solaris1.*) -solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'` os=`echo $os | sed -e 's|solaris1|sunos4|'`
@ -1179,7 +1179,7 @@ case $os in
os=-rtmk-nova os=-rtmk-nova
;; ;;
-ns2 ) -ns2 )
os=-nextstep2 os=-nextstep2
;; ;;
-nsk*) -nsk*)
os=-nsk os=-nsk
@ -1218,8 +1218,8 @@ case $os in
-xenix) -xenix)
os=-xenix os=-xenix
;; ;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint os=-mint
;; ;;
-none) -none)
;; ;;
@ -1256,7 +1256,7 @@ case $basic_machine in
pdp10-*) pdp10-*)
os=-tops20 os=-tops20
;; ;;
pdp11-*) pdp11-*)
os=-none os=-none
;; ;;
*-dec | vax-*) *-dec | vax-*)
@ -1349,19 +1349,19 @@ case $basic_machine in
*-next) *-next)
os=-nextstep3 os=-nextstep3
;; ;;
*-gould) *-gould)
os=-sysv os=-sysv
;; ;;
*-highlevel) *-highlevel)
os=-bsd os=-bsd
;; ;;
*-encore) *-encore)
os=-bsd os=-bsd
;; ;;
*-sgi) *-sgi)
os=-irix os=-irix
;; ;;
*-siemens) *-siemens)
os=-sysv4 os=-sysv4
;; ;;
*-masscomp) *-masscomp)

116
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.173 2003/10/15 06:57:57 dtucker Exp $ # $Id: configure.ac,v 1.174 2003/11/21 12:48:55 djm Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -617,17 +617,17 @@ AC_EGREP_CPP(FOUNDIT,
# Check for g.gl_matchc glob() extension # Check for g.gl_matchc glob() extension
AC_MSG_CHECKING(for gl_matchc field in glob_t) AC_MSG_CHECKING(for gl_matchc field in glob_t)
AC_EGREP_CPP(FOUNDIT, AC_EGREP_CPP(FOUNDIT,
[ [
#include <glob.h> #include <glob.h>
int main(void){glob_t g; g.gl_matchc = 1;} int main(void){glob_t g; g.gl_matchc = 1;}
], ],
[ [
AC_DEFINE(GLOB_HAS_GL_MATCHC) AC_DEFINE(GLOB_HAS_GL_MATCHC)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
], ],
[ [
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
] ]
) )
AC_MSG_CHECKING([whether struct dirent allocates space for d_name]) AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
@ -648,7 +648,7 @@ int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
SKEY_MSG="no" SKEY_MSG="no"
AC_ARG_WITH(skey, AC_ARG_WITH(skey,
[ --with-skey[[=PATH]] Enable S/Key support [ --with-skey[[=PATH]] Enable S/Key support
(optionally in PATH)], (optionally in PATH)],
[ [
if test "x$withval" != "xno" ; then if test "x$withval" != "xno" ; then
@ -681,7 +681,7 @@ int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); }
TCPW_MSG="no" TCPW_MSG="no"
AC_ARG_WITH(tcp-wrappers, AC_ARG_WITH(tcp-wrappers,
[ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support
(optionally in PATH)], (optionally in PATH)],
[ [
if test "x$withval" != "xno" ; then if test "x$withval" != "xno" ; then
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
@ -994,12 +994,12 @@ AC_TRY_RUN(
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#define DATA "conftest.sslincver" #define DATA "conftest.sslincver"
int main(void) { int main(void) {
FILE *fd; FILE *fd;
int rc; int rc;
fd = fopen(DATA,"w"); fd = fopen(DATA,"w");
if(fd == NULL) if(fd == NULL)
exit(1); exit(1);
if ((rc = fprintf(fd ,"%x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0) if ((rc = fprintf(fd ,"%x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0)
exit(1); exit(1);
@ -1027,12 +1027,12 @@ AC_TRY_RUN(
#include <openssl/crypto.h> #include <openssl/crypto.h>
#define DATA "conftest.ssllibver" #define DATA "conftest.ssllibver"
int main(void) { int main(void) {
FILE *fd; FILE *fd;
int rc; int rc;
fd = fopen(DATA,"w"); fd = fopen(DATA,"w");
if(fd == NULL) if(fd == NULL)
exit(1); exit(1);
if ((rc = fprintf(fd ,"%x (%s)\n", SSLeay(), SSLeay_version(SSLEAY_VERSION))) <0) if ((rc = fprintf(fd ,"%x (%s)\n", SSLeay(), SSLeay_version(SSLEAY_VERSION))) <0)
exit(1); exit(1);
@ -1322,7 +1322,7 @@ if test "x$ac_cv_have_intxx_t" = "xyes" ; then
fi fi
if (test -z "$have_intxx_t" && \ if (test -z "$have_intxx_t" && \
test "x$ac_cv_header_stdint_h" = "xyes") test "x$ac_cv_header_stdint_h" = "xyes")
then then
AC_MSG_CHECKING([for intXX_t types in stdint.h]) AC_MSG_CHECKING([for intXX_t types in stdint.h])
AC_TRY_COMPILE( AC_TRY_COMPILE(
@ -1439,7 +1439,7 @@ if test -z "$have_uintxx_t" ; then
fi fi
if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \ if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \
test "x$ac_cv_header_sys_bitypes_h" = "xyes") test "x$ac_cv_header_sys_bitypes_h" = "xyes")
then then
AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h]) AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h])
AC_TRY_COMPILE( AC_TRY_COMPILE(
@ -1679,7 +1679,7 @@ main()
strcpy(expected_out, "9223372036854775807"); strcpy(expected_out, "9223372036854775807");
snprintf(buf, mazsize, "%lld", num); snprintf(buf, mazsize, "%lld", num);
if(strcmp(buf, expected_out) != 0) if(strcmp(buf, expected_out) != 0)
exit(1); exit(1);
exit(0); exit(0);
} }
#else #else
@ -1977,35 +1977,35 @@ AC_SEARCH_LIBS(getrrsetbyname, resolv,
# Check whether user wants Kerberos 5 support # Check whether user wants Kerberos 5 support
KRB5_MSG="no" KRB5_MSG="no"
AC_ARG_WITH(kerberos5, AC_ARG_WITH(kerberos5,
[ --with-kerberos5=PATH Enable Kerberos 5 support], [ --with-kerberos5=PATH Enable Kerberos 5 support],
[ [
if test "x$withval" != "xno" ; then if test "x$withval" != "xno" ; then
if test "x$withval" = "xyes" ; then if test "x$withval" = "xyes" ; then
KRB5ROOT="/usr/local" KRB5ROOT="/usr/local"
else else
KRB5ROOT=${withval} KRB5ROOT=${withval}
fi fi
CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include" CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib" LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
AC_DEFINE(KRB5) AC_DEFINE(KRB5)
KRB5_MSG="yes" KRB5_MSG="yes"
AC_MSG_CHECKING(whether we are using Heimdal) AC_MSG_CHECKING(whether we are using Heimdal)
AC_TRY_COMPILE([ #include <krb5.h> ], AC_TRY_COMPILE([ #include <krb5.h> ],
[ char *tmp = heimdal_version; ], [ char *tmp = heimdal_version; ],
[ AC_MSG_RESULT(yes) [ AC_MSG_RESULT(yes)
AC_DEFINE(HEIMDAL) AC_DEFINE(HEIMDAL)
K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken" K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken"
], ],
[ AC_MSG_RESULT(no) [ AC_MSG_RESULT(no)
K5LIBS="-lkrb5 -lk5crypto -lcom_err" K5LIBS="-lkrb5 -lk5crypto -lcom_err"
] ]
) )
if test ! -z "$need_dash_r" ; then if test ! -z "$need_dash_r" ; then
LDFLAGS="$LDFLAGS -R${KRB5ROOT}/lib" LDFLAGS="$LDFLAGS -R${KRB5ROOT}/lib"
fi fi
if test ! -z "$blibpath" ; then if test ! -z "$blibpath" ; then
blibpath="$blibpath:${KRB5ROOT}/lib" blibpath="$blibpath:${KRB5ROOT}/lib"
fi fi
AC_SEARCH_LIBS(dn_expand, resolv) AC_SEARCH_LIBS(dn_expand, resolv)
AC_CHECK_LIB(gssapi,gss_init_sec_context, AC_CHECK_LIB(gssapi,gss_init_sec_context,
@ -2013,7 +2013,7 @@ AC_ARG_WITH(kerberos5,
K5LIBS="-lgssapi $K5LIBS" ], K5LIBS="-lgssapi $K5LIBS" ],
[ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context, [ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context,
[ AC_DEFINE(GSSAPI) [ AC_DEFINE(GSSAPI)
K5LIBS="-lgssapi_krb5 $K5LIBS" ], K5LIBS="-lgssapi_krb5 $K5LIBS" ],
AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]), AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
$K5LIBS) $K5LIBS)
], ],
@ -2033,9 +2033,9 @@ AC_ARG_WITH(kerberos5,
AC_CHECK_HEADER(gssapi_krb5.h, , AC_CHECK_HEADER(gssapi_krb5.h, ,
[ CPPFLAGS="$oldCPP" ]) [ CPPFLAGS="$oldCPP" ])
KRB5=yes KRB5=yes
fi fi
] ]
) )
LIBS="$LIBS $K5LIBS" LIBS="$LIBS $K5LIBS"
@ -2364,7 +2364,7 @@ piddir=/var/run
if test ! -d $piddir ; then if test ! -d $piddir ; then
piddir=`eval echo ${sysconfdir}` piddir=`eval echo ${sysconfdir}`
case $piddir in case $piddir in
NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;; NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;;
esac esac
fi fi

36
contrib/aix/buildbff.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# buildbff.sh: Create AIX SMIT-installable OpenSSH packages # buildbff.sh: Create AIX SMIT-installable OpenSSH packages
# $Id: buildbff.sh,v 1.6 2003/08/25 05:01:04 dtucker Exp $ # $Id: buildbff.sh,v 1.7 2003/11/21 12:48:56 djm Exp $
# #
# Author: Darren Tucker (dtucker at zip dot com dot au) # Author: Darren Tucker (dtucker at zip dot com dot au)
# This file is placed in the public domain and comes with absolutely # This file is placed in the public domain and comes with absolutely
@ -138,13 +138,13 @@ echo "Building BFF for $PKGNAME $VERSION (package version $BFFVERSION)"
# #
if [ "${PERMIT_ROOT_LOGIN}" = no ] if [ "${PERMIT_ROOT_LOGIN}" = no ]
then then
perl -p -i -e "s/#PermitRootLogin yes/PermitRootLogin no/" \ perl -p -i -e "s/#PermitRootLogin yes/PermitRootLogin no/" \
$FAKE_ROOT/${sysconfdir}/sshd_config $FAKE_ROOT/${sysconfdir}/sshd_config
fi fi
if [ "${X11_FORWARDING}" = yes ] if [ "${X11_FORWARDING}" = yes ]
then then
perl -p -i -e "s/#X11Forwarding no/X11Forwarding yes/" \ perl -p -i -e "s/#X11Forwarding no/X11Forwarding yes/" \
$FAKE_ROOT/${sysconfdir}/sshd_config $FAKE_ROOT/${sysconfdir}/sshd_config
fi fi
@ -190,13 +190,13 @@ cat <<EOF >>../openssh.post_i
echo Creating configs from defaults if necessary. echo Creating configs from defaults if necessary.
for cfgfile in ssh_config sshd_config ssh_prng_cmds for cfgfile in ssh_config sshd_config ssh_prng_cmds
do do
if [ ! -f $sysconfdir/\$cfgfile ] if [ ! -f $sysconfdir/\$cfgfile ]
then then
echo "Creating \$cfgfile from default" echo "Creating \$cfgfile from default"
cp $sysconfdir/\$cfgfile.default $sysconfdir/\$cfgfile cp $sysconfdir/\$cfgfile.default $sysconfdir/\$cfgfile
else else
echo "\$cfgfile already exists." echo "\$cfgfile already exists."
fi fi
done done
echo echo
@ -244,19 +244,19 @@ echo
# Generate keys unless they already exist # Generate keys unless they already exist
echo Creating host keys if required. echo Creating host keys if required.
if [ -f "$sysconfdir/ssh_host_key" ] ; then if [ -f "$sysconfdir/ssh_host_key" ] ; then
echo "$sysconfdir/ssh_host_key already exists, skipping." echo "$sysconfdir/ssh_host_key already exists, skipping."
else else
$bindir/ssh-keygen -t rsa1 -f $sysconfdir/ssh_host_key -N "" $bindir/ssh-keygen -t rsa1 -f $sysconfdir/ssh_host_key -N ""
fi fi
if [ -f $sysconfdir/ssh_host_dsa_key ] ; then if [ -f $sysconfdir/ssh_host_dsa_key ] ; then
echo "$sysconfdir/ssh_host_dsa_key already exists, skipping." echo "$sysconfdir/ssh_host_dsa_key already exists, skipping."
else else
$bindir/ssh-keygen -t dsa -f $sysconfdir/ssh_host_dsa_key -N "" $bindir/ssh-keygen -t dsa -f $sysconfdir/ssh_host_dsa_key -N ""
fi fi
if [ -f $sysconfdir/ssh_host_rsa_key ] ; then if [ -f $sysconfdir/ssh_host_rsa_key ] ; then
echo "$sysconfdir/ssh_host_rsa_key already exists, skipping." echo "$sysconfdir/ssh_host_rsa_key already exists, skipping."
else else
$bindir/ssh-keygen -t rsa -f $sysconfdir/ssh_host_rsa_key -N "" $bindir/ssh-keygen -t rsa -f $sysconfdir/ssh_host_rsa_key -N ""
fi fi
echo echo

2
contrib/aix/inventory.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# inventory.sh # inventory.sh
# $Id: inventory.sh,v 1.5 2003/08/26 03:43:13 dtucker Exp $ # $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 # Originally written by Ben Lindstrom, modified by Darren Tucker to use perl
# This file is placed into the public domain. # This file is placed into the public domain.

8
contrib/caldera/ssh-host-keygen
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# #
# $Id: ssh-host-keygen,v 1.1 2001/04/27 05:50:50 tim Exp $ # $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 # This script is normally run only *once* for a given host
# (in a given period of time) -- on updates/upgrades/recovery # (in a given period of time) -- on updates/upgrades/recovery
@ -12,7 +12,7 @@ keydir=@sysconfdir@
keygen=@sshkeygen@ keygen=@sshkeygen@
if [ -f $keydir/ssh_host_key -o \ if [ -f $keydir/ssh_host_key -o \
-f $keydir/ssh_host_key.pub ]; then -f $keydir/ssh_host_key.pub ]; then
echo "You already have an SSH1 RSA host key in $keydir/ssh_host_key." echo "You already have an SSH1 RSA host key in $keydir/ssh_host_key."
else else
echo "Generating 1024 bit SSH1 RSA host key." echo "Generating 1024 bit SSH1 RSA host key."
@ -20,7 +20,7 @@ else
fi fi
if [ -f $keydir/ssh_host_rsa_key -o \ if [ -f $keydir/ssh_host_rsa_key -o \
-f $keydir/ssh_host_rsa_key.pub ]; then -f $keydir/ssh_host_rsa_key.pub ]; then
echo "You already have an SSH2 RSA host key in $keydir/ssh_host_rsa_key." echo "You already have an SSH2 RSA host key in $keydir/ssh_host_rsa_key."
else else
echo "Generating 1024 bit SSH2 RSA host key." echo "Generating 1024 bit SSH2 RSA host key."
@ -28,7 +28,7 @@ else
fi fi
if [ -f $keydir/ssh_host_dsa_key -o \ if [ -f $keydir/ssh_host_dsa_key -o \
-f $keydir/ssh_host_dsa_key.pub ]; then -f $keydir/ssh_host_dsa_key.pub ]; then
echo "You already have an SSH2 DSA host key in $keydir/ssh_host_dsa_key." echo "You already have an SSH2 DSA host key in $keydir/ssh_host_dsa_key."
else else
echo "Generating SSH2 DSA host key." echo "Generating SSH2 DSA host key."

8
contrib/caldera/sshd.init
View File

@ -1,6 +1,6 @@
#! /bin/bash #! /bin/bash
# #
# $Id: sshd.init,v 1.3 2001/11/03 19:09:33 tim Exp $ # $Id: sshd.init,v 1.4 2003/11/21 12:48:57 djm Exp $
# #
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: # Provides:
@ -64,11 +64,11 @@ case "$1" in
SVIemptyConfig @sysconfdir@/sshd_config && exit 6 SVIemptyConfig @sysconfdir@/sshd_config && exit 6
if [ ! \( -f @sysconfdir@/ssh_host_key -a \ if [ ! \( -f @sysconfdir@/ssh_host_key -a \
-f @sysconfdir@/ssh_host_key.pub \) -a \ -f @sysconfdir@/ssh_host_key.pub \) -a \
! \( -f @sysconfdir@/ssh_host_rsa_key -a \ ! \( -f @sysconfdir@/ssh_host_rsa_key -a \
-f @sysconfdir@/ssh_host_rsa_key.pub \) -a \ -f @sysconfdir@/ssh_host_rsa_key.pub \) -a \
! \( -f @sysconfdir@/ssh_host_dsa_key -a \ ! \( -f @sysconfdir@/ssh_host_dsa_key -a \
-f @sysconfdir@/ssh_host_dsa_key.pub \) ]; then -f @sysconfdir@/ssh_host_dsa_key.pub \) ]; then
echo "$SVIsubsys: host key not initialized: skipped!" echo "$SVIsubsys: host key not initialized: skipped!"
echo "$SVIsubsys: use ssh-host-keygen to generate one!" echo "$SVIsubsys: use ssh-host-keygen to generate one!"

14
contrib/cygwin/ssh-host-config
View File

@ -263,7 +263,7 @@ then
net user sshd >/dev/null 2>&1 && sshd_in_sam=yes net user sshd >/dev/null 2>&1 && sshd_in_sam=yes
if [ "${sshd_in_passwd}" != "yes" ] if [ "${sshd_in_passwd}" != "yes" ]
then then
if [ "${sshd_in_sam}" != "yes" ] if [ "${sshd_in_sam}" != "yes" ]
then then
echo "Warning: The following function requires administrator privileges!" echo "Warning: The following function requires administrator privileges!"
if request "Should this script create a local user 'sshd' on this machine?" if request "Should this script create a local user 'sshd' on this machine?"
@ -388,9 +388,9 @@ then
then then
if mv "${_inetcnf_tmp}" "${_inetcnf}" if mv "${_inetcnf_tmp}" "${_inetcnf}"
then then
echo "Removed sshd from ${_inetcnf}" echo "Removed sshd from ${_inetcnf}"
else else
echo "Removing sshd from ${_inetcnf} failed!" echo "Removing sshd from ${_inetcnf} failed!"
fi fi
rm -f "${_inetcnf_tmp}" rm -f "${_inetcnf_tmp}"
else else
@ -462,7 +462,7 @@ then
do do
if [ -n "${password_value}" ] if [ -n "${password_value}" ]
then then
_password="${password_value}" _password="${password_value}"
# Allow to ask for password if first try fails # Allow to ask for password if first try fails
password_value="" password_value=""
else else
@ -541,7 +541,7 @@ then
fi fi
if [ -n "${cygwin_value}" ] if [ -n "${cygwin_value}" ]
then then
_cygwin="${cygwin_value}" _cygwin="${cygwin_value}"
else else
echo echo
echo "Which value should the environment variable CYGWIN have when" echo "Which value should the environment variable CYGWIN have when"
@ -574,9 +574,9 @@ then
then then
if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ] if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ]
then then
_user="sshd_server" _user="sshd_server"
else else
_user="system" _user="system"
fi fi
chown "${_user}" ${SYSCONFDIR}/ssh* chown "${_user}" ${SYSCONFDIR}/ssh*
chown "${_user}".544 ${LOCALSTATEDIR}/empty chown "${_user}".544 ${LOCALSTATEDIR}/empty

2
contrib/findssl.sh
View File

@ -9,7 +9,7 @@
# Written by Darren Tucker (dtucker at zip dot com dot au) # Written by Darren Tucker (dtucker at zip dot com dot au)
# This file is placed in the public domain. # This file is placed in the public domain.
# #
# $Id: findssl.sh,v 1.1 2003/06/24 10:22:10 dtucker Exp $ # $Id: findssl.sh,v 1.2 2003/11/21 12:48:56 djm Exp $
# 2002-07-27: Initial release. # 2002-07-27: Initial release.
# 2002-08-04: Added public domain notice. # 2002-08-04: Added public domain notice.
# 2003-06-24: Incorporated readme, set library paths. First cvs version. # 2003-06-24: Incorporated readme, set library paths. First cvs version.

2
contrib/redhat/openssh.spec
View File

@ -200,7 +200,7 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS
--with-pam \ --with-pam \
%endif %endif
%if %{kerberos5} %if %{kerberos5}
--with-kerberos5=/usr/kerberos \ --with-kerberos5=/usr/kerberos \
%endif %endif

50
contrib/solaris/buildpkg.sh
View File

@ -98,20 +98,20 @@ fi
## Fill in some details, like prefix and sysconfdir ## Fill in some details, like prefix and sysconfdir
for confvar in prefix exec_prefix bindir sbindir libexecdir datadir mandir sysconfdir piddir for confvar in prefix exec_prefix bindir sbindir libexecdir datadir mandir sysconfdir piddir
do do
eval $confvar=`grep "^$confvar=" Makefile | cut -d = -f 2` eval $confvar=`grep "^$confvar=" Makefile | cut -d = -f 2`
done done
## Collect value of privsep user ## Collect value of privsep user
for confvar in SSH_PRIVSEP_USER for confvar in SSH_PRIVSEP_USER
do do
eval $confvar=`awk '/#define[ \t]'$confvar'/{print $3}' config.h` eval $confvar=`awk '/#define[ \t]'$confvar'/{print $3}' config.h`
done done
## Set privsep defaults if not defined ## Set privsep defaults if not defined
if [ -z "$SSH_PRIVSEP_USER" ] if [ -z "$SSH_PRIVSEP_USER" ]
then then
SSH_PRIVSEP_USER=sshd SSH_PRIVSEP_USER=sshd
fi fi
## Extract common info requires for the 'info' part of the package. ## Extract common info requires for the 'info' part of the package.
@ -243,16 +243,16 @@ fi
if egrep '^[ \t]*UsePrivilegeSeparation[ \t]+no' \${PKG_INSTALL_ROOT}/$sysconfdir/sshd_config >/dev/null if egrep '^[ \t]*UsePrivilegeSeparation[ \t]+no' \${PKG_INSTALL_ROOT}/$sysconfdir/sshd_config >/dev/null
then then
echo "UsePrivilegeSeparation disabled in config, not creating PrivSep user" echo "UsePrivilegeSeparation disabled in config, not creating PrivSep user"
echo "or group." echo "or group."
else else
echo "UsePrivilegeSeparation enabled in config (or defaulting to on)." echo "UsePrivilegeSeparation enabled in config (or defaulting to on)."
# create group if required # create group if required
if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/group | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/group | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null
then then
echo "PrivSep group $SSH_PRIVSEP_USER already exists." echo "PrivSep group $SSH_PRIVSEP_USER already exists."
else else
# Use gid of 67 if possible # Use gid of 67 if possible
if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/group | egrep '^'$SSHDGID'\$' >/dev/null if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/group | egrep '^'$SSHDGID'\$' >/dev/null
then then
@ -260,15 +260,15 @@ else
else else
sshdgid="-g $SSHDGID" sshdgid="-g $SSHDGID"
fi fi
echo "Creating PrivSep group $SSH_PRIVSEP_USER." echo "Creating PrivSep group $SSH_PRIVSEP_USER."
\$chroot /usr/sbin/groupadd \$sshdgid $SSH_PRIVSEP_USER \$chroot /usr/sbin/groupadd \$sshdgid $SSH_PRIVSEP_USER
fi fi
# Create user if required # Create user if required
if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null
then then
echo "PrivSep user $SSH_PRIVSEP_USER already exists." echo "PrivSep user $SSH_PRIVSEP_USER already exists."
else else
# Use uid of 67 if possible # Use uid of 67 if possible
if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSHDGID'\$' >/dev/null if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSHDGID'\$' >/dev/null
then then
@ -276,10 +276,10 @@ else
else else
sshduid="-u $SSHDUID" sshduid="-u $SSHDUID"
fi fi
echo "Creating PrivSep user $SSH_PRIVSEP_USER." 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/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 \$chroot /usr/bin/passwd -l $SSH_PRIVSEP_USER
fi fi
fi fi
[ "\${POST_INS_START}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start [ "\${POST_INS_START}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start
@ -358,12 +358,12 @@ cat >mk-proto.awk << _EOF
BEGIN { print "i pkginfo"; print "i preinstall"; \\ BEGIN { print "i pkginfo"; print "i preinstall"; \\
print "i postinstall"; print "i preremove"; \\ print "i postinstall"; print "i preremove"; \\
print "i request"; print "i space"; \\ print "i request"; print "i space"; \\
split("$SYSTEM_DIR",sys_files); } split("$SYSTEM_DIR",sys_files); }
{ {
for (dir in sys_files) { if ( \$3 != sys_files[dir] ) for (dir in sys_files) { if ( \$3 != sys_files[dir] )
{ \$5="root"; \$6="sys"; } { \$5="root"; \$6="sys"; }
else else
{ \$4="?"; \$5="?"; \$6="?"; break;} { \$4="?"; \$5="?"; \$6="?"; break;}
} } } }
{ print; } { print; }
_EOF _EOF

16
contrib/solaris/opensshd.in
View File

@ -22,24 +22,24 @@ HOST_KEY_RSA=$etcdir/ssh_host_rsa_key
checkkeys() { checkkeys() {
if [ ! -f $HOST_KEY_RSA1 ]; then if [ ! -f $HOST_KEY_RSA1 ]; then
${SSH_KEYGEN} -t rsa1 -f ${HOST_KEY_RSA1} -N "" ${SSH_KEYGEN} -t rsa1 -f ${HOST_KEY_RSA1} -N ""
fi fi
if [ ! -f $HOST_KEY_DSA ]; then if [ ! -f $HOST_KEY_DSA ]; then
${SSH_KEYGEN} -t dsa -f ${HOST_KEY_DSA} -N "" ${SSH_KEYGEN} -t dsa -f ${HOST_KEY_DSA} -N ""
fi fi
if [ ! -f $HOST_KEY_RSA ]; then if [ ! -f $HOST_KEY_RSA ]; then
${SSH_KEYGEN} -t rsa -f ${HOST_KEY_RSA} -N "" ${SSH_KEYGEN} -t rsa -f ${HOST_KEY_RSA} -N ""
fi fi
} }
stop_service() { stop_service() {
if [ -r $PIDFILE -a ! -z ${PIDFILE} ]; then if [ -r $PIDFILE -a ! -z ${PIDFILE} ]; then
PID=`${CAT} ${PIDFILE}` PID=`${CAT} ${PIDFILE}`
fi fi
if [ ${PID:=0} -gt 1 -a ! "X$PID" = "X " ]; then if [ ${PID:=0} -gt 1 -a ! "X$PID" = "X " ]; then
${KILL} ${PID} ${KILL} ${PID}
else else
echo "Unable to read PID file" echo "Unable to read PID file"
fi fi
} }
@ -55,8 +55,8 @@ start_service() {
sshd_rc=$? sshd_rc=$?
if [ $sshd_rc -ne 0 ]; then if [ $sshd_rc -ne 0 ]; then
echo "$0: Error ${sshd_rc} starting ${SSHD}... bailing." echo "$0: Error ${sshd_rc} starting ${SSHD}... bailing."
exit $sshd_rc exit $sshd_rc
fi fi
echo done. echo done.
} }

20
contrib/suse/openssh.spec
View File

@ -100,8 +100,8 @@ make
cd contrib cd contrib
gcc -O -g `gnome-config --cflags gnome gnomeui` \ gcc -O -g `gnome-config --cflags gnome gnomeui` \
gnome-ssh-askpass.c -o gnome-ssh-askpass \ gnome-ssh-askpass.c -o gnome-ssh-askpass \
`gnome-config --libs gnome gnomeui` `gnome-config --libs gnome gnomeui`
cd .. cd ..
%install %install
@ -140,29 +140,29 @@ else
echo " /var/adm/fillup-templates/rc.config.sshd" echo " /var/adm/fillup-templates/rc.config.sshd"
fi fi
if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then
echo "Generating SSH host key..." echo "Generating SSH host key..."
/usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2 /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2
fi fi
if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then
echo "Generating SSH DSA host key..." echo "Generating SSH DSA host key..."
/usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' >&2 /usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' >&2
fi fi
if test -r /var/run/sshd.pid if test -r /var/run/sshd.pid
then then
echo "Restarting the running SSH daemon..." echo "Restarting the running SSH daemon..."
/usr/sbin/rcsshd restart >&2 /usr/sbin/rcsshd restart >&2
fi fi
%preun %preun
if [ "$1" = 0 ] if [ "$1" = 0 ]
then then
echo "Stopping the SSH daemon..." echo "Stopping the SSH daemon..."
/usr/sbin/rcsshd stop >&2 /usr/sbin/rcsshd stop >&2
echo "Removing SSH stop/start scripts from the rc directories..." echo "Removing SSH stop/start scripts from the rc directories..."
rm /sbin/init.d/rc2.d/K20sshd rm /sbin/init.d/rc2.d/K20sshd
rm /sbin/init.d/rc2.d/S20sshd rm /sbin/init.d/rc2.d/S20sshd
rm /sbin/init.d/rc3.d/K20sshd rm /sbin/init.d/rc3.d/K20sshd
rm /sbin/init.d/rc3.d/S20sshd rm /sbin/init.d/rc3.d/S20sshd
fi fi
%files %files

2
defines.h
View File

@ -25,7 +25,7 @@
#ifndef _DEFINES_H #ifndef _DEFINES_H
#define _DEFINES_H #define _DEFINES_H
/* $Id: defines.h,v 1.103 2003/09/16 01:52:19 dtucker Exp $ */ /* $Id: defines.h,v 1.104 2003/11/21 12:48:55 djm Exp $ */
/* Constants */ /* Constants */

4
dns.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: dns.c,v 1.8 2003/11/12 16:39:58 jakob Exp $ */ /* $OpenBSD: dns.c,v 1.9 2003/11/21 11:57:03 djm Exp $ */
/* /*
* Copyright (c) 2003 Wesley Griffin. All rights reserved. * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@ -43,7 +43,7 @@
#include "uuencode.h" #include "uuencode.h"
extern char *__progname; extern char *__progname;
RCSID("$OpenBSD: dns.c,v 1.8 2003/11/12 16:39:58 jakob Exp $"); RCSID("$OpenBSD: dns.c,v 1.9 2003/11/21 11:57:03 djm Exp $");
#ifndef LWRES #ifndef LWRES
static const char *errset_text[] = { static const char *errset_text[] = {

2
entropy.c
View File

@ -45,7 +45,7 @@
* XXX: we should tell the child how many bytes we need. * XXX: we should tell the child how many bytes we need.
*/ */
RCSID("$Id: entropy.c,v 1.46 2003/08/25 01:16:21 mouring Exp $"); RCSID("$Id: entropy.c,v 1.47 2003/11/21 12:48:55 djm Exp $");
#ifndef OPENSSL_PRNG_ONLY #ifndef OPENSSL_PRNG_ONLY
#define RANDOM_SEED_SIZE 48 #define RANDOM_SEED_SIZE 48

2
gss-genr.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: gss-genr.c,v 1.2 2003/11/17 11:06:07 markus Exp $ */ /* $OpenBSD: gss-genr.c,v 1.3 2003/11/21 11:57:03 djm Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.

2
gss-serv-krb5.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: gss-serv-krb5.c,v 1.1 2003/08/22 10:56:09 markus Exp $ */ /* $OpenBSD: gss-serv-krb5.c,v 1.2 2003/11/21 11:57:03 djm Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.

2
install-sh
View File

@ -180,7 +180,7 @@ while [ $# -ne 0 ] ; do
shift shift
if [ ! -d "${pathcomp}" ] ; if [ ! -d "${pathcomp}" ] ;
then then
$mkdirprog "${pathcomp}" $mkdirprog "${pathcomp}"
else else
true true

2
kex.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: kex.c,v 1.55 2003/04/01 10:31:26 markus Exp $"); RCSID("$OpenBSD: kex.c,v 1.56 2003/11/21 11:57:03 djm Exp $");
#include <openssl/crypto.h> #include <openssl/crypto.h>

2
loginrec.c
View File

@ -158,7 +158,7 @@
#include "log.h" #include "log.h"
#include "atomicio.h" #include "atomicio.h"
RCSID("$Id: loginrec.c,v 1.52 2003/07/06 05:20:46 dtucker Exp $"); RCSID("$Id: loginrec.c,v 1.53 2003/11/21 12:48:55 djm Exp $");
#ifdef HAVE_UTIL_H #ifdef HAVE_UTIL_H
# include <util.h> # include <util.h>

2
md5crypt.c
View File

@ -13,7 +13,7 @@
#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) #if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
#include <openssl/md5.h> #include <openssl/md5.h>
RCSID("$Id: md5crypt.c,v 1.7 2003/05/30 06:58:23 dtucker Exp $"); RCSID("$Id: md5crypt.c,v 1.8 2003/11/21 12:48:55 djm Exp $");
/* 0 ... 63 => ascii - 64 */ /* 0 ... 63 => ascii - 64 */
static unsigned char itoa64[] = static unsigned char itoa64[] =

158
mdoc2man.awk
View File

@ -76,19 +76,19 @@ function add(str) {
skip=1 skip=1
ext=1 ext=1
if(length(line)&&!(match(line," $")||prenl)) if(length(line)&&!(match(line," $")||prenl))
add(OFS) add(OFS)
} else if(match(words[w],"^Xc$")) { } else if(match(words[w],"^Xc$")) {
skip=1 skip=1
ext=0 ext=0
if(!extopt) if(!extopt)
prenl++ prenl++
w=nwords w=nwords
} else if(match(words[w],"^Bd$")) { } else if(match(words[w],"^Bd$")) {
skip=1 skip=1
if(match(words[w+1],"-literal")) { if(match(words[w+1],"-literal")) {
literal=1 literal=1
prenl++ prenl++
w=nwords w=nwords
} }
} else if(match(words[w],"^Ed$")) { } else if(match(words[w],"^Ed$")) {
skip=1 skip=1
@ -96,7 +96,7 @@ function add(str) {
} else if(match(words[w],"^Ns$")) { } else if(match(words[w],"^Ns$")) {
skip=1 skip=1
if(!nospace) if(!nospace)
nospace=1 nospace=1
sub(" $","",line) sub(" $","",line)
} else if(match(words[w],"^No$")) { } else if(match(words[w],"^No$")) {
skip=1 skip=1
@ -107,20 +107,20 @@ function add(str) {
add("``") add("``")
add(words[++w]) add(words[++w])
while(w<nwords&&!match(words[w+1],"^[\\.,]")) while(w<nwords&&!match(words[w+1],"^[\\.,]"))
add(OFS words[++w]) add(OFS words[++w])
add("''") add("''")
if(!nospace&&match(words[w+1],"^[\\.,]")) if(!nospace&&match(words[w+1],"^[\\.,]"))
nospace=1 nospace=1
} else if(match(words[w],"^Sq|Ql$")) { } else if(match(words[w],"^Sq|Ql$")) {
skip=1 skip=1
add("`" words[++w] "'") add("`" words[++w] "'")
if(!nospace&&match(words[w+1],"^[\\.,]")) if(!nospace&&match(words[w+1],"^[\\.,]"))
nospace=1 nospace=1
} else if(match(words[w],"^Oo$")) { } else if(match(words[w],"^Oo$")) {
skip=1 skip=1
extopt=1 extopt=1
if(!nospace) if(!nospace)
nospace=1 nospace=1
add("[") add("[")
} else if(match(words[w],"^Oc$")) { } else if(match(words[w],"^Oc$")) {
skip=1 skip=1
@ -129,9 +129,9 @@ function add(str) {
} }
if(!skip) { if(!skip) {
if(!nospace&&length(line)&&!(match(line," $")||prenl)) if(!nospace&&length(line)&&!(match(line," $")||prenl))
add(OFS) add(OFS)
if(nospace==1) if(nospace==1)
nospace=0 nospace=0
} }
if(match(words[w],"^Dd$")) { if(match(words[w],"^Dd$")) {
date=wtail() date=wtail()
@ -158,69 +158,69 @@ function add(str) {
} else if(match(words[w],"^Re$")) { } else if(match(words[w],"^Re$")) {
prenl++ prenl++
for(i=nrefauthors-1;i>0;i--) { for(i=nrefauthors-1;i>0;i--) {
add(refauthors[i]) add(refauthors[i])
if(i>1) if(i>1)
add(", ") add(", ")
} }
if(nrefauthors>1) if(nrefauthors>1)
add(" and ") add(" and ")
add(refauthors[0] ", \\fI" reftitle "\\fP") add(refauthors[0] ", \\fI" reftitle "\\fP")
if(length(refissue)) if(length(refissue))
add(", " refissue) add(", " refissue)
if(length(refdate)) if(length(refdate))
add(", " refdate) add(", " refdate)
if(length(refopt)) if(length(refopt))
add(", " refopt) add(", " refopt)
add(".") add(".")
reference=0 reference=0
} else if(reference) { } else if(reference) {
if(match(words[w],"^%A$")) { refauthors[nrefauthors++]=wtail() } if(match(words[w],"^%A$")) { refauthors[nrefauthors++]=wtail() }
if(match(words[w],"^%T$")) { if(match(words[w],"^%T$")) {
reftitle=wtail() reftitle=wtail()
sub("^\"","",reftitle) sub("^\"","",reftitle)
sub("\"$","",reftitle) sub("\"$","",reftitle)
} }
if(match(words[w],"^%N$")) { refissue=wtail() } if(match(words[w],"^%N$")) { refissue=wtail() }
if(match(words[w],"^%D$")) { refdate=wtail() } if(match(words[w],"^%D$")) { refdate=wtail() }
if(match(words[w],"^%O$")) { refopt=wtail() } if(match(words[w],"^%O$")) { refopt=wtail() }
} else if(match(words[w],"^Nm$")) { } else if(match(words[w],"^Nm$")) {
if(synopsis) { if(synopsis) {
add(".br") add(".br")
prenl++ prenl++
} }
n=words[++w] n=words[++w]
if(!length(name)) if(!length(name))
name=n name=n
if(!length(n)) if(!length(n))
n=name n=name
add("\\fB" n "\\fP") add("\\fB" n "\\fP")
if(!nospace&&match(words[w+1],"^[\\.,]")) if(!nospace&&match(words[w+1],"^[\\.,]"))
nospace=1 nospace=1
} else if(match(words[w],"^Nd$")) { } else if(match(words[w],"^Nd$")) {
add("\\- " wtail()) add("\\- " wtail())
} else if(match(words[w],"^Fl$")) { } else if(match(words[w],"^Fl$")) {
add("\\fB\\-" words[++w] "\\fP") add("\\fB\\-" words[++w] "\\fP")
if(!nospace&&match(words[w+1],"^[\\.,]")) if(!nospace&&match(words[w+1],"^[\\.,]"))
nospace=1 nospace=1
} else if(match(words[w],"^Ar$")) { } else if(match(words[w],"^Ar$")) {
add("\\fI") add("\\fI")
if(w==nwords) if(w==nwords)
add("file ...\\fP") add("file ...\\fP")
else { else {
add(words[++w] "\\fP") add(words[++w] "\\fP")
while(match(words[w+1],"^\\|$")) while(match(words[w+1],"^\\|$"))
add(OFS words[++w] " \\fI" words[++w] "\\fP") add(OFS words[++w] " \\fI" words[++w] "\\fP")
} }
if(!nospace&&match(words[w+1],"^[\\.,]")) if(!nospace&&match(words[w+1],"^[\\.,]"))
nospace=1 nospace=1
} else if(match(words[w],"^Cm$")) { } else if(match(words[w],"^Cm$")) {
add("\\fB" words[++w] "\\fP") add("\\fB" words[++w] "\\fP")
while(w<nwords&&match(words[w+1],"^[\\.,:;)]")) while(w<nwords&&match(words[w+1],"^[\\.,:;)]"))
add(words[++w]) add(words[++w])
} else if(match(words[w],"^Op$")) { } else if(match(words[w],"^Op$")) {
option=1 option=1
if(!nospace) if(!nospace)
nospace=1 nospace=1
add("[") add("[")
} else if(match(words[w],"^Pp$")) { } else if(match(words[w],"^Pp$")) {
prenl++ prenl++
@ -232,10 +232,10 @@ function add(str) {
add("\\fI") add("\\fI")
w++ w++
if(match(words[w],"^\\.")) if(match(words[w],"^\\."))
add("\\&") add("\\&")
add(words[w] "\\fP") add(words[w] "\\fP")
while(w<nwords&&match(words[w+1],"^[\\.,:;)]")) while(w<nwords&&match(words[w+1],"^[\\.,:;)]"))
add(words[++w]) add(words[++w])
} else if(match(words[w],"^Dv$")) { } else if(match(words[w],"^Dv$")) {
add(".BR") add(".BR")
} else if(match(words[w],"^Em|Ev$")) { } else if(match(words[w],"^Em|Ev$")) {
@ -254,69 +254,69 @@ function add(str) {
plain=1 plain=1
add("\\fB") add("\\fB")
while(w<nwords) { while(w<nwords) {
w++ w++
if(match(words[w],"^Op$")) { if(match(words[w],"^Op$")) {
w++ w++
add("[") add("[")
words[nwords]=words[nwords] "]" words[nwords]=words[nwords] "]"
} }
if(match(words[w],"^Ar$")) { if(match(words[w],"^Ar$")) {
add("\\fI" words[++w] "\\fP") add("\\fI" words[++w] "\\fP")
} else if(match(words[w],"^[\\.,]")) { } else if(match(words[w],"^[\\.,]")) {
sub(" $","",line) sub(" $","",line)
if(plain) { if(plain) {
add("\\fP") add("\\fP")
plain=0 plain=0
} }
add(words[w]) add(words[w])
} else { } else {
if(!plain) { if(!plain) {
add("\\fB") add("\\fB")
plain=1 plain=1
} }
add(words[w]) add(words[w])
} }
if(!nospace) if(!nospace)
add(OFS) add(OFS)
} }
sub(" $","",line) sub(" $","",line)
if(plain) if(plain)
add("\\fP") add("\\fP")
} else if(match(words[w],"^Bl$")) { } else if(match(words[w],"^Bl$")) {
oldoptlist=optlist oldoptlist=optlist
if(match(words[w+1],"-bullet")) if(match(words[w+1],"-bullet"))
optlist=1 optlist=1
else if(match(words[w+1],"-enum")) { else if(match(words[w+1],"-enum")) {
optlist=2 optlist=2
enum=0 enum=0
} else if(match(words[w+1],"-tag")) } else if(match(words[w+1],"-tag"))
optlist=3 optlist=3
else if(match(words[w+1],"-item")) else if(match(words[w+1],"-item"))
optlist=4 optlist=4
else if(match(words[w+1],"-bullet")) else if(match(words[w+1],"-bullet"))
optlist=1 optlist=1
w=nwords w=nwords
} else if(match(words[w],"^El$")) { } else if(match(words[w],"^El$")) {
optlist=oldoptlist optlist=oldoptlist
} else if(match(words[w],"^It$")&&optlist) { } else if(match(words[w],"^It$")&&optlist) {
if(optlist==1) if(optlist==1)
add(".IP \\(bu") add(".IP \\(bu")
else if(optlist==2) else if(optlist==2)
add(".IP " ++enum ".") add(".IP " ++enum ".")
else if(optlist==3) { else if(optlist==3) {
add(".TP") add(".TP")
prenl++ prenl++
if(match(words[w+1],"^Pa|Ev$")) { if(match(words[w+1],"^Pa|Ev$")) {
add(".B") add(".B")
w++ w++
} }
} else if(optlist==4) } else if(optlist==4)
add(".IP") add(".IP")
} else if(match(words[w],"^Sm$")) { } else if(match(words[w],"^Sm$")) {
if(match(words[w+1],"off")) if(match(words[w+1],"off"))
nospace=2 nospace=2
else if(match(words[w+1],"on")) else if(match(words[w+1],"on"))
nospace=0 nospace=0
w++ w++
} else if(!skip) { } else if(!skip) {
add(words[w]) add(words[w])

12
mkinstalldirs
View File

@ -4,7 +4,7 @@
# Created: 1993-05-16 # Created: 1993-05-16
# Public domain # Public domain
# $Id: mkinstalldirs,v 1.1 2000/05/20 05:33:45 damien Exp $ # $Id: mkinstalldirs,v 1.2 2003/11/21 12:48:55 djm Exp $
errstatus=0 errstatus=0
@ -22,13 +22,13 @@ do
esac esac
if test ! -d "$pathcomp"; then if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp" echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$? mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then if test ! -d "$pathcomp"; then
errstatus=$lasterr errstatus=$lasterr
fi fi
fi fi
pathcomp="$pathcomp/" pathcomp="$pathcomp/"

38
moduli.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: moduli.c,v 1.1 2003/07/28 09:49:56 djm Exp $ */ /* $OpenBSD: moduli.c,v 1.2 2003/11/21 11:57:03 djm Exp $ */
/* /*
* Copyright 1994 Phil Karn <karn@qualcomm.com> * Copyright 1994 Phil Karn <karn@qualcomm.com>
* Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@ -244,9 +244,9 @@ gen_candidates(FILE *out, int memory, int power, BIGNUM *start)
largememory = memory; largememory = memory;
/* /*
* Set power to the length in bits of the prime to be generated. * Set power to the length in bits of the prime to be generated.
* This is changed to 1 less than the desired safe prime moduli p. * This is changed to 1 less than the desired safe prime moduli p.
*/ */
if (power > TEST_MAXIMUM) { if (power > TEST_MAXIMUM) {
error("Too many bits: %u > %lu", power, TEST_MAXIMUM); error("Too many bits: %u > %lu", power, TEST_MAXIMUM);
return (-1); return (-1);
@ -257,16 +257,16 @@ gen_candidates(FILE *out, int memory, int power, BIGNUM *start)
power--; /* decrement before squaring */ power--; /* decrement before squaring */
/* /*
* The density of ordinary primes is on the order of 1/bits, so the * The density of ordinary primes is on the order of 1/bits, so the
* density of safe primes should be about (1/bits)**2. Set test range * density of safe primes should be about (1/bits)**2. Set test range
* to something well above bits**2 to be reasonably sure (but not * to something well above bits**2 to be reasonably sure (but not
* guaranteed) of catching at least one safe prime. * guaranteed) of catching at least one safe prime.
*/ */
largewords = ((power * power) >> (SHIFT_WORD - TEST_POWER)); largewords = ((power * power) >> (SHIFT_WORD - TEST_POWER));
/* /*
* Need idea of how much memory is available. We don't have to use all * Need idea of how much memory is available. We don't have to use all
* of it. * of it.
*/ */
if (largememory > LARGE_MAXIMUM) { if (largememory > LARGE_MAXIMUM) {
logit("Limited memory: %u MB; limit %lu MB", logit("Limited memory: %u MB; limit %lu MB",
@ -315,8 +315,8 @@ gen_candidates(FILE *out, int memory, int power, BIGNUM *start)
q = BN_new(); q = BN_new();
/* /*
* Generate random starting point for subprime search, or use * Generate random starting point for subprime search, or use
* specified parameter. * specified parameter.
*/ */
largebase = BN_new(); largebase = BN_new();
if (start == NULL) if (start == NULL)
@ -334,8 +334,8 @@ gen_candidates(FILE *out, int memory, int power, BIGNUM *start)
debug2("start point: 0x%s", BN_bn2hex(largebase)); debug2("start point: 0x%s", BN_bn2hex(largebase));
/* /*
* TinySieve * TinySieve
*/ */
for (i = 0; i < tinybits; i++) { for (i = 0; i < tinybits; i++) {
if (BIT_TEST(TinySieve, i)) if (BIT_TEST(TinySieve, i))
continue; /* 2*i+3 is composite */ continue; /* 2*i+3 is composite */
@ -351,9 +351,9 @@ gen_candidates(FILE *out, int memory, int power, BIGNUM *start)
} }
/* /*
* Start the small block search at the next possible prime. To avoid * Start the small block search at the next possible prime. To avoid
* fencepost errors, the last pass is skipped. * fencepost errors, the last pass is skipped.
*/ */
for (smallbase = TINY_NUMBER + 3; for (smallbase = TINY_NUMBER + 3;
smallbase < (SMALL_MAXIMUM - TINY_NUMBER); smallbase < (SMALL_MAXIMUM - TINY_NUMBER);
smallbase += TINY_NUMBER) { smallbase += TINY_NUMBER) {
@ -386,8 +386,8 @@ gen_candidates(FILE *out, int memory, int power, BIGNUM *start)
} }
/* /*
* SmallSieve * SmallSieve
*/ */
for (i = 0; i < smallbits; i++) { for (i = 0; i < smallbits; i++) {
if (BIT_TEST(SmallSieve, i)) if (BIT_TEST(SmallSieve, i))
continue; /* 2*i+smallbase is composite */ continue; /* 2*i+smallbase is composite */

2
monitor.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor.c,v 1.53 2003/11/18 10:53:07 djm Exp $"); RCSID("$OpenBSD: monitor.c,v 1.54 2003/11/21 11:57:03 djm Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>

2
nchan.ms
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: nchan.ms,v 1.7 2001/01/29 01:58:17 niklas Exp $ .\" $OpenBSD: nchan.ms,v 1.8 2003/11/21 11:57:03 djm Exp $
.\" .\"
.\" .\"
.\" Copyright (c) 1999 Markus Friedl. All rights reserved. .\" Copyright (c) 1999 Markus Friedl. All rights reserved.

2
nchan2.ms
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: nchan2.ms,v 1.2 2001/10/03 10:05:57 markus Exp $ .\" $OpenBSD: nchan2.ms,v 1.3 2003/11/21 11:57:03 djm Exp $
.\" .\"
.\" Copyright (c) 2000 Markus Friedl. All rights reserved. .\" Copyright (c) 2000 Markus Friedl. All rights reserved.
.\" .\"

4
readconf.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.h,v 1.56 2003/10/11 08:24:08 markus Exp $ */ /* $OpenBSD: readconf.h,v 1.57 2003/11/21 11:57:03 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -61,7 +61,7 @@ typedef struct {
int connection_attempts; /* Max attempts (seconds) before int connection_attempts; /* Max attempts (seconds) before
* giving up */ * giving up */
int connection_timeout; /* Max time (seconds) before int connection_timeout; /* Max time (seconds) before
* aborting connection attempt */ * aborting connection attempt */
int number_of_password_prompts; /* Max number of password int number_of_password_prompts; /* Max number of password
* prompts. */ * prompts. */
int cipher; /* Cipher to use. */ int cipher; /* Cipher to use. */

134
rijndael.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: rijndael.c,v 1.14 2002/07/10 17:53:54 deraadt Exp $ */ /* $OpenBSD: rijndael.c,v 1.15 2003/11/21 11:57:03 djm Exp $ */
/** /**
* rijndael-alg-fst.c * rijndael-alg-fst.c
@ -725,7 +725,7 @@ static const u32 rcon[] = {
* @return the number of rounds for the given cipher key size. * @return the number of rounds for the given cipher key size.
*/ */
static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) { static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits) {
int i = 0; int i = 0;
u32 temp; u32 temp;
rk[0] = GETU32(cipherKey ); rk[0] = GETU32(cipherKey );
@ -797,7 +797,7 @@ static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int
(Te4[(temp ) & 0xff] & 0x000000ff); (Te4[(temp ) & 0xff] & 0x000000ff);
rk[13] = rk[ 5] ^ rk[12]; rk[13] = rk[ 5] ^ rk[12];
rk[14] = rk[ 6] ^ rk[13]; rk[14] = rk[ 6] ^ rk[13];
rk[15] = rk[ 7] ^ rk[14]; rk[15] = rk[ 7] ^ rk[14];
rk += 8; rk += 8;
} }
} }
@ -871,50 +871,50 @@ static void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16
s3 = GETU32(pt + 12) ^ rk[3]; s3 = GETU32(pt + 12) ^ rk[3];
#ifdef FULL_UNROLL #ifdef FULL_UNROLL
/* round 1: */ /* round 1: */
t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4]; t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5]; t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6]; t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7]; t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
/* round 2: */ /* round 2: */
s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8]; s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9]; s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10]; s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11]; s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
/* round 3: */ /* round 3: */
t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12]; t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13]; t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14]; t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15]; t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
/* round 4: */ /* round 4: */
s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16]; s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17]; s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18]; s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19]; s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
/* round 5: */ /* round 5: */
t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20]; t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21]; t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22]; t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23]; t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
/* round 6: */ /* round 6: */
s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24]; s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25]; s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26]; s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27]; s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
/* round 7: */ /* round 7: */
t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28]; t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29]; t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30]; t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31]; t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
/* round 8: */ /* round 8: */
s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32]; s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33]; s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34]; s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35]; s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
/* round 9: */ /* round 9: */
t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36]; t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37]; t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38]; t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39]; t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
if (Nr > 10) { if (Nr > 10) {
/* round 10: */ /* round 10: */
s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40]; s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
@ -1187,33 +1187,33 @@ static void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16
* apply last round and * apply last round and
* map cipher state to byte array block: * map cipher state to byte array block:
*/ */
s0 = s0 =
(Td4[(t0 >> 24) ] & 0xff000000) ^ (Td4[(t0 >> 24) ] & 0xff000000) ^
(Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ (Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
(Td4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ (Td4[(t2 >> 8) & 0xff] & 0x0000ff00) ^
(Td4[(t1 ) & 0xff] & 0x000000ff) ^ (Td4[(t1 ) & 0xff] & 0x000000ff) ^
rk[0]; rk[0];
PUTU32(pt , s0); PUTU32(pt , s0);
s1 = s1 =
(Td4[(t1 >> 24) ] & 0xff000000) ^ (Td4[(t1 >> 24) ] & 0xff000000) ^
(Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ (Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
(Td4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ (Td4[(t3 >> 8) & 0xff] & 0x0000ff00) ^
(Td4[(t2 ) & 0xff] & 0x000000ff) ^ (Td4[(t2 ) & 0xff] & 0x000000ff) ^
rk[1]; rk[1];
PUTU32(pt + 4, s1); PUTU32(pt + 4, s1);
s2 = s2 =
(Td4[(t2 >> 24) ] & 0xff000000) ^ (Td4[(t2 >> 24) ] & 0xff000000) ^
(Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ (Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
(Td4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ (Td4[(t0 >> 8) & 0xff] & 0x0000ff00) ^
(Td4[(t3 ) & 0xff] & 0x000000ff) ^ (Td4[(t3 ) & 0xff] & 0x000000ff) ^
rk[2]; rk[2];
PUTU32(pt + 8, s2); PUTU32(pt + 8, s2);
s3 = s3 =
(Td4[(t3 >> 24) ] & 0xff000000) ^ (Td4[(t3 >> 24) ] & 0xff000000) ^
(Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ (Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
(Td4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ (Td4[(t1 >> 8) & 0xff] & 0x0000ff00) ^
(Td4[(t0 ) & 0xff] & 0x000000ff) ^ (Td4[(t0 ) & 0xff] & 0x000000ff) ^
rk[3]; rk[3];
PUTU32(pt + 12, s3); PUTU32(pt + 12, s3);
} }

2
scp.c
View File

@ -71,7 +71,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: scp.c,v 1.111 2003/11/12 10:12:15 dtucker Exp $"); RCSID("$OpenBSD: scp.c,v 1.112 2003/11/21 11:57:03 djm Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "atomicio.h" #include "atomicio.h"

2
session.c
View File

@ -33,7 +33,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: session.c,v 1.167 2003/11/04 08:54:09 djm Exp $"); RCSID("$OpenBSD: session.c,v 1.168 2003/11/21 11:57:03 djm Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"

2
sftp-client.c
View File

@ -28,7 +28,7 @@
/* XXX: copy between two remote sites */ /* XXX: copy between two remote sites */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sftp-client.c,v 1.44 2003/06/28 16:23:06 deraadt Exp $"); RCSID("$OpenBSD: sftp-client.c,v 1.45 2003/11/21 11:57:03 djm Exp $");
#include "openbsd-compat/sys-queue.h" #include "openbsd-compat/sys-queue.h"

8
sftp-int.c
View File

@ -25,7 +25,7 @@
/* XXX: recursive operations */ /* XXX: recursive operations */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sftp-int.c,v 1.64 2003/11/08 19:17:29 jmc Exp $"); RCSID("$OpenBSD: sftp-int.c,v 1.65 2003/11/21 11:57:03 djm Exp $");
#include "buffer.h" #include "buffer.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -389,7 +389,7 @@ get_pathname(const char **cpp, char **path)
return (0); return (0);
fail: fail:
xfree(*path); xfree(*path);
*path = NULL; *path = NULL;
return (-1); return (-1);
} }
@ -668,7 +668,7 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
strncmp(path, g.gl_pathv[0], strlen(g.gl_pathv[0]) - 1) == 0) { strncmp(path, g.gl_pathv[0], strlen(g.gl_pathv[0]) - 1) == 0) {
if ((a = do_lstat(conn, path, 1)) == NULL) { if ((a = do_lstat(conn, path, 1)) == NULL) {
globfree(&g); globfree(&g);
return (-1); return (-1);
} }
if ((a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) && if ((a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) &&
S_ISDIR(a->perm)) { S_ISDIR(a->perm)) {
@ -682,7 +682,7 @@ do_globbed_ls(struct sftp_conn *conn, char *path, char *strip_path,
struct winsize ws; struct winsize ws;
/* Count entries for sort and find longest filename */ /* Count entries for sort and find longest filename */
for (i = 0; g.gl_pathv[i]; i++) for (i = 0; g.gl_pathv[i]; i++)
m = MAX(m, strlen(g.gl_pathv[i])); m = MAX(m, strlen(g.gl_pathv[i]));
if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) != -1) if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) != -1)

8
ssh-add.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-add.c,v 1.68 2003/06/16 10:22:45 markus Exp $"); RCSID("$OpenBSD: ssh-add.c,v 1.69 2003/11/21 11:57:03 djm Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
@ -169,14 +169,14 @@ add_file(AuthenticationConnection *ac, const char *filename)
} }
} }
if (ssh_add_identity_constrained(ac, private, comment, lifetime, if (ssh_add_identity_constrained(ac, private, comment, lifetime,
confirm)) { confirm)) {
fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
ret = 0; ret = 0;
if (lifetime != 0) if (lifetime != 0)
fprintf(stderr, fprintf(stderr,
"Lifetime set to %d seconds\n", lifetime); "Lifetime set to %d seconds\n", lifetime);
if (confirm != 0) if (confirm != 0)
fprintf(stderr, fprintf(stderr,
"The user has to confirm each use of the key\n"); "The user has to confirm each use of the key\n");
} else if (ssh_add_identity(ac, private, comment)) { } else if (ssh_add_identity(ac, private, comment)) {

2
ssh-agent.c
View File

@ -35,7 +35,7 @@
#include "includes.h" #include "includes.h"
#include "openbsd-compat/sys-queue.h" #include "openbsd-compat/sys-queue.h"
RCSID("$OpenBSD: ssh-agent.c,v 1.115 2003/10/14 19:54:39 markus Exp $"); RCSID("$OpenBSD: ssh-agent.c,v 1.116 2003/11/21 11:57:03 djm Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/md5.h> #include <openssl/md5.h>

2
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keygen.c,v 1.110 2003/10/14 19:42:10 jakob Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.111 2003/11/21 11:57:03 djm Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>

2
ssh-rand-helper.8
View File

@ -1,4 +1,4 @@
.\" $Id: ssh-rand-helper.8,v 1.1 2002/04/14 09:27:13 djm Exp $ .\" $Id: ssh-rand-helper.8,v 1.2 2003/11/21 12:48:56 djm Exp $
.\" .\"
.\" Copyright (c) 2002 Damien Miller. All rights reserved. .\" Copyright (c) 2002 Damien Miller. All rights reserved.
.\" .\"

2
ssh-rand-helper.c
View File

@ -39,7 +39,7 @@
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
RCSID("$Id: ssh-rand-helper.c,v 1.14 2003/09/22 15:36:15 mouring Exp $"); RCSID("$Id: ssh-rand-helper.c,v 1.15 2003/11/21 12:48:56 djm Exp $");
/* Number of bytes we write out */ /* Number of bytes we write out */
#define OUTPUT_SEED_SIZE 48 #define OUTPUT_SEED_SIZE 48

2
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.202 2003/10/11 08:24:08 markus Exp $"); RCSID("$OpenBSD: ssh.c,v 1.203 2003/11/21 11:57:03 djm Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>

2
ssh_prng_cmds.in
View File

@ -5,7 +5,7 @@
# The "rate" represents the number of bits of usuable entropy per # The "rate" represents the number of bits of usuable entropy per
# byte of command output. Be conservative. # byte of command output. Be conservative.
# #
# $Id: ssh_prng_cmds.in,v 1.8 2002/07/14 21:43:58 tim Exp $ # $Id: ssh_prng_cmds.in,v 1.9 2003/11/21 12:48:56 djm Exp $
"ls -alni /var/log" @PROG_LS@ 0.02 "ls -alni /var/log" @PROG_LS@ 0.02
"ls -alni /var/adm" @PROG_LS@ 0.02 "ls -alni /var/adm" @PROG_LS@ 0.02

6
sshconnect.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect.c,v 1.153 2003/11/12 16:39:58 jakob Exp $"); RCSID("$OpenBSD: sshconnect.c,v 1.154 2003/11/21 11:57:03 djm Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
@ -261,7 +261,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
break; break;
case -1: case -1:
/* Select error */ /* Select error */
debug("select: %s", strerror(errno)); debug("select: %s", strerror(errno));
break; break;
case 1: case 1:
/* Completed or failed */ /* Completed or failed */
@ -269,7 +269,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
optlen = sizeof(optval); optlen = sizeof(optval);
if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval,
&optlen) == -1) { &optlen) == -1) {
debug("getsockopt: %s", strerror(errno)); debug("getsockopt: %s", strerror(errno));
break; break;
} }
if (optval != 0) { if (optval != 0) {

2
sshconnect2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect2.c,v 1.132 2003/11/17 11:06:07 markus Exp $"); RCSID("$OpenBSD: sshconnect2.c,v 1.133 2003/11/21 11:57:03 djm Exp $");
#include "openbsd-compat/sys-queue.h" #include "openbsd-compat/sys-queue.h"

2
sshd.c
View File

@ -1446,7 +1446,7 @@ main(int ac, char **av)
packet_set_nonblocking(); packet_set_nonblocking();
/* prepare buffers to collect authentication messages */ /* prepare buffers to collect authentication messages */
buffer_init(&loginmsg); buffer_init(&loginmsg);
/* allocate authentication context */ /* allocate authentication context */

2
sshd_config.5
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.25 2003/09/01 09:50:04 markus Exp $ .\" $OpenBSD: sshd_config.5,v 1.26 2003/11/21 11:57:03 djm Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os