Date: Thu, 3 May 2001 21:14:26 -0700 (PDT) From: Brian Feldman <green@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssh auth-chall.c auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rsa.c auth.c auth.h auth1.c auth2.c authfd.c authfile.c bufaux.c canohost.c channels.c channels.h cipher.c cipher.h compat.c compat.h hostfile.c ... Message-ID: <200105040414.f444ER337016@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
green 2001/05/03 21:14:26 PDT
Modified files:
crypto/openssh auth-chall.c auth-krb4.c auth-passwd.c
auth-rh-rsa.c auth-rsa.c auth.c auth.h
auth1.c auth2.c authfd.c authfile.c
bufaux.c canohost.c channels.c channels.h
cipher.c cipher.h compat.c compat.h
hostfile.c includes.h key.c mpaux.c
packet.h pathnames.h readconf.c
readconf.h rsa.c rsa.h servconf.c
servconf.h serverloop.c session.c
ssh-add.c ssh-agent.c ssh.1 ssh.c ssh.h
ssh_config sshconnect.c sshconnect.h
sshconnect1.c sshconnect2.c sshd.8 sshd.c
sshd_config sshlogin.c sshpty.c version.h
Log:
Fix conflicts for OpenSSH 2.9.
Revision Changes Path
1.2 +6 -5 src/crypto/openssh/auth-chall.c
1.9 +11 -4 src/crypto/openssh/auth-krb4.c
1.8 +17 -38 src/crypto/openssh/auth-passwd.c
1.7 +16 -14 src/crypto/openssh/auth-rh-rsa.c
1.8 +29 -27 src/crypto/openssh/auth-rsa.c
1.7 +89 -57 src/crypto/openssh/auth.c
1.2 +139 -4 src/crypto/openssh/auth.h
1.13 +116 -150 src/crypto/openssh/auth1.c
1.11 +302 -138 src/crypto/openssh/auth2.c
1.8 +75 -49 src/crypto/openssh/authfd.c
1.7 +259 -207 src/crypto/openssh/authfile.c
1.8 +31 -15 src/crypto/openssh/bufaux.c
1.6 +179 -146 src/crypto/openssh/canohost.c
1.3 +618 -222 src/crypto/openssh/channels.c
1.3 +34 -16 src/crypto/openssh/channels.h
1.9 +18 -28 src/crypto/openssh/cipher.c
1.8 +3 -3 src/crypto/openssh/cipher.h
1.4 +81 -17 src/crypto/openssh/compat.c
1.3 +19 -7 src/crypto/openssh/compat.h
1.7 +18 -19 src/crypto/openssh/hostfile.c
1.10 +2 -0 src/crypto/openssh/includes.h
1.8 +498 -65 src/crypto/openssh/key.c
1.7 +9 -7 src/crypto/openssh/mpaux.c
1.8 +21 -15 src/crypto/openssh/packet.h
1.2 +2 -1 src/crypto/openssh/pathnames.h
1.12 +146 -71 src/crypto/openssh/readconf.c
1.8 +16 -8 src/crypto/openssh/readconf.h
1.10 +23 -77 src/crypto/openssh/rsa.c
1.8 +4 -13 src/crypto/openssh/rsa.h
1.22 +249 -144 src/crypto/openssh/servconf.c
1.9 +40 -19 src/crypto/openssh/servconf.h
1.3 +235 -117 src/crypto/openssh/serverloop.c
1.15 +281 -258 src/crypto/openssh/session.c
1.3 +58 -122 src/crypto/openssh/ssh-add.c
1.11 +179 -131 src/crypto/openssh/ssh-agent.c
1.18 +282 -154 src/crypto/openssh/ssh.1
1.14 +311 -214 src/crypto/openssh/ssh.c
1.17 +5 -447 src/crypto/openssh/ssh.h
1.8 +12 -5 src/crypto/openssh/ssh_config
1.16 +144 -73 src/crypto/openssh/sshconnect.c
1.4 +20 -7 src/crypto/openssh/sshconnect.h
1.9 +105 -60 src/crypto/openssh/sshconnect1.c
1.3 +496 -531 src/crypto/openssh/sshconnect2.c
1.17 +309 -138 src/crypto/openssh/sshd.8
1.24 +348 -536 src/crypto/openssh/sshd.c
1.15 +18 -9 src/crypto/openssh/sshd_config
1.2 +2 -1 src/crypto/openssh/sshlogin.c
1.2 +2 -1 src/crypto/openssh/sshpty.c
1.4 +4 -4 src/crypto/openssh/version.h
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105040414.f444ER337016>