Date: Mon, 18 Mar 2002 02:09:45 -0800 (PST) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssh auth-chall.c auth-krb4.c auth-krb5.c auth-pam.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 ... Message-ID: <200203181009.g2IA9jI22591@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
des 2002/03/18 02:09:45 PST
Modified files:
crypto/openssh auth-chall.c auth-krb4.c auth-krb5.c
auth-pam.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 rijndael.c 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.
Revision Changes Path
1.3 +44 -66 src/crypto/openssh/auth-chall.c
1.10 +150 -168 src/crypto/openssh/auth-krb4.c
1.9 +231 -209 src/crypto/openssh/auth-krb5.c
1.6 +3 -3 src/crypto/openssh/auth-pam.c
1.9 +13 -15 src/crypto/openssh/auth-passwd.c
1.8 +8 -43 src/crypto/openssh/auth-rh-rsa.c
1.9 +47 -60 src/crypto/openssh/auth-rsa.c
1.8 +222 -8 src/crypto/openssh/auth.c
1.5 +85 -85 src/crypto/openssh/auth.h
1.19 +89 -173 src/crypto/openssh/auth1.c
1.13 +212 -264 src/crypto/openssh/auth2.c
1.9 +35 -16 src/crypto/openssh/authfd.c
1.9 +58 -60 src/crypto/openssh/authfile.c
1.9 +11 -14 src/crypto/openssh/bufaux.c
1.7 +24 -24 src/crypto/openssh/canohost.c
1.9 +900 -862 src/crypto/openssh/channels.c
1.5 +126 -216 src/crypto/openssh/channels.h
1.10 +329 -384 src/crypto/openssh/cipher.c
1.9 +23 -56 src/crypto/openssh/cipher.h
1.5 +80 -58 src/crypto/openssh/compat.c
1.4 +31 -26 src/crypto/openssh/compat.h
1.8 +3 -14 src/crypto/openssh/hostfile.c
1.11 +2 -8 src/crypto/openssh/includes.h
1.9 +83 -63 src/crypto/openssh/key.c
1.8 +0 -0 src/crypto/openssh/mpaux.c
1.9 +57 -192 src/crypto/openssh/packet.h
1.3 +25 -12 src/crypto/openssh/pathnames.h
1.13 +124 -101 src/crypto/openssh/readconf.c
1.9 +19 -58 src/crypto/openssh/readconf.h
1.2 +1219 -468 src/crypto/openssh/rijndael.c
1.11 +8 -5 src/crypto/openssh/rsa.c
1.9 +6 -7 src/crypto/openssh/rsa.h
1.23 +533 -503 src/crypto/openssh/servconf.c
1.10 +28 -40 src/crypto/openssh/servconf.h
1.4 +256 -186 src/crypto/openssh/serverloop.c
1.20 +620 -739 src/crypto/openssh/session.c
1.6 +153 -62 src/crypto/openssh/ssh-add.c
1.12 +259 -127 src/crypto/openssh/ssh-agent.c
1.20 +278 -144 src/crypto/openssh/ssh.1
1.18 +271 -171 src/crypto/openssh/ssh.c
1.18 +5 -5 src/crypto/openssh/ssh.h
1.10 +11 -13 src/crypto/openssh/ssh_config
1.19 +224 -324 src/crypto/openssh/sshconnect.c
1.5 +10 -19 src/crypto/openssh/sshconnect.h
1.13 +462 -281 src/crypto/openssh/sshconnect1.c
1.4 +133 -114 src/crypto/openssh/sshconnect2.c
1.18 +260 -134 src/crypto/openssh/sshd.8
1.27 +177 -131 src/crypto/openssh/sshd.c
1.18 +70 -47 src/crypto/openssh/sshd_config
1.4 +4 -4 src/crypto/openssh/sshlogin.c
1.3 +14 -12 src/crypto/openssh/sshpty.c
1.11 +5 -5 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?200203181009.g2IA9jI22591>