..
scard
atomicio.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
atomicio.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth1.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth2-chall.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth2-gss.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth2-hostbased.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth2-kbdint.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth2-krb5.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth2-none.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth2-passwd.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth2-pubkey.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth2.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-bsdauth.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-chall.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-krb4.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-krb5.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-options.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-options.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-pam.c
PR/34681: Scott Ellis: Explicitly include <sys/socket.h>
2006-10-04 14:30:35 +00:00
auth-pam.h
auth-passwd.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-rh-rsa.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-rhosts.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-rsa.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth-skey.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
auth.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
authfd.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
authfd.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
authfile.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
authfile.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
bufaux.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
bufbn.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
buffer.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
buffer.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
canohost.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
canohost.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
channels.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
channels.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
cipher-3des1.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
cipher-bf1.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
cipher-ctr.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
cipher.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
cipher.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
cleanup.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
clientloop.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
clientloop.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
compat.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
compat.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
compress.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
compress.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
crc32.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
crc32.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
deattack.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
deattack.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
dh.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
dh.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
dispatch.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
dispatch.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
dns.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
dns.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
fatal.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
getpeereid.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
getpeereid.h
getrrsetbyname.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
getrrsetbyname.h
resolve conflicts
2006-02-04 22:32:13 +00:00
groupaccess.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
groupaccess.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
gss-genr.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
gss-serv-krb5.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
gss-serv.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
hostfile.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
hostfile.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
includes.h
We need this again.
2006-09-28 21:23:13 +00:00
kex.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
kex.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
kexdh.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
kexdhc.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
kexdhs.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
kexgex.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
kexgexc.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
kexgexs.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
key.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
key.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
LICENCE
log.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
log.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
mac.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
mac.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
match.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
match.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
md-sha256.c
one more to catch up with the new location for sha2.h
2006-10-28 23:07:23 +00:00
misc.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
misc.h
unbreak gcc-3 builds.
2006-10-04 14:31:55 +00:00
moduli
moduli.5
moduli.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
monitor_fdpass.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
monitor_fdpass.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
monitor_mm.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
monitor_mm.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
monitor_wrap.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
monitor_wrap.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
monitor.c
From http://www.openssh.org/txt/release-4.5 : (CVE-2006-5794)
2006-11-14 21:52:09 +00:00
monitor.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
msg.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
msg.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
myproposal.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
namespace.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
nchan2.ms
nchan.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
nchan.ms
openssh2netbsd
OVERVIEW
from www.openssh.org
2006-09-28 21:14:57 +00:00
packet.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
packet.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
pathnames.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
progressmeter.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
progressmeter.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
radix.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
radix.h
random.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
random.h
readconf.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
readconf.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
README
from www.openssh.org
2006-09-28 21:14:57 +00:00
README.smartcard
readpass.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
readpassphrase.3
readpassphrase.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
readpassphrase.h
Add a namespace.h to rename the most conflict inducing names from libssh.
2006-02-13 16:49:33 +00:00
rsa.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
rsa.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
scard.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
scard.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
scp.1
Resolve conflicts
2006-09-28 21:22:14 +00:00
scp.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
servconf.c
put back ignorerootrhosts
2006-10-04 14:26:31 +00:00
servconf.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
serverloop.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
serverloop.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
session.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
session.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
sftp-client.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
sftp-client.h
resolve conflicts
2006-02-04 22:32:13 +00:00
sftp-common.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
sftp-common.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
sftp-glob.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
sftp-server.8
Resolve conflicts
2006-09-28 21:22:14 +00:00
sftp-server.c
Use PRIu64 instead of llu when printing an u_int64_t.
2006-09-29 14:36:34 +00:00
sftp.1
resolve conflicts
2006-02-04 22:32:13 +00:00
sftp.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
sftp.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh1.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh2.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh_config
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh_config.5
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh-add.1
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-add.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh-agent.1
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh-agent.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh-dss.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh-gss.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh-keygen.1
Talk of RFC 4716 SSH public key format instead of SECSH public key format.
2006-12-24 10:06:03 +00:00
ssh-keygen.c
Refer to RFC 4716 in two more places (instead of "IETF SECSH").
2007-01-23 22:21:54 +00:00
ssh-keyscan.1
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-keyscan.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh-keysign.8
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh-keysign.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh-rsa.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh.1
Mention RFC 4716. From markus@openbsd via jmc@openbsd (rev. 1.266).
2006-12-24 10:04:08 +00:00
ssh.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
ssh.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshconnect1.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshconnect2.c
The "success" field in Authctxt needs to be a sig_atomic_t, not an int,
2006-09-29 14:34:25 +00:00
sshconnect.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshconnect.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshd_config
Change the default sshd configuration file so that only protocol version 2
2006-10-15 14:01:53 +00:00
sshd_config.5
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshd.8
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshd.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshlogin.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshlogin.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshpty.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshpty.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
sshtty.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
strtonum.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
ttymodes.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
ttymodes.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
uidswap.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
uidswap.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
uuencode.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
uuencode.h
Resolve conflicts
2006-09-28 21:22:14 +00:00
version.h
From http://www.openssh.org/txt/release-4.5 : (CVE-2006-5794)
2006-11-14 21:52:09 +00:00
xmalloc.c
Resolve conflicts
2006-09-28 21:22:14 +00:00
xmalloc.h
Resolve conflicts
2006-09-28 21:22:14 +00:00