..
scard
atomicio.c
resolve conflicts
2006-02-04 22:32:13 +00:00
atomicio.h
resolve conflicts
2006-02-04 22:32:13 +00:00
auth1.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth2-chall.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth2-gss.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth2-hostbased.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth2-kbdint.c
add __RCSID("$NetBSD$"), because it's hard to track our changes in a
2003-07-10 01:09:41 +00:00
auth2-krb5.c
bring back files that this update removed.
2005-04-23 16:55:03 +00:00
auth2-none.c
Update PAM from the "portable openssh" 4.0p1
2005-05-08 21:15:04 +00:00
auth2-passwd.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth2-pubkey.c
resolve conflicts.
2005-04-23 16:53:28 +00:00
auth2.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth-bsdauth.c
resolve conflicts.
2005-04-23 16:53:28 +00:00
auth-chall.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth-krb4.c
bring back files that this update removed.
2005-04-23 16:55:03 +00:00
auth-krb5.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth-options.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth-options.h
resolve conflicts
2006-02-04 22:32:13 +00:00
auth-pam.c
Fix Coverity run 5, issue 2021 -- memory leak.
2006-03-18 10:22:46 +00:00
auth-pam.h
Update PAM from the "portable openssh" 4.0p1
2005-05-08 21:15:04 +00:00
auth-passwd.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth-rh-rsa.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth-rhosts.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth-rsa.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth-skey.c
add __RCSID("$NetBSD$"), because it's hard to track our changes in a
2003-07-10 01:09:41 +00:00
auth.c
resolve conflicts
2006-02-04 22:32:13 +00:00
auth.h
resolve conflicts
2006-02-04 22:32:13 +00:00
authfd.c
resolve conflicts
2006-02-04 22:32:13 +00:00
authfd.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
authfile.c
resolve conflicts
2006-02-04 22:32:13 +00:00
authfile.h
bufaux.c
resolve conflicts
2006-02-04 22:32:13 +00:00
bufaux.h
resolve conflicts
2006-02-04 22:32:13 +00:00
buffer.c
resolve conflicts
2006-02-04 22:32:13 +00:00
buffer.h
resolve conflicts
2006-02-04 22:32:13 +00:00
canohost.c
resolve conflicts
2006-02-04 22:32:13 +00:00
canohost.h
channels.c
resolve conflicts
2006-02-04 22:32:13 +00:00
channels.h
resolve conflicts
2006-02-04 22:32:13 +00:00
cipher-3des1.c
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
cipher-bf1.c
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
cipher-ctr.c
resolve conflicts
2006-02-04 22:32:13 +00:00
cipher.c
resolve conflicts
2006-02-04 22:32:13 +00:00
cipher.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
cleanup.c
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
clientloop.c
resolve conflicts
2006-02-04 22:32:13 +00:00
clientloop.h
resolve conflicts
2006-02-04 22:32:13 +00:00
compat.c
resolve conflicts.
2005-04-23 16:53:28 +00:00
compat.h
resolve conflicts.
2005-04-23 16:53:28 +00:00
compress.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
compress.h
crc32.c
crc32.h
deattack.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
deattack.h
dh.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
dh.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
dispatch.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
dispatch.h
dns.c
resolve conflicts
2006-02-04 22:32:13 +00:00
dns.h
resolve conflicts
2006-02-04 22:32:13 +00:00
fatal.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
getpeereid.c
add __RCSID("$NetBSD$"), because it's hard to track our changes in a
2003-07-10 01:09:41 +00:00
getpeereid.h
getput.h
getrrsetbyname.c
resolve conflicts
2006-02-04 22:32:13 +00:00
getrrsetbyname.h
resolve conflicts
2006-02-04 22:32:13 +00:00
groupaccess.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
groupaccess.h
gss-genr.c
resolve conflicts
2006-02-04 22:32:13 +00:00
gss-serv-krb5.c
resolve conflicts
2006-02-04 22:32:13 +00:00
gss-serv.c
resolve conflicts
2006-02-04 22:32:13 +00:00
hostfile.c
resolve conflicts
2006-02-04 22:32:13 +00:00
hostfile.h
resolve conflicts.
2005-04-23 16:53:28 +00:00
includes.h
Add a namespace.h to rename the most conflict inducing names from libssh.
2006-02-13 16:49:33 +00:00
kex.c
resolve conflicts
2006-02-04 22:32:13 +00:00
kex.h
resolve conflicts
2006-02-04 22:32:13 +00:00
kexdh.c
resolve conflicts
2006-02-04 22:32:13 +00:00
kexdhc.c
resolve conflicts
2006-02-04 22:32:13 +00:00
kexdhs.c
resolve conflicts
2006-02-04 22:32:13 +00:00
kexgex.c
resolve conflicts
2006-02-04 22:32:13 +00:00
kexgexc.c
resolve conflicts
2006-02-04 22:32:13 +00:00
kexgexs.c
resolve conflicts
2006-02-04 22:32:13 +00:00
key.c
resolve conflicts
2006-02-04 22:32:13 +00:00
key.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
LICENCE
resolve conflicts.
2005-04-23 16:53:28 +00:00
log.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
log.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
mac.c
resolve conflicts
2006-02-04 22:32:13 +00:00
mac.h
match.c
resolve conflicts
2006-02-04 22:32:13 +00:00
match.h
misc.c
resolve conflicts
2006-02-04 22:32:13 +00:00
misc.h
resolve conflicts
2006-02-04 22:32:13 +00:00
moduli
add back moduli
2005-04-23 21:12:47 +00:00
moduli.5
qsieve(6) -> qsieve(1)
2006-01-24 19:16:53 +00:00
moduli.c
resolve conflicts
2006-02-04 22:32:13 +00:00
monitor_fdpass.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
monitor_fdpass.h
monitor_mm.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
monitor_mm.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
monitor_wrap.c
resolve conflicts
2006-02-04 22:32:13 +00:00
monitor_wrap.h
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
monitor.c
resolve conflicts
2006-02-04 22:32:13 +00:00
monitor.h
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
msg.c
resolve conflicts
2006-02-04 22:32:13 +00:00
msg.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
myproposal.h
resolve conflicts
2006-02-04 22:32:13 +00:00
namespace.h
Add a namespace.h to rename the most conflict inducing names from libssh.
2006-02-13 16:49:33 +00:00
nchan2.ms
Resolve conflicts.
2005-02-13 05:57:25 +00:00
nchan.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
nchan.ms
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
openssh2netbsd
OVERVIEW
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
packet.c
resolve conflicts
2006-02-04 22:32:13 +00:00
packet.h
resolve conflicts
2006-02-04 22:32:13 +00:00
pathnames.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
progressmeter.c
resolve conflicts
2006-02-04 22:32:13 +00:00
progressmeter.h
radix.c
bring back files that this update removed.
2005-04-23 16:55:03 +00:00
radix.h
bring back files that this update removed.
2005-04-23 16:55:03 +00:00
random.c
random.h
readconf.c
resolve conflicts
2006-02-04 22:32:13 +00:00
readconf.h
resolve conflicts
2006-02-04 22:32:13 +00:00
README
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
README.dns
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
README.smartcard
Resolve conflicts.
2005-02-13 05:57:25 +00:00
README.tun
From ftp.openbsd.org.
2006-02-04 22:22:31 +00:00
readpass.c
resolve conflicts
2006-02-04 22:32:13 +00:00
readpassphrase.3
bring back files that this update removed.
2005-04-23 16:55:03 +00:00
readpassphrase.c
Add a namespace.h to rename the most conflict inducing names from libssh.
2006-02-13 16:49:33 +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
add __RCSID("$NetBSD$"), because it's hard to track our changes in a
2003-07-10 01:09:41 +00:00
rsa.h
scard.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
scard.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
scp.1
resolve conflicts
2006-02-04 22:32:13 +00:00
scp.c
resolve conflicts
2006-02-04 22:32:13 +00:00
servconf.c
resolve conflicts
2006-02-04 22:32:13 +00:00
servconf.h
resolve conflicts
2006-02-04 22:32:13 +00:00
serverloop.c
The sig_atomic_t type is not guaranteed to be printf-compatible
2006-02-08 23:08:13 +00:00
serverloop.h
session.c
resolve conflicts
2006-02-04 22:32:13 +00:00
session.h
resolve conflicts
2006-02-04 22:32:13 +00:00
sftp-client.c
resolve conflicts
2006-02-04 22:32:13 +00:00
sftp-client.h
resolve conflicts
2006-02-04 22:32:13 +00:00
sftp-common.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sftp-common.h
resolve conflicts
2006-02-04 22:32:13 +00:00
sftp-glob.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sftp-server.8
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
sftp-server.c
resolve conflicts
2006-02-04 22:32:13 +00:00
sftp.1
resolve conflicts
2006-02-04 22:32:13 +00:00
sftp.c
resolve conflicts
2006-02-04 22:32:13 +00:00
sftp.h
ssh1.h
resolve conflicts.
2005-04-23 16:53:28 +00:00
ssh2.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
ssh_config
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh_config.5
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-add.1
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-add.c
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-agent.1
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-agent.c
reform a loop to be prettier and appease coverity CID 2618
2006-03-18 10:41:24 +00:00
ssh-dss.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-gss.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
ssh-keygen.1
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-keygen.c
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-keyscan.1
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-keyscan.c
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-keysign.8
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-keysign.c
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh-rsa.c
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh.1
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh.c
resolve conflicts
2006-02-04 22:32:13 +00:00
ssh.h
resolve conflicts.
2005-04-23 16:53:28 +00:00
sshconnect1.c
resolve conflicts
2006-02-04 22:32:13 +00:00
sshconnect2.c
resolve conflicts
2006-02-04 22:32:13 +00:00
sshconnect.c
Make sure the right error is reported later, if all socket() calls fail.
2006-03-01 15:39:00 +00:00
sshconnect.h
resolve conflicts
2006-02-04 22:32:13 +00:00
sshd_config
resolve conflicts
2006-02-04 22:32:13 +00:00
sshd_config.5
resolve conflicts
2006-02-04 22:32:13 +00:00
sshd.8
resolve conflicts
2006-02-04 22:32:13 +00:00
sshd.c
resolve conflicts
2006-02-04 22:32:13 +00:00
sshlogin.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sshlogin.h
sshpty.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sshpty.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sshtty.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
strtonum.c
bring in new file needed from the portable openssh.
2006-02-04 22:32:54 +00:00
ttymodes.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ttymodes.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
uidswap.c
Change the order of the set{e,}{u,g}id calls. NetBSD is stricter and needs
2005-02-13 05:54:27 +00:00
uidswap.h
uuencode.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
uuencode.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
version.h
resolve conflicts
2006-02-04 22:32:13 +00:00
xmalloc.c
add __RCSID("$NetBSD$"), because it's hard to track our changes in a
2003-07-10 01:09:41 +00:00
xmalloc.h