..
scard
atomicio.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
atomicio.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth1.c
Turn protocol 1 krb5 support back on.
2005-02-22 02:29:32 +00:00
auth2-chall.c
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
auth2-gss.c
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
auth2-hostbased.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth2-kbdint.c
auth2-krb5.c
Bring back files we need from the dead.
2005-02-13 06:01:36 +00:00
auth2-none.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth2-passwd.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth2-pubkey.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth2.c
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
auth-bsdauth.c
auth-chall.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth-krb4.c
Bring back files we need from the dead.
2005-02-13 06:01:36 +00:00
auth-krb5.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth-options.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth-options.h
auth-pam.c
Make this compile.
2005-02-13 18:13:34 +00:00
auth-pam.h
Add pam files from portable openssh 3.9p1
2005-02-13 18:11:30 +00:00
auth-passwd.c
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
auth-rh-rsa.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth-rhosts.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth-rsa.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth-skey.c
auth.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
auth.h
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
authfd.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
authfd.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
authfile.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
authfile.h
bufaux.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
bufaux.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
buffer.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
buffer.h
canohost.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
canohost.h
channels.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
channels.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
cipher-3des1.c
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
cipher-aes.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
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
cipher.c
Resolve conflicts.
2005-02-13 05:57:25 +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.
2005-02-13 05:57:25 +00:00
clientloop.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
compat.c
Turn protocol 1 krb5 support back on.
2005-02-22 02:29:32 +00:00
compat.h
Turn protocol 1 krb5 support back on.
2005-02-22 02:29:32 +00:00
compress.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
compress.h
crc32.c
crc32.h
date
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
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.
2005-02-13 05:57:25 +00:00
dns.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
fatal.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
getpeereid.c
getpeereid.h
getput.h
getrrsetbyname.c
Bring back files we need from the dead.
2005-02-13 06:01:36 +00:00
getrrsetbyname.h
Bring back files we need from the dead.
2005-02-13 06:01:36 +00:00
groupaccess.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
groupaccess.h
gss-genr.c
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
gss-serv-krb5.c
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
gss-serv.c
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
hostfile.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
hostfile.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
includes.h
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
kex.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
kex.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
kexdh.c
kexdhc.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
kexdhs.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
kexgex.c
kexgexc.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
kexgexs.c
key.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
key.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
LICENCE
Resolve conflicts.
2005-02-13 05:57:25 +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.
2005-02-13 05:57:25 +00:00
mac.h
match.c
Add (unsigned char) cast to ctype functions
2004-11-03 21:01:45 +00:00
match.h
misc.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
misc.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
moduli
add moduli from openssh-3.9p1
2005-02-13 19:34:24 +00:00
moduli.5
Bring back files we need from the dead.
2005-02-13 06:01:36 +00:00
moduli.c
from ftp.openbsd.org
2005-02-13 00:52:40 +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
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
monitor_wrap.h
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
monitor.c
Move duplicate block for pam to the 1.5 dispatch block where it belongs.
2005-02-19 03:08:23 +00:00
monitor.h
Add PAM hooks from portable OpenSSH.
2005-02-13 18:14:04 +00:00
msg.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
msg.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
myproposal.h
from ftp.openbsd.org
2005-02-13 00:52:40 +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.
2005-02-13 05:57:25 +00:00
packet.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
pathnames.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
progressmeter.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
progressmeter.h
radix.c
Bring back files we need from the dead.
2005-02-13 06:01:36 +00:00
radix.h
Bring back files we need from the dead.
2005-02-13 06:01:36 +00:00
random.c
random.h
readconf.c
Put Kerberos configuration options back into client config parsing
2005-02-16 05:04:05 +00:00
readconf.h
Resolve conflicts.
2005-02-13 05:57:25 +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
readpass.c
Merge conflicts.
2005-02-13 06:01:14 +00:00
readpassphrase.3
Sort sections, whitespace nit, use .In.
2005-02-20 21:10:04 +00:00
readpassphrase.c
Bring back files we need from the dead.
2005-02-13 06:01:36 +00:00
readpassphrase.h
Bring back files we need from the dead.
2005-02-13 06:01:36 +00:00
rijndael.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
rijndael.h
rsa.c
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
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
scp.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
servconf.c
Turn protocol 1 krb5 support back on.
2005-02-22 02:29:32 +00:00
servconf.h
Turn protocol 1 krb5 support back on.
2005-02-22 02:29:32 +00:00
serverloop.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
serverloop.h
session.c
Turn protocol 1 krb5 support back on.
2005-02-22 02:29:32 +00:00
session.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sftp-client.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sftp-client.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sftp-common.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sftp-common.h
Resolve conflicts.
2005-02-13 05:57:25 +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.
2005-02-13 05:57:25 +00:00
sftp.1
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sftp.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sftp.h
ssh1.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh2.h
from ftp.openbsd.org
2005-02-13 00:52:40 +00:00
ssh_config
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh_config.5
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-add.1
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-add.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-agent.1
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-agent.c
Resolve conflicts.
2005-02-13 05:57:25 +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.
2005-02-13 05:57:25 +00:00
ssh-keygen.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-keyscan.1
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-keyscan.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-keysign.8
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-keysign.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh-rsa.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
ssh.1
Fix Xref.
2005-02-20 21:10:54 +00:00
ssh.c
A sig_atomic_t isn't necessarily compatible with a %d printf format;
2005-02-15 16:22:12 +00:00
ssh.h
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sshconnect1.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sshconnect2.c
As observed in other modules, pull in <sys/queue.h> explicitly rather
2005-03-17 20:40:42 +00:00
sshconnect.c
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sshconnect.h
sshd_config
Add UsePam yes
2005-02-28 02:35:10 +00:00
sshd_config.5
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sshd.8
Resolve conflicts.
2005-02-13 05:57:25 +00:00
sshd.c
Turn protocol 1 krb5 support back on.
2005-02-22 02:29:32 +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
tildexpand.c
Resolve conflicts.
2005-02-13 05:57:25 +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.
2005-02-13 05:57:25 +00:00
xmalloc.c
xmalloc.h