From owner-cvs-all Sun May 14 22:24:38 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id E390337B58F; Sun, 14 May 2000 22:24:27 -0700 (PDT) (envelope-from kris@FreeBSD.org) Received: (from kris@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id WAA39369; Sun, 14 May 2000 22:24:28 -0700 (PDT) (envelope-from kris@FreeBSD.org) Message-Id: <200005150524.WAA39369@freefall.freebsd.org> From: Kris Kennaway Date: Sun, 14 May 2000 22:24:28 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssh README.openssh2 auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rsa.c auth-skey.c auth.c auth1.c auth2.c authfd.c authfile.c bufaux.c cipher.c cipher.h fingerprint.c hostfile.c includes.h key.c login.c mpaux.c packet.h ... Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG kris 2000/05/14 22:24:28 PDT Modified files: crypto/openssh README.openssh2 auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rsa.c auth-skey.c auth.c auth1.c auth2.c authfd.c authfile.c bufaux.c cipher.c cipher.h fingerprint.c hostfile.c includes.h key.c login.c mpaux.c packet.h pty.c readconf.c readconf.h rsa.c rsa.h servconf.c servconf.h session.c ssh-agent.c ssh.1 ssh.c ssh.h ssh_config sshconnect.c sshconnect1.c sshd.8 sshd.c sshd_config Log: Resolve conflicts and update for FreeBSD. Revision Changes Path 1.2 +3 -2 src/crypto/openssh/README.openssh2 1.4 +6 -6 src/crypto/openssh/auth-krb4.c 1.3 +2 -2 src/crypto/openssh/auth-passwd.c 1.3 +7 -7 src/crypto/openssh/auth-rh-rsa.c 1.4 +10 -10 src/crypto/openssh/auth-rsa.c 1.2 +61 -56 src/crypto/openssh/auth-skey.c 1.2 +12 -0 src/crypto/openssh/auth.c 1.2 +136 -16 src/crypto/openssh/auth1.c 1.2 +3 -1 src/crypto/openssh/auth2.c 1.3 +14 -14 src/crypto/openssh/authfd.c 1.3 +186 -38 src/crypto/openssh/authfile.c 1.4 +63 -12 src/crypto/openssh/bufaux.c 1.4 +178 -23 src/crypto/openssh/cipher.c 1.4 +37 -13 src/crypto/openssh/cipher.h 1.4 +2 -2 src/crypto/openssh/fingerprint.c 1.3 +14 -25 src/crypto/openssh/hostfile.c 1.4 +8 -35 src/crypto/openssh/includes.h 1.3 +78 -42 src/crypto/openssh/key.c 1.4 +13 -13 src/crypto/openssh/login.c 1.3 +10 -10 src/crypto/openssh/mpaux.c 1.4 +30 -9 src/crypto/openssh/packet.h 1.3 +12 -12 src/crypto/openssh/pty.c 1.5 +87 -17 src/crypto/openssh/readconf.c 1.3 +18 -11 src/crypto/openssh/readconf.h 1.4 +15 -16 src/crypto/openssh/rsa.c 1.3 +7 -7 src/crypto/openssh/rsa.h 1.6 +98 -31 src/crypto/openssh/servconf.c 1.4 +13 -7 src/crypto/openssh/servconf.h 1.2 +242 -8 src/crypto/openssh/session.c 1.4 +14 -10 src/crypto/openssh/ssh-agent.c 1.8 +163 -44 src/crypto/openssh/ssh.1 1.6 +268 -101 src/crypto/openssh/ssh.c 1.8 +33 -221 src/crypto/openssh/ssh.h 1.3 +1 -0 src/crypto/openssh/ssh_config 1.6 +335 -1304 src/crypto/openssh/sshconnect.c 1.2 +43 -13 src/crypto/openssh/sshconnect1.c 1.8 +146 -47 src/crypto/openssh/sshd.8 1.8 +477 -2055 src/crypto/openssh/sshd.c 1.5 +2 -1 src/crypto/openssh/sshd_config To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message