Date: Sat, 3 Jun 2000 16:56:10 +0200 (SAST) From: Mark Murray <markm@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssh auth.c auth1.c cipher.c key.c readconf.c servconf.c session.c ssh-agent.c ssh.1 ssh.c ssh.h sshconnect.c sshd.c src/secure/lib/libssh Makefile Message-ID: <200006031456.QAA97021@internat.freebsd.org>
next in thread | raw e-mail | index | archive | help
markm 2000/06/03 16:56:10 SAST
FreeBSD International Crypto Repository
Modified files:
crypto/openssh auth.c auth1.c cipher.c key.c readconf.c
servconf.c session.c ssh-agent.c ssh.1
ssh.c ssh.h sshconnect.c sshd.c
Log:
MFF: Resolve conflicts.
Revision Changes Path
1.3 +9 -2 src/crypto/openssh/auth.c
1.4 +2 -3 src/crypto/openssh/auth1.c
1.5 +5 -3 src/crypto/openssh/cipher.c
1.5 +12 -8 src/crypto/openssh/key.c
1.6 +9 -3 src/crypto/openssh/readconf.c
1.7 +6 -2 src/crypto/openssh/servconf.c
1.4 +32 -14 src/crypto/openssh/session.c
1.5 +1 -1 src/crypto/openssh/ssh-agent.c
1.8 +15 -6 src/crypto/openssh/ssh.1
1.7 +8 -3 src/crypto/openssh/ssh.c
1.8 +8 -2 src/crypto/openssh/ssh.h
1.7 +3 -18 src/crypto/openssh/sshconnect.c
1.10 +14 -59 src/crypto/openssh/sshd.c
Modified files:
secure/lib/libssh Makefile
Log:
MFF: take into account new stuff for recent import.
Revision Changes Path
1.4 +2 -2 src/secure/lib/libssh/Makefile
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?200006031456.QAA97021>