From 18de8d7fff95ec279dc99590be94fa1e199430dc Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Sat, 20 Jun 2009 08:01:56 -1000 Subject: [PATCH] Move openssh-5/ to openssh/. We don't need a versioned directory. --- crypto/{openssh-5 => openssh}/CREDITS | 0 crypto/{openssh-5 => openssh}/LICENCE | 0 crypto/{openssh-5 => openssh}/PROTOCOL | 0 crypto/{openssh-5 => openssh}/PROTOCOL.agent | 0 crypto/{openssh-5 => openssh}/README | 0 crypto/{openssh-5 => openssh}/README.dns | 0 crypto/{openssh-5 => openssh}/README.tun | 0 crypto/{openssh-5 => openssh}/acss.c | 0 crypto/{openssh-5 => openssh}/acss.h | 0 crypto/{openssh-5 => openssh}/addrmatch.c | 0 crypto/{openssh-5 => openssh}/atomicio.c | 0 crypto/{openssh-5 => openssh}/atomicio.h | 0 crypto/{openssh-5 => openssh}/audit-bsm.c | 0 crypto/{openssh-5 => openssh}/audit.c | 0 crypto/{openssh-5 => openssh}/audit.h | 0 crypto/{openssh-5 => openssh}/auth-bsdauth.c | 0 crypto/{openssh-5 => openssh}/auth-chall.c | 0 crypto/{openssh-5 => openssh}/auth-krb5.c | 0 crypto/{openssh-5 => openssh}/auth-options.c | 0 crypto/{openssh-5 => openssh}/auth-options.h | 0 crypto/{openssh-5 => openssh}/auth-pam.c | 0 crypto/{openssh-5 => openssh}/auth-pam.h | 0 crypto/{openssh-5 => openssh}/auth-passwd.c | 0 crypto/{openssh-5 => openssh}/auth-rh-rsa.c | 0 crypto/{openssh-5 => openssh}/auth-rhosts.c | 0 crypto/{openssh-5 => openssh}/auth-rsa.c | 0 crypto/{openssh-5 => openssh}/auth-skey.c | 0 crypto/{openssh-5 => openssh}/auth.c | 0 crypto/{openssh-5 => openssh}/auth.h | 0 crypto/{openssh-5 => openssh}/auth1.c | 0 crypto/{openssh-5 => openssh}/auth2-chall.c | 0 crypto/{openssh-5 => openssh}/auth2-gss.c | 0 crypto/{openssh-5 => openssh}/auth2-hostbased.c | 0 crypto/{openssh-5 => openssh}/auth2-kbdint.c | 0 crypto/{openssh-5 => openssh}/auth2-none.c | 0 crypto/{openssh-5 => openssh}/auth2-passwd.c | 0 crypto/{openssh-5 => openssh}/auth2-pubkey.c | 0 crypto/{openssh-5 => openssh}/auth2.c | 0 crypto/{openssh-5 => openssh}/authfd.c | 0 crypto/{openssh-5 => openssh}/authfd.h | 0 crypto/{openssh-5 => openssh}/authfile.c | 0 crypto/{openssh-5 => openssh}/authfile.h | 0 crypto/{openssh-5 => openssh}/bufaux.c | 0 crypto/{openssh-5 => openssh}/bufbn.c | 0 crypto/{openssh-5 => openssh}/buffer.c | 0 crypto/{openssh-5 => openssh}/buffer.h | 0 crypto/{openssh-5 => openssh}/canohost.c | 0 crypto/{openssh-5 => openssh}/canohost.h | 0 crypto/{openssh-5 => openssh}/channels.c | 0 crypto/{openssh-5 => openssh}/channels.h | 0 crypto/{openssh-5 => openssh}/cipher-3des1.c | 0 crypto/{openssh-5 => openssh}/cipher-acss.c | 0 crypto/{openssh-5 => openssh}/cipher-aes.c | 0 crypto/{openssh-5 => openssh}/cipher-bf1.c | 0 crypto/{openssh-5 => openssh}/cipher-ctr.c | 0 crypto/{openssh-5 => openssh}/cipher.c | 0 crypto/{openssh-5 => openssh}/cipher.h | 0 crypto/{openssh-5 => openssh}/cleanup.c | 0 crypto/{openssh-5 => openssh}/clientloop.c | 0 crypto/{openssh-5 => openssh}/clientloop.h | 0 crypto/{openssh-5 => openssh}/compat.c | 0 crypto/{openssh-5 => openssh}/compat.h | 0 crypto/{openssh-5 => openssh}/compress.c | 0 crypto/{openssh-5 => openssh}/compress.h | 0 crypto/{openssh-5 => openssh}/crc32.c | 0 crypto/{openssh-5 => openssh}/crc32.h | 0 crypto/{openssh-5 => openssh}/deattack.c | 0 crypto/{openssh-5 => openssh}/deattack.h | 0 crypto/{openssh-5 => openssh}/defines.h | 0 crypto/{openssh-5 => openssh}/dh.c | 0 crypto/{openssh-5 => openssh}/dh.h | 0 crypto/{openssh-5 => openssh}/dispatch.c | 0 crypto/{openssh-5 => openssh}/dispatch.h | 0 crypto/{openssh-5 => openssh}/dns.c | 0 crypto/{openssh-5 => openssh}/dns.h | 0 crypto/{openssh-5 => openssh}/entropy.c | 0 crypto/{openssh-5 => openssh}/entropy.h | 0 crypto/{openssh-5 => openssh}/fatal.c | 0 crypto/{openssh-5 => openssh}/groupaccess.c | 0 crypto/{openssh-5 => openssh}/groupaccess.h | 0 crypto/{openssh-5 => openssh}/gss-genr.c | 0 crypto/{openssh-5 => openssh}/gss-serv-krb5.c | 0 crypto/{openssh-5 => openssh}/gss-serv.c | 0 crypto/{openssh-5 => openssh}/hostfile.c | 0 crypto/{openssh-5 => openssh}/hostfile.h | 0 crypto/{openssh-5 => openssh}/includes.h | 0 crypto/{openssh-5 => openssh}/kex.c | 0 crypto/{openssh-5 => openssh}/kex.h | 0 crypto/{openssh-5 => openssh}/kexdh.c | 0 crypto/{openssh-5 => openssh}/kexdhc.c | 0 crypto/{openssh-5 => openssh}/kexdhs.c | 0 crypto/{openssh-5 => openssh}/kexgex.c | 0 crypto/{openssh-5 => openssh}/kexgexc.c | 0 crypto/{openssh-5 => openssh}/kexgexs.c | 0 crypto/{openssh-5 => openssh}/key.c | 0 crypto/{openssh-5 => openssh}/key.h | 0 crypto/{openssh-5 => openssh}/log.c | 0 crypto/{openssh-5 => openssh}/log.h | 0 crypto/{openssh-5 => openssh}/loginrec.c | 0 crypto/{openssh-5 => openssh}/loginrec.h | 0 crypto/{openssh-5 => openssh}/mac.c | 0 crypto/{openssh-5 => openssh}/mac.h | 0 crypto/{openssh-5 => openssh}/match.c | 0 crypto/{openssh-5 => openssh}/match.h | 0 crypto/{openssh-5 => openssh}/md5crypt.c | 0 crypto/{openssh-5 => openssh}/md5crypt.h | 0 crypto/{openssh-5 => openssh}/misc.c | 0 crypto/{openssh-5 => openssh}/misc.h | 0 crypto/{openssh-5 => openssh}/moduli | 0 crypto/{openssh-5 => openssh}/moduli.5 | 0 crypto/{openssh-5 => openssh}/moduli.c | 0 crypto/{openssh-5 => openssh}/monitor.c | 0 crypto/{openssh-5 => openssh}/monitor.h | 0 crypto/{openssh-5 => openssh}/monitor_fdpass.c | 0 crypto/{openssh-5 => openssh}/monitor_fdpass.h | 0 crypto/{openssh-5 => openssh}/monitor_mm.c | 0 crypto/{openssh-5 => openssh}/monitor_mm.h | 0 crypto/{openssh-5 => openssh}/monitor_wrap.c | 0 crypto/{openssh-5 => openssh}/monitor_wrap.h | 0 crypto/{openssh-5 => openssh}/msg.c | 0 crypto/{openssh-5 => openssh}/msg.h | 0 crypto/{openssh-5 => openssh}/mux.c | 0 crypto/{openssh-5 => openssh}/myproposal.h | 0 crypto/{openssh-5 => openssh}/nchan.c | 0 crypto/{openssh-5 => openssh}/openbsd-compat/base64.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/bsd-cray.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/bsd-cygwin_util.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/bsd-misc.c | 0 crypto/{openssh-5 => openssh}/openbsd-compat/bsd-misc.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/bsd-nextstep.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/bsd-poll.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/bsd-statvfs.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/bsd-waitpid.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/fake-rfc2553.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/fmt_scaled.c | 0 crypto/{openssh-5 => openssh}/openbsd-compat/getrrsetbyname.c | 0 crypto/{openssh-5 => openssh}/openbsd-compat/getrrsetbyname.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/glob.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/openbsd-compat.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/openssl-compat.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/port-aix.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/port-irix.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/port-linux.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/port-solaris.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/port-tun.c | 0 crypto/{openssh-5 => openssh}/openbsd-compat/port-tun.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/port-uw.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/readpassphrase.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/sha2.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/sigact.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/sys-queue.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/sys-tree.h | 0 crypto/{openssh-5 => openssh}/openbsd-compat/xmmap.c | 0 crypto/{openssh-5 => openssh}/packet.c | 0 crypto/{openssh-5 => openssh}/packet.h | 0 crypto/{openssh-5 => openssh}/pathnames.h | 0 crypto/{openssh-5 => openssh}/platform.c | 0 crypto/{openssh-5 => openssh}/platform.h | 0 crypto/{openssh-5 => openssh}/progressmeter.c | 0 crypto/{openssh-5 => openssh}/progressmeter.h | 0 crypto/{openssh-5 => openssh}/readconf.c | 0 crypto/{openssh-5 => openssh}/readconf.h | 0 crypto/{openssh-5 => openssh}/readpass.c | 0 crypto/{openssh-5 => openssh}/rijndael.c | 0 crypto/{openssh-5 => openssh}/rijndael.h | 0 crypto/{openssh-5 => openssh}/rsa.c | 0 crypto/{openssh-5 => openssh}/rsa.h | 0 crypto/{openssh-5 => openssh}/scard-opensc.c | 0 crypto/{openssh-5 => openssh}/scard.c | 0 crypto/{openssh-5 => openssh}/scp.1 | 0 crypto/{openssh-5 => openssh}/scp.c | 0 crypto/{openssh-5 => openssh}/servconf.c | 0 crypto/{openssh-5 => openssh}/servconf.h | 0 crypto/{openssh-5 => openssh}/serverloop.c | 0 crypto/{openssh-5 => openssh}/serverloop.h | 0 crypto/{openssh-5 => openssh}/session.c | 0 crypto/{openssh-5 => openssh}/session.h | 0 crypto/{openssh-5 => openssh}/sftp-client.c | 0 crypto/{openssh-5 => openssh}/sftp-client.h | 0 crypto/{openssh-5 => openssh}/sftp-common.c | 0 crypto/{openssh-5 => openssh}/sftp-common.h | 0 crypto/{openssh-5 => openssh}/sftp-glob.c | 0 crypto/{openssh-5 => openssh}/sftp-server-main.c | 0 crypto/{openssh-5 => openssh}/sftp-server.8 | 0 crypto/{openssh-5 => openssh}/sftp-server.c | 0 crypto/{openssh-5 => openssh}/sftp.1 | 0 crypto/{openssh-5 => openssh}/sftp.c | 0 crypto/{openssh-5 => openssh}/sftp.h | 0 crypto/{openssh-5 => openssh}/ssh-add.1 | 0 crypto/{openssh-5 => openssh}/ssh-add.c | 0 crypto/{openssh-5 => openssh}/ssh-agent.1 | 0 crypto/{openssh-5 => openssh}/ssh-agent.c | 0 crypto/{openssh-5 => openssh}/ssh-dss.c | 0 crypto/{openssh-5 => openssh}/ssh-gss.h | 0 crypto/{openssh-5 => openssh}/ssh-keygen.1 | 0 crypto/{openssh-5 => openssh}/ssh-keygen.c | 0 crypto/{openssh-5 => openssh}/ssh-keyscan.1 | 0 crypto/{openssh-5 => openssh}/ssh-keyscan.c | 0 crypto/{openssh-5 => openssh}/ssh-keysign.8 | 0 crypto/{openssh-5 => openssh}/ssh-keysign.c | 0 crypto/{openssh-5 => openssh}/ssh-rsa.c | 0 crypto/{openssh-5 => openssh}/ssh.1 | 0 crypto/{openssh-5 => openssh}/ssh.c | 0 crypto/{openssh-5 => openssh}/ssh.h | 0 crypto/{openssh-5 => openssh}/ssh1.h | 0 crypto/{openssh-5 => openssh}/ssh2.h | 0 crypto/{openssh-5 => openssh}/ssh_config | 0 crypto/{openssh-5 => openssh}/ssh_config.5 | 0 crypto/{openssh-5 => openssh}/sshconnect.c | 0 crypto/{openssh-5 => openssh}/sshconnect.h | 0 crypto/{openssh-5 => openssh}/sshconnect1.c | 0 crypto/{openssh-5 => openssh}/sshconnect2.c | 0 crypto/{openssh-5 => openssh}/sshd.8 | 0 crypto/{openssh-5 => openssh}/sshd.c | 0 crypto/{openssh-5 => openssh}/sshd_config | 0 crypto/{openssh-5 => openssh}/sshd_config.5 | 0 crypto/{openssh-5 => openssh}/sshlogin.c | 0 crypto/{openssh-5 => openssh}/sshlogin.h | 0 crypto/{openssh-5 => openssh}/sshpty.c | 0 crypto/{openssh-5 => openssh}/sshpty.h | 0 crypto/{openssh-5 => openssh}/sshtty.c | 0 crypto/{openssh-5 => openssh}/ttymodes.c | 0 crypto/{openssh-5 => openssh}/ttymodes.h | 0 crypto/{openssh-5 => openssh}/uidswap.c | 0 crypto/{openssh-5 => openssh}/uidswap.h | 0 crypto/{openssh-5 => openssh}/umac.c | 0 crypto/{openssh-5 => openssh}/umac.h | 0 crypto/{openssh-5 => openssh}/uuencode.c | 0 crypto/{openssh-5 => openssh}/uuencode.h | 0 crypto/{openssh-5 => openssh}/xmalloc.c | 0 crypto/{openssh-5 => openssh}/xmalloc.h | 0 231 files changed, 0 insertions(+), 0 deletions(-) rename crypto/{openssh-5 => openssh}/CREDITS (100%) rename crypto/{openssh-5 => openssh}/LICENCE (100%) rename crypto/{openssh-5 => openssh}/PROTOCOL (100%) rename crypto/{openssh-5 => openssh}/PROTOCOL.agent (100%) rename crypto/{openssh-5 => openssh}/README (100%) rename crypto/{openssh-5 => openssh}/README.dns (100%) rename crypto/{openssh-5 => openssh}/README.tun (100%) rename crypto/{openssh-5 => openssh}/acss.c (100%) rename crypto/{openssh-5 => openssh}/acss.h (100%) rename crypto/{openssh-5 => openssh}/addrmatch.c (100%) rename crypto/{openssh-5 => openssh}/atomicio.c (100%) rename crypto/{openssh-5 => openssh}/atomicio.h (100%) rename crypto/{openssh-5 => openssh}/audit-bsm.c (100%) rename crypto/{openssh-5 => openssh}/audit.c (100%) rename crypto/{openssh-5 => openssh}/audit.h (100%) rename crypto/{openssh-5 => openssh}/auth-bsdauth.c (100%) rename crypto/{openssh-5 => openssh}/auth-chall.c (100%) rename crypto/{openssh-5 => openssh}/auth-krb5.c (100%) rename crypto/{openssh-5 => openssh}/auth-options.c (100%) rename crypto/{openssh-5 => openssh}/auth-options.h (100%) rename crypto/{openssh-5 => openssh}/auth-pam.c (100%) rename crypto/{openssh-5 => openssh}/auth-pam.h (100%) rename crypto/{openssh-5 => openssh}/auth-passwd.c (100%) rename crypto/{openssh-5 => openssh}/auth-rh-rsa.c (100%) rename crypto/{openssh-5 => openssh}/auth-rhosts.c (100%) rename crypto/{openssh-5 => openssh}/auth-rsa.c (100%) rename crypto/{openssh-5 => openssh}/auth-skey.c (100%) rename crypto/{openssh-5 => openssh}/auth.c (100%) rename crypto/{openssh-5 => openssh}/auth.h (100%) rename crypto/{openssh-5 => openssh}/auth1.c (100%) rename crypto/{openssh-5 => openssh}/auth2-chall.c (100%) rename crypto/{openssh-5 => openssh}/auth2-gss.c (100%) rename crypto/{openssh-5 => openssh}/auth2-hostbased.c (100%) rename crypto/{openssh-5 => openssh}/auth2-kbdint.c (100%) rename crypto/{openssh-5 => openssh}/auth2-none.c (100%) rename crypto/{openssh-5 => openssh}/auth2-passwd.c (100%) rename crypto/{openssh-5 => openssh}/auth2-pubkey.c (100%) rename crypto/{openssh-5 => openssh}/auth2.c (100%) rename crypto/{openssh-5 => openssh}/authfd.c (100%) rename crypto/{openssh-5 => openssh}/authfd.h (100%) rename crypto/{openssh-5 => openssh}/authfile.c (100%) rename crypto/{openssh-5 => openssh}/authfile.h (100%) rename crypto/{openssh-5 => openssh}/bufaux.c (100%) rename crypto/{openssh-5 => openssh}/bufbn.c (100%) rename crypto/{openssh-5 => openssh}/buffer.c (100%) rename crypto/{openssh-5 => openssh}/buffer.h (100%) rename crypto/{openssh-5 => openssh}/canohost.c (100%) rename crypto/{openssh-5 => openssh}/canohost.h (100%) rename crypto/{openssh-5 => openssh}/channels.c (100%) rename crypto/{openssh-5 => openssh}/channels.h (100%) rename crypto/{openssh-5 => openssh}/cipher-3des1.c (100%) rename crypto/{openssh-5 => openssh}/cipher-acss.c (100%) rename crypto/{openssh-5 => openssh}/cipher-aes.c (100%) rename crypto/{openssh-5 => openssh}/cipher-bf1.c (100%) rename crypto/{openssh-5 => openssh}/cipher-ctr.c (100%) rename crypto/{openssh-5 => openssh}/cipher.c (100%) rename crypto/{openssh-5 => openssh}/cipher.h (100%) rename crypto/{openssh-5 => openssh}/cleanup.c (100%) rename crypto/{openssh-5 => openssh}/clientloop.c (100%) rename crypto/{openssh-5 => openssh}/clientloop.h (100%) rename crypto/{openssh-5 => openssh}/compat.c (100%) rename crypto/{openssh-5 => openssh}/compat.h (100%) rename crypto/{openssh-5 => openssh}/compress.c (100%) rename crypto/{openssh-5 => openssh}/compress.h (100%) rename crypto/{openssh-5 => openssh}/crc32.c (100%) rename crypto/{openssh-5 => openssh}/crc32.h (100%) rename crypto/{openssh-5 => openssh}/deattack.c (100%) rename crypto/{openssh-5 => openssh}/deattack.h (100%) rename crypto/{openssh-5 => openssh}/defines.h (100%) rename crypto/{openssh-5 => openssh}/dh.c (100%) rename crypto/{openssh-5 => openssh}/dh.h (100%) rename crypto/{openssh-5 => openssh}/dispatch.c (100%) rename crypto/{openssh-5 => openssh}/dispatch.h (100%) rename crypto/{openssh-5 => openssh}/dns.c (100%) rename crypto/{openssh-5 => openssh}/dns.h (100%) rename crypto/{openssh-5 => openssh}/entropy.c (100%) rename crypto/{openssh-5 => openssh}/entropy.h (100%) rename crypto/{openssh-5 => openssh}/fatal.c (100%) rename crypto/{openssh-5 => openssh}/groupaccess.c (100%) rename crypto/{openssh-5 => openssh}/groupaccess.h (100%) rename crypto/{openssh-5 => openssh}/gss-genr.c (100%) rename crypto/{openssh-5 => openssh}/gss-serv-krb5.c (100%) rename crypto/{openssh-5 => openssh}/gss-serv.c (100%) rename crypto/{openssh-5 => openssh}/hostfile.c (100%) rename crypto/{openssh-5 => openssh}/hostfile.h (100%) rename crypto/{openssh-5 => openssh}/includes.h (100%) rename crypto/{openssh-5 => openssh}/kex.c (100%) rename crypto/{openssh-5 => openssh}/kex.h (100%) rename crypto/{openssh-5 => openssh}/kexdh.c (100%) rename crypto/{openssh-5 => openssh}/kexdhc.c (100%) rename crypto/{openssh-5 => openssh}/kexdhs.c (100%) rename crypto/{openssh-5 => openssh}/kexgex.c (100%) rename crypto/{openssh-5 => openssh}/kexgexc.c (100%) rename crypto/{openssh-5 => openssh}/kexgexs.c (100%) rename crypto/{openssh-5 => openssh}/key.c (100%) rename crypto/{openssh-5 => openssh}/key.h (100%) rename crypto/{openssh-5 => openssh}/log.c (100%) rename crypto/{openssh-5 => openssh}/log.h (100%) rename crypto/{openssh-5 => openssh}/loginrec.c (100%) rename crypto/{openssh-5 => openssh}/loginrec.h (100%) rename crypto/{openssh-5 => openssh}/mac.c (100%) rename crypto/{openssh-5 => openssh}/mac.h (100%) rename crypto/{openssh-5 => openssh}/match.c (100%) rename crypto/{openssh-5 => openssh}/match.h (100%) rename crypto/{openssh-5 => openssh}/md5crypt.c (100%) rename crypto/{openssh-5 => openssh}/md5crypt.h (100%) rename crypto/{openssh-5 => openssh}/misc.c (100%) rename crypto/{openssh-5 => openssh}/misc.h (100%) rename crypto/{openssh-5 => openssh}/moduli (100%) rename crypto/{openssh-5 => openssh}/moduli.5 (100%) rename crypto/{openssh-5 => openssh}/moduli.c (100%) rename crypto/{openssh-5 => openssh}/monitor.c (100%) rename crypto/{openssh-5 => openssh}/monitor.h (100%) rename crypto/{openssh-5 => openssh}/monitor_fdpass.c (100%) rename crypto/{openssh-5 => openssh}/monitor_fdpass.h (100%) rename crypto/{openssh-5 => openssh}/monitor_mm.c (100%) rename crypto/{openssh-5 => openssh}/monitor_mm.h (100%) rename crypto/{openssh-5 => openssh}/monitor_wrap.c (100%) rename crypto/{openssh-5 => openssh}/monitor_wrap.h (100%) rename crypto/{openssh-5 => openssh}/msg.c (100%) rename crypto/{openssh-5 => openssh}/msg.h (100%) rename crypto/{openssh-5 => openssh}/mux.c (100%) rename crypto/{openssh-5 => openssh}/myproposal.h (100%) rename crypto/{openssh-5 => openssh}/nchan.c (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/base64.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/bsd-cray.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/bsd-cygwin_util.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/bsd-misc.c (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/bsd-misc.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/bsd-nextstep.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/bsd-poll.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/bsd-statvfs.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/bsd-waitpid.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/fake-rfc2553.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/fmt_scaled.c (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/getrrsetbyname.c (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/getrrsetbyname.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/glob.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/openbsd-compat.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/openssl-compat.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/port-aix.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/port-irix.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/port-linux.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/port-solaris.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/port-tun.c (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/port-tun.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/port-uw.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/readpassphrase.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/sha2.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/sigact.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/sys-queue.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/sys-tree.h (100%) rename crypto/{openssh-5 => openssh}/openbsd-compat/xmmap.c (100%) rename crypto/{openssh-5 => openssh}/packet.c (100%) rename crypto/{openssh-5 => openssh}/packet.h (100%) rename crypto/{openssh-5 => openssh}/pathnames.h (100%) rename crypto/{openssh-5 => openssh}/platform.c (100%) rename crypto/{openssh-5 => openssh}/platform.h (100%) rename crypto/{openssh-5 => openssh}/progressmeter.c (100%) rename crypto/{openssh-5 => openssh}/progressmeter.h (100%) rename crypto/{openssh-5 => openssh}/readconf.c (100%) rename crypto/{openssh-5 => openssh}/readconf.h (100%) rename crypto/{openssh-5 => openssh}/readpass.c (100%) rename crypto/{openssh-5 => openssh}/rijndael.c (100%) rename crypto/{openssh-5 => openssh}/rijndael.h (100%) rename crypto/{openssh-5 => openssh}/rsa.c (100%) rename crypto/{openssh-5 => openssh}/rsa.h (100%) rename crypto/{openssh-5 => openssh}/scard-opensc.c (100%) rename crypto/{openssh-5 => openssh}/scard.c (100%) rename crypto/{openssh-5 => openssh}/scp.1 (100%) rename crypto/{openssh-5 => openssh}/scp.c (100%) rename crypto/{openssh-5 => openssh}/servconf.c (100%) rename crypto/{openssh-5 => openssh}/servconf.h (100%) rename crypto/{openssh-5 => openssh}/serverloop.c (100%) rename crypto/{openssh-5 => openssh}/serverloop.h (100%) rename crypto/{openssh-5 => openssh}/session.c (100%) rename crypto/{openssh-5 => openssh}/session.h (100%) rename crypto/{openssh-5 => openssh}/sftp-client.c (100%) rename crypto/{openssh-5 => openssh}/sftp-client.h (100%) rename crypto/{openssh-5 => openssh}/sftp-common.c (100%) rename crypto/{openssh-5 => openssh}/sftp-common.h (100%) rename crypto/{openssh-5 => openssh}/sftp-glob.c (100%) rename crypto/{openssh-5 => openssh}/sftp-server-main.c (100%) rename crypto/{openssh-5 => openssh}/sftp-server.8 (100%) rename crypto/{openssh-5 => openssh}/sftp-server.c (100%) rename crypto/{openssh-5 => openssh}/sftp.1 (100%) rename crypto/{openssh-5 => openssh}/sftp.c (100%) rename crypto/{openssh-5 => openssh}/sftp.h (100%) rename crypto/{openssh-5 => openssh}/ssh-add.1 (100%) rename crypto/{openssh-5 => openssh}/ssh-add.c (100%) rename crypto/{openssh-5 => openssh}/ssh-agent.1 (100%) rename crypto/{openssh-5 => openssh}/ssh-agent.c (100%) rename crypto/{openssh-5 => openssh}/ssh-dss.c (100%) rename crypto/{openssh-5 => openssh}/ssh-gss.h (100%) rename crypto/{openssh-5 => openssh}/ssh-keygen.1 (100%) rename crypto/{openssh-5 => openssh}/ssh-keygen.c (100%) rename crypto/{openssh-5 => openssh}/ssh-keyscan.1 (100%) rename crypto/{openssh-5 => openssh}/ssh-keyscan.c (100%) rename crypto/{openssh-5 => openssh}/ssh-keysign.8 (100%) rename crypto/{openssh-5 => openssh}/ssh-keysign.c (100%) rename crypto/{openssh-5 => openssh}/ssh-rsa.c (100%) rename crypto/{openssh-5 => openssh}/ssh.1 (100%) rename crypto/{openssh-5 => openssh}/ssh.c (100%) rename crypto/{openssh-5 => openssh}/ssh.h (100%) rename crypto/{openssh-5 => openssh}/ssh1.h (100%) rename crypto/{openssh-5 => openssh}/ssh2.h (100%) rename crypto/{openssh-5 => openssh}/ssh_config (100%) rename crypto/{openssh-5 => openssh}/ssh_config.5 (100%) rename crypto/{openssh-5 => openssh}/sshconnect.c (100%) rename crypto/{openssh-5 => openssh}/sshconnect.h (100%) rename crypto/{openssh-5 => openssh}/sshconnect1.c (100%) rename crypto/{openssh-5 => openssh}/sshconnect2.c (100%) rename crypto/{openssh-5 => openssh}/sshd.8 (100%) rename crypto/{openssh-5 => openssh}/sshd.c (100%) rename crypto/{openssh-5 => openssh}/sshd_config (100%) rename crypto/{openssh-5 => openssh}/sshd_config.5 (100%) rename crypto/{openssh-5 => openssh}/sshlogin.c (100%) rename crypto/{openssh-5 => openssh}/sshlogin.h (100%) rename crypto/{openssh-5 => openssh}/sshpty.c (100%) rename crypto/{openssh-5 => openssh}/sshpty.h (100%) rename crypto/{openssh-5 => openssh}/sshtty.c (100%) rename crypto/{openssh-5 => openssh}/ttymodes.c (100%) rename crypto/{openssh-5 => openssh}/ttymodes.h (100%) rename crypto/{openssh-5 => openssh}/uidswap.c (100%) rename crypto/{openssh-5 => openssh}/uidswap.h (100%) rename crypto/{openssh-5 => openssh}/umac.c (100%) rename crypto/{openssh-5 => openssh}/umac.h (100%) rename crypto/{openssh-5 => openssh}/uuencode.c (100%) rename crypto/{openssh-5 => openssh}/uuencode.h (100%) rename crypto/{openssh-5 => openssh}/xmalloc.c (100%) rename crypto/{openssh-5 => openssh}/xmalloc.h (100%) diff --git a/crypto/openssh-5/CREDITS b/crypto/openssh/CREDITS similarity index 100% rename from crypto/openssh-5/CREDITS rename to crypto/openssh/CREDITS diff --git a/crypto/openssh-5/LICENCE b/crypto/openssh/LICENCE similarity index 100% rename from crypto/openssh-5/LICENCE rename to crypto/openssh/LICENCE diff --git a/crypto/openssh-5/PROTOCOL b/crypto/openssh/PROTOCOL similarity index 100% rename from crypto/openssh-5/PROTOCOL rename to crypto/openssh/PROTOCOL diff --git a/crypto/openssh-5/PROTOCOL.agent b/crypto/openssh/PROTOCOL.agent similarity index 100% rename from crypto/openssh-5/PROTOCOL.agent rename to crypto/openssh/PROTOCOL.agent diff --git a/crypto/openssh-5/README b/crypto/openssh/README similarity index 100% rename from crypto/openssh-5/README rename to crypto/openssh/README diff --git a/crypto/openssh-5/README.dns b/crypto/openssh/README.dns similarity index 100% rename from crypto/openssh-5/README.dns rename to crypto/openssh/README.dns diff --git a/crypto/openssh-5/README.tun b/crypto/openssh/README.tun similarity index 100% rename from crypto/openssh-5/README.tun rename to crypto/openssh/README.tun diff --git a/crypto/openssh-5/acss.c b/crypto/openssh/acss.c similarity index 100% rename from crypto/openssh-5/acss.c rename to crypto/openssh/acss.c diff --git a/crypto/openssh-5/acss.h b/crypto/openssh/acss.h similarity index 100% rename from crypto/openssh-5/acss.h rename to crypto/openssh/acss.h diff --git a/crypto/openssh-5/addrmatch.c b/crypto/openssh/addrmatch.c similarity index 100% rename from crypto/openssh-5/addrmatch.c rename to crypto/openssh/addrmatch.c diff --git a/crypto/openssh-5/atomicio.c b/crypto/openssh/atomicio.c similarity index 100% rename from crypto/openssh-5/atomicio.c rename to crypto/openssh/atomicio.c diff --git a/crypto/openssh-5/atomicio.h b/crypto/openssh/atomicio.h similarity index 100% rename from crypto/openssh-5/atomicio.h rename to crypto/openssh/atomicio.h diff --git a/crypto/openssh-5/audit-bsm.c b/crypto/openssh/audit-bsm.c similarity index 100% rename from crypto/openssh-5/audit-bsm.c rename to crypto/openssh/audit-bsm.c diff --git a/crypto/openssh-5/audit.c b/crypto/openssh/audit.c similarity index 100% rename from crypto/openssh-5/audit.c rename to crypto/openssh/audit.c diff --git a/crypto/openssh-5/audit.h b/crypto/openssh/audit.h similarity index 100% rename from crypto/openssh-5/audit.h rename to crypto/openssh/audit.h diff --git a/crypto/openssh-5/auth-bsdauth.c b/crypto/openssh/auth-bsdauth.c similarity index 100% rename from crypto/openssh-5/auth-bsdauth.c rename to crypto/openssh/auth-bsdauth.c diff --git a/crypto/openssh-5/auth-chall.c b/crypto/openssh/auth-chall.c similarity index 100% rename from crypto/openssh-5/auth-chall.c rename to crypto/openssh/auth-chall.c diff --git a/crypto/openssh-5/auth-krb5.c b/crypto/openssh/auth-krb5.c similarity index 100% rename from crypto/openssh-5/auth-krb5.c rename to crypto/openssh/auth-krb5.c diff --git a/crypto/openssh-5/auth-options.c b/crypto/openssh/auth-options.c similarity index 100% rename from crypto/openssh-5/auth-options.c rename to crypto/openssh/auth-options.c diff --git a/crypto/openssh-5/auth-options.h b/crypto/openssh/auth-options.h similarity index 100% rename from crypto/openssh-5/auth-options.h rename to crypto/openssh/auth-options.h diff --git a/crypto/openssh-5/auth-pam.c b/crypto/openssh/auth-pam.c similarity index 100% rename from crypto/openssh-5/auth-pam.c rename to crypto/openssh/auth-pam.c diff --git a/crypto/openssh-5/auth-pam.h b/crypto/openssh/auth-pam.h similarity index 100% rename from crypto/openssh-5/auth-pam.h rename to crypto/openssh/auth-pam.h diff --git a/crypto/openssh-5/auth-passwd.c b/crypto/openssh/auth-passwd.c similarity index 100% rename from crypto/openssh-5/auth-passwd.c rename to crypto/openssh/auth-passwd.c diff --git a/crypto/openssh-5/auth-rh-rsa.c b/crypto/openssh/auth-rh-rsa.c similarity index 100% rename from crypto/openssh-5/auth-rh-rsa.c rename to crypto/openssh/auth-rh-rsa.c diff --git a/crypto/openssh-5/auth-rhosts.c b/crypto/openssh/auth-rhosts.c similarity index 100% rename from crypto/openssh-5/auth-rhosts.c rename to crypto/openssh/auth-rhosts.c diff --git a/crypto/openssh-5/auth-rsa.c b/crypto/openssh/auth-rsa.c similarity index 100% rename from crypto/openssh-5/auth-rsa.c rename to crypto/openssh/auth-rsa.c diff --git a/crypto/openssh-5/auth-skey.c b/crypto/openssh/auth-skey.c similarity index 100% rename from crypto/openssh-5/auth-skey.c rename to crypto/openssh/auth-skey.c diff --git a/crypto/openssh-5/auth.c b/crypto/openssh/auth.c similarity index 100% rename from crypto/openssh-5/auth.c rename to crypto/openssh/auth.c diff --git a/crypto/openssh-5/auth.h b/crypto/openssh/auth.h similarity index 100% rename from crypto/openssh-5/auth.h rename to crypto/openssh/auth.h diff --git a/crypto/openssh-5/auth1.c b/crypto/openssh/auth1.c similarity index 100% rename from crypto/openssh-5/auth1.c rename to crypto/openssh/auth1.c diff --git a/crypto/openssh-5/auth2-chall.c b/crypto/openssh/auth2-chall.c similarity index 100% rename from crypto/openssh-5/auth2-chall.c rename to crypto/openssh/auth2-chall.c diff --git a/crypto/openssh-5/auth2-gss.c b/crypto/openssh/auth2-gss.c similarity index 100% rename from crypto/openssh-5/auth2-gss.c rename to crypto/openssh/auth2-gss.c diff --git a/crypto/openssh-5/auth2-hostbased.c b/crypto/openssh/auth2-hostbased.c similarity index 100% rename from crypto/openssh-5/auth2-hostbased.c rename to crypto/openssh/auth2-hostbased.c diff --git a/crypto/openssh-5/auth2-kbdint.c b/crypto/openssh/auth2-kbdint.c similarity index 100% rename from crypto/openssh-5/auth2-kbdint.c rename to crypto/openssh/auth2-kbdint.c diff --git a/crypto/openssh-5/auth2-none.c b/crypto/openssh/auth2-none.c similarity index 100% rename from crypto/openssh-5/auth2-none.c rename to crypto/openssh/auth2-none.c diff --git a/crypto/openssh-5/auth2-passwd.c b/crypto/openssh/auth2-passwd.c similarity index 100% rename from crypto/openssh-5/auth2-passwd.c rename to crypto/openssh/auth2-passwd.c diff --git a/crypto/openssh-5/auth2-pubkey.c b/crypto/openssh/auth2-pubkey.c similarity index 100% rename from crypto/openssh-5/auth2-pubkey.c rename to crypto/openssh/auth2-pubkey.c diff --git a/crypto/openssh-5/auth2.c b/crypto/openssh/auth2.c similarity index 100% rename from crypto/openssh-5/auth2.c rename to crypto/openssh/auth2.c diff --git a/crypto/openssh-5/authfd.c b/crypto/openssh/authfd.c similarity index 100% rename from crypto/openssh-5/authfd.c rename to crypto/openssh/authfd.c diff --git a/crypto/openssh-5/authfd.h b/crypto/openssh/authfd.h similarity index 100% rename from crypto/openssh-5/authfd.h rename to crypto/openssh/authfd.h diff --git a/crypto/openssh-5/authfile.c b/crypto/openssh/authfile.c similarity index 100% rename from crypto/openssh-5/authfile.c rename to crypto/openssh/authfile.c diff --git a/crypto/openssh-5/authfile.h b/crypto/openssh/authfile.h similarity index 100% rename from crypto/openssh-5/authfile.h rename to crypto/openssh/authfile.h diff --git a/crypto/openssh-5/bufaux.c b/crypto/openssh/bufaux.c similarity index 100% rename from crypto/openssh-5/bufaux.c rename to crypto/openssh/bufaux.c diff --git a/crypto/openssh-5/bufbn.c b/crypto/openssh/bufbn.c similarity index 100% rename from crypto/openssh-5/bufbn.c rename to crypto/openssh/bufbn.c diff --git a/crypto/openssh-5/buffer.c b/crypto/openssh/buffer.c similarity index 100% rename from crypto/openssh-5/buffer.c rename to crypto/openssh/buffer.c diff --git a/crypto/openssh-5/buffer.h b/crypto/openssh/buffer.h similarity index 100% rename from crypto/openssh-5/buffer.h rename to crypto/openssh/buffer.h diff --git a/crypto/openssh-5/canohost.c b/crypto/openssh/canohost.c similarity index 100% rename from crypto/openssh-5/canohost.c rename to crypto/openssh/canohost.c diff --git a/crypto/openssh-5/canohost.h b/crypto/openssh/canohost.h similarity index 100% rename from crypto/openssh-5/canohost.h rename to crypto/openssh/canohost.h diff --git a/crypto/openssh-5/channels.c b/crypto/openssh/channels.c similarity index 100% rename from crypto/openssh-5/channels.c rename to crypto/openssh/channels.c diff --git a/crypto/openssh-5/channels.h b/crypto/openssh/channels.h similarity index 100% rename from crypto/openssh-5/channels.h rename to crypto/openssh/channels.h diff --git a/crypto/openssh-5/cipher-3des1.c b/crypto/openssh/cipher-3des1.c similarity index 100% rename from crypto/openssh-5/cipher-3des1.c rename to crypto/openssh/cipher-3des1.c diff --git a/crypto/openssh-5/cipher-acss.c b/crypto/openssh/cipher-acss.c similarity index 100% rename from crypto/openssh-5/cipher-acss.c rename to crypto/openssh/cipher-acss.c diff --git a/crypto/openssh-5/cipher-aes.c b/crypto/openssh/cipher-aes.c similarity index 100% rename from crypto/openssh-5/cipher-aes.c rename to crypto/openssh/cipher-aes.c diff --git a/crypto/openssh-5/cipher-bf1.c b/crypto/openssh/cipher-bf1.c similarity index 100% rename from crypto/openssh-5/cipher-bf1.c rename to crypto/openssh/cipher-bf1.c diff --git a/crypto/openssh-5/cipher-ctr.c b/crypto/openssh/cipher-ctr.c similarity index 100% rename from crypto/openssh-5/cipher-ctr.c rename to crypto/openssh/cipher-ctr.c diff --git a/crypto/openssh-5/cipher.c b/crypto/openssh/cipher.c similarity index 100% rename from crypto/openssh-5/cipher.c rename to crypto/openssh/cipher.c diff --git a/crypto/openssh-5/cipher.h b/crypto/openssh/cipher.h similarity index 100% rename from crypto/openssh-5/cipher.h rename to crypto/openssh/cipher.h diff --git a/crypto/openssh-5/cleanup.c b/crypto/openssh/cleanup.c similarity index 100% rename from crypto/openssh-5/cleanup.c rename to crypto/openssh/cleanup.c diff --git a/crypto/openssh-5/clientloop.c b/crypto/openssh/clientloop.c similarity index 100% rename from crypto/openssh-5/clientloop.c rename to crypto/openssh/clientloop.c diff --git a/crypto/openssh-5/clientloop.h b/crypto/openssh/clientloop.h similarity index 100% rename from crypto/openssh-5/clientloop.h rename to crypto/openssh/clientloop.h diff --git a/crypto/openssh-5/compat.c b/crypto/openssh/compat.c similarity index 100% rename from crypto/openssh-5/compat.c rename to crypto/openssh/compat.c diff --git a/crypto/openssh-5/compat.h b/crypto/openssh/compat.h similarity index 100% rename from crypto/openssh-5/compat.h rename to crypto/openssh/compat.h diff --git a/crypto/openssh-5/compress.c b/crypto/openssh/compress.c similarity index 100% rename from crypto/openssh-5/compress.c rename to crypto/openssh/compress.c diff --git a/crypto/openssh-5/compress.h b/crypto/openssh/compress.h similarity index 100% rename from crypto/openssh-5/compress.h rename to crypto/openssh/compress.h diff --git a/crypto/openssh-5/crc32.c b/crypto/openssh/crc32.c similarity index 100% rename from crypto/openssh-5/crc32.c rename to crypto/openssh/crc32.c diff --git a/crypto/openssh-5/crc32.h b/crypto/openssh/crc32.h similarity index 100% rename from crypto/openssh-5/crc32.h rename to crypto/openssh/crc32.h diff --git a/crypto/openssh-5/deattack.c b/crypto/openssh/deattack.c similarity index 100% rename from crypto/openssh-5/deattack.c rename to crypto/openssh/deattack.c diff --git a/crypto/openssh-5/deattack.h b/crypto/openssh/deattack.h similarity index 100% rename from crypto/openssh-5/deattack.h rename to crypto/openssh/deattack.h diff --git a/crypto/openssh-5/defines.h b/crypto/openssh/defines.h similarity index 100% rename from crypto/openssh-5/defines.h rename to crypto/openssh/defines.h diff --git a/crypto/openssh-5/dh.c b/crypto/openssh/dh.c similarity index 100% rename from crypto/openssh-5/dh.c rename to crypto/openssh/dh.c diff --git a/crypto/openssh-5/dh.h b/crypto/openssh/dh.h similarity index 100% rename from crypto/openssh-5/dh.h rename to crypto/openssh/dh.h diff --git a/crypto/openssh-5/dispatch.c b/crypto/openssh/dispatch.c similarity index 100% rename from crypto/openssh-5/dispatch.c rename to crypto/openssh/dispatch.c diff --git a/crypto/openssh-5/dispatch.h b/crypto/openssh/dispatch.h similarity index 100% rename from crypto/openssh-5/dispatch.h rename to crypto/openssh/dispatch.h diff --git a/crypto/openssh-5/dns.c b/crypto/openssh/dns.c similarity index 100% rename from crypto/openssh-5/dns.c rename to crypto/openssh/dns.c diff --git a/crypto/openssh-5/dns.h b/crypto/openssh/dns.h similarity index 100% rename from crypto/openssh-5/dns.h rename to crypto/openssh/dns.h diff --git a/crypto/openssh-5/entropy.c b/crypto/openssh/entropy.c similarity index 100% rename from crypto/openssh-5/entropy.c rename to crypto/openssh/entropy.c diff --git a/crypto/openssh-5/entropy.h b/crypto/openssh/entropy.h similarity index 100% rename from crypto/openssh-5/entropy.h rename to crypto/openssh/entropy.h diff --git a/crypto/openssh-5/fatal.c b/crypto/openssh/fatal.c similarity index 100% rename from crypto/openssh-5/fatal.c rename to crypto/openssh/fatal.c diff --git a/crypto/openssh-5/groupaccess.c b/crypto/openssh/groupaccess.c similarity index 100% rename from crypto/openssh-5/groupaccess.c rename to crypto/openssh/groupaccess.c diff --git a/crypto/openssh-5/groupaccess.h b/crypto/openssh/groupaccess.h similarity index 100% rename from crypto/openssh-5/groupaccess.h rename to crypto/openssh/groupaccess.h diff --git a/crypto/openssh-5/gss-genr.c b/crypto/openssh/gss-genr.c similarity index 100% rename from crypto/openssh-5/gss-genr.c rename to crypto/openssh/gss-genr.c diff --git a/crypto/openssh-5/gss-serv-krb5.c b/crypto/openssh/gss-serv-krb5.c similarity index 100% rename from crypto/openssh-5/gss-serv-krb5.c rename to crypto/openssh/gss-serv-krb5.c diff --git a/crypto/openssh-5/gss-serv.c b/crypto/openssh/gss-serv.c similarity index 100% rename from crypto/openssh-5/gss-serv.c rename to crypto/openssh/gss-serv.c diff --git a/crypto/openssh-5/hostfile.c b/crypto/openssh/hostfile.c similarity index 100% rename from crypto/openssh-5/hostfile.c rename to crypto/openssh/hostfile.c diff --git a/crypto/openssh-5/hostfile.h b/crypto/openssh/hostfile.h similarity index 100% rename from crypto/openssh-5/hostfile.h rename to crypto/openssh/hostfile.h diff --git a/crypto/openssh-5/includes.h b/crypto/openssh/includes.h similarity index 100% rename from crypto/openssh-5/includes.h rename to crypto/openssh/includes.h diff --git a/crypto/openssh-5/kex.c b/crypto/openssh/kex.c similarity index 100% rename from crypto/openssh-5/kex.c rename to crypto/openssh/kex.c diff --git a/crypto/openssh-5/kex.h b/crypto/openssh/kex.h similarity index 100% rename from crypto/openssh-5/kex.h rename to crypto/openssh/kex.h diff --git a/crypto/openssh-5/kexdh.c b/crypto/openssh/kexdh.c similarity index 100% rename from crypto/openssh-5/kexdh.c rename to crypto/openssh/kexdh.c diff --git a/crypto/openssh-5/kexdhc.c b/crypto/openssh/kexdhc.c similarity index 100% rename from crypto/openssh-5/kexdhc.c rename to crypto/openssh/kexdhc.c diff --git a/crypto/openssh-5/kexdhs.c b/crypto/openssh/kexdhs.c similarity index 100% rename from crypto/openssh-5/kexdhs.c rename to crypto/openssh/kexdhs.c diff --git a/crypto/openssh-5/kexgex.c b/crypto/openssh/kexgex.c similarity index 100% rename from crypto/openssh-5/kexgex.c rename to crypto/openssh/kexgex.c diff --git a/crypto/openssh-5/kexgexc.c b/crypto/openssh/kexgexc.c similarity index 100% rename from crypto/openssh-5/kexgexc.c rename to crypto/openssh/kexgexc.c diff --git a/crypto/openssh-5/kexgexs.c b/crypto/openssh/kexgexs.c similarity index 100% rename from crypto/openssh-5/kexgexs.c rename to crypto/openssh/kexgexs.c diff --git a/crypto/openssh-5/key.c b/crypto/openssh/key.c similarity index 100% rename from crypto/openssh-5/key.c rename to crypto/openssh/key.c diff --git a/crypto/openssh-5/key.h b/crypto/openssh/key.h similarity index 100% rename from crypto/openssh-5/key.h rename to crypto/openssh/key.h diff --git a/crypto/openssh-5/log.c b/crypto/openssh/log.c similarity index 100% rename from crypto/openssh-5/log.c rename to crypto/openssh/log.c diff --git a/crypto/openssh-5/log.h b/crypto/openssh/log.h similarity index 100% rename from crypto/openssh-5/log.h rename to crypto/openssh/log.h diff --git a/crypto/openssh-5/loginrec.c b/crypto/openssh/loginrec.c similarity index 100% rename from crypto/openssh-5/loginrec.c rename to crypto/openssh/loginrec.c diff --git a/crypto/openssh-5/loginrec.h b/crypto/openssh/loginrec.h similarity index 100% rename from crypto/openssh-5/loginrec.h rename to crypto/openssh/loginrec.h diff --git a/crypto/openssh-5/mac.c b/crypto/openssh/mac.c similarity index 100% rename from crypto/openssh-5/mac.c rename to crypto/openssh/mac.c diff --git a/crypto/openssh-5/mac.h b/crypto/openssh/mac.h similarity index 100% rename from crypto/openssh-5/mac.h rename to crypto/openssh/mac.h diff --git a/crypto/openssh-5/match.c b/crypto/openssh/match.c similarity index 100% rename from crypto/openssh-5/match.c rename to crypto/openssh/match.c diff --git a/crypto/openssh-5/match.h b/crypto/openssh/match.h similarity index 100% rename from crypto/openssh-5/match.h rename to crypto/openssh/match.h diff --git a/crypto/openssh-5/md5crypt.c b/crypto/openssh/md5crypt.c similarity index 100% rename from crypto/openssh-5/md5crypt.c rename to crypto/openssh/md5crypt.c diff --git a/crypto/openssh-5/md5crypt.h b/crypto/openssh/md5crypt.h similarity index 100% rename from crypto/openssh-5/md5crypt.h rename to crypto/openssh/md5crypt.h diff --git a/crypto/openssh-5/misc.c b/crypto/openssh/misc.c similarity index 100% rename from crypto/openssh-5/misc.c rename to crypto/openssh/misc.c diff --git a/crypto/openssh-5/misc.h b/crypto/openssh/misc.h similarity index 100% rename from crypto/openssh-5/misc.h rename to crypto/openssh/misc.h diff --git a/crypto/openssh-5/moduli b/crypto/openssh/moduli similarity index 100% rename from crypto/openssh-5/moduli rename to crypto/openssh/moduli diff --git a/crypto/openssh-5/moduli.5 b/crypto/openssh/moduli.5 similarity index 100% rename from crypto/openssh-5/moduli.5 rename to crypto/openssh/moduli.5 diff --git a/crypto/openssh-5/moduli.c b/crypto/openssh/moduli.c similarity index 100% rename from crypto/openssh-5/moduli.c rename to crypto/openssh/moduli.c diff --git a/crypto/openssh-5/monitor.c b/crypto/openssh/monitor.c similarity index 100% rename from crypto/openssh-5/monitor.c rename to crypto/openssh/monitor.c diff --git a/crypto/openssh-5/monitor.h b/crypto/openssh/monitor.h similarity index 100% rename from crypto/openssh-5/monitor.h rename to crypto/openssh/monitor.h diff --git a/crypto/openssh-5/monitor_fdpass.c b/crypto/openssh/monitor_fdpass.c similarity index 100% rename from crypto/openssh-5/monitor_fdpass.c rename to crypto/openssh/monitor_fdpass.c diff --git a/crypto/openssh-5/monitor_fdpass.h b/crypto/openssh/monitor_fdpass.h similarity index 100% rename from crypto/openssh-5/monitor_fdpass.h rename to crypto/openssh/monitor_fdpass.h diff --git a/crypto/openssh-5/monitor_mm.c b/crypto/openssh/monitor_mm.c similarity index 100% rename from crypto/openssh-5/monitor_mm.c rename to crypto/openssh/monitor_mm.c diff --git a/crypto/openssh-5/monitor_mm.h b/crypto/openssh/monitor_mm.h similarity index 100% rename from crypto/openssh-5/monitor_mm.h rename to crypto/openssh/monitor_mm.h diff --git a/crypto/openssh-5/monitor_wrap.c b/crypto/openssh/monitor_wrap.c similarity index 100% rename from crypto/openssh-5/monitor_wrap.c rename to crypto/openssh/monitor_wrap.c diff --git a/crypto/openssh-5/monitor_wrap.h b/crypto/openssh/monitor_wrap.h similarity index 100% rename from crypto/openssh-5/monitor_wrap.h rename to crypto/openssh/monitor_wrap.h diff --git a/crypto/openssh-5/msg.c b/crypto/openssh/msg.c similarity index 100% rename from crypto/openssh-5/msg.c rename to crypto/openssh/msg.c diff --git a/crypto/openssh-5/msg.h b/crypto/openssh/msg.h similarity index 100% rename from crypto/openssh-5/msg.h rename to crypto/openssh/msg.h diff --git a/crypto/openssh-5/mux.c b/crypto/openssh/mux.c similarity index 100% rename from crypto/openssh-5/mux.c rename to crypto/openssh/mux.c diff --git a/crypto/openssh-5/myproposal.h b/crypto/openssh/myproposal.h similarity index 100% rename from crypto/openssh-5/myproposal.h rename to crypto/openssh/myproposal.h diff --git a/crypto/openssh-5/nchan.c b/crypto/openssh/nchan.c similarity index 100% rename from crypto/openssh-5/nchan.c rename to crypto/openssh/nchan.c diff --git a/crypto/openssh-5/openbsd-compat/base64.h b/crypto/openssh/openbsd-compat/base64.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/base64.h rename to crypto/openssh/openbsd-compat/base64.h diff --git a/crypto/openssh-5/openbsd-compat/bsd-cray.h b/crypto/openssh/openbsd-compat/bsd-cray.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/bsd-cray.h rename to crypto/openssh/openbsd-compat/bsd-cray.h diff --git a/crypto/openssh-5/openbsd-compat/bsd-cygwin_util.h b/crypto/openssh/openbsd-compat/bsd-cygwin_util.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/bsd-cygwin_util.h rename to crypto/openssh/openbsd-compat/bsd-cygwin_util.h diff --git a/crypto/openssh-5/openbsd-compat/bsd-misc.c b/crypto/openssh/openbsd-compat/bsd-misc.c similarity index 100% rename from crypto/openssh-5/openbsd-compat/bsd-misc.c rename to crypto/openssh/openbsd-compat/bsd-misc.c diff --git a/crypto/openssh-5/openbsd-compat/bsd-misc.h b/crypto/openssh/openbsd-compat/bsd-misc.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/bsd-misc.h rename to crypto/openssh/openbsd-compat/bsd-misc.h diff --git a/crypto/openssh-5/openbsd-compat/bsd-nextstep.h b/crypto/openssh/openbsd-compat/bsd-nextstep.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/bsd-nextstep.h rename to crypto/openssh/openbsd-compat/bsd-nextstep.h diff --git a/crypto/openssh-5/openbsd-compat/bsd-poll.h b/crypto/openssh/openbsd-compat/bsd-poll.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/bsd-poll.h rename to crypto/openssh/openbsd-compat/bsd-poll.h diff --git a/crypto/openssh-5/openbsd-compat/bsd-statvfs.h b/crypto/openssh/openbsd-compat/bsd-statvfs.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/bsd-statvfs.h rename to crypto/openssh/openbsd-compat/bsd-statvfs.h diff --git a/crypto/openssh-5/openbsd-compat/bsd-waitpid.h b/crypto/openssh/openbsd-compat/bsd-waitpid.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/bsd-waitpid.h rename to crypto/openssh/openbsd-compat/bsd-waitpid.h diff --git a/crypto/openssh-5/openbsd-compat/fake-rfc2553.h b/crypto/openssh/openbsd-compat/fake-rfc2553.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/fake-rfc2553.h rename to crypto/openssh/openbsd-compat/fake-rfc2553.h diff --git a/crypto/openssh-5/openbsd-compat/fmt_scaled.c b/crypto/openssh/openbsd-compat/fmt_scaled.c similarity index 100% rename from crypto/openssh-5/openbsd-compat/fmt_scaled.c rename to crypto/openssh/openbsd-compat/fmt_scaled.c diff --git a/crypto/openssh-5/openbsd-compat/getrrsetbyname.c b/crypto/openssh/openbsd-compat/getrrsetbyname.c similarity index 100% rename from crypto/openssh-5/openbsd-compat/getrrsetbyname.c rename to crypto/openssh/openbsd-compat/getrrsetbyname.c diff --git a/crypto/openssh-5/openbsd-compat/getrrsetbyname.h b/crypto/openssh/openbsd-compat/getrrsetbyname.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/getrrsetbyname.h rename to crypto/openssh/openbsd-compat/getrrsetbyname.h diff --git a/crypto/openssh-5/openbsd-compat/glob.h b/crypto/openssh/openbsd-compat/glob.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/glob.h rename to crypto/openssh/openbsd-compat/glob.h diff --git a/crypto/openssh-5/openbsd-compat/openbsd-compat.h b/crypto/openssh/openbsd-compat/openbsd-compat.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/openbsd-compat.h rename to crypto/openssh/openbsd-compat/openbsd-compat.h diff --git a/crypto/openssh-5/openbsd-compat/openssl-compat.h b/crypto/openssh/openbsd-compat/openssl-compat.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/openssl-compat.h rename to crypto/openssh/openbsd-compat/openssl-compat.h diff --git a/crypto/openssh-5/openbsd-compat/port-aix.h b/crypto/openssh/openbsd-compat/port-aix.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/port-aix.h rename to crypto/openssh/openbsd-compat/port-aix.h diff --git a/crypto/openssh-5/openbsd-compat/port-irix.h b/crypto/openssh/openbsd-compat/port-irix.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/port-irix.h rename to crypto/openssh/openbsd-compat/port-irix.h diff --git a/crypto/openssh-5/openbsd-compat/port-linux.h b/crypto/openssh/openbsd-compat/port-linux.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/port-linux.h rename to crypto/openssh/openbsd-compat/port-linux.h diff --git a/crypto/openssh-5/openbsd-compat/port-solaris.h b/crypto/openssh/openbsd-compat/port-solaris.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/port-solaris.h rename to crypto/openssh/openbsd-compat/port-solaris.h diff --git a/crypto/openssh-5/openbsd-compat/port-tun.c b/crypto/openssh/openbsd-compat/port-tun.c similarity index 100% rename from crypto/openssh-5/openbsd-compat/port-tun.c rename to crypto/openssh/openbsd-compat/port-tun.c diff --git a/crypto/openssh-5/openbsd-compat/port-tun.h b/crypto/openssh/openbsd-compat/port-tun.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/port-tun.h rename to crypto/openssh/openbsd-compat/port-tun.h diff --git a/crypto/openssh-5/openbsd-compat/port-uw.h b/crypto/openssh/openbsd-compat/port-uw.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/port-uw.h rename to crypto/openssh/openbsd-compat/port-uw.h diff --git a/crypto/openssh-5/openbsd-compat/readpassphrase.h b/crypto/openssh/openbsd-compat/readpassphrase.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/readpassphrase.h rename to crypto/openssh/openbsd-compat/readpassphrase.h diff --git a/crypto/openssh-5/openbsd-compat/sha2.h b/crypto/openssh/openbsd-compat/sha2.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/sha2.h rename to crypto/openssh/openbsd-compat/sha2.h diff --git a/crypto/openssh-5/openbsd-compat/sigact.h b/crypto/openssh/openbsd-compat/sigact.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/sigact.h rename to crypto/openssh/openbsd-compat/sigact.h diff --git a/crypto/openssh-5/openbsd-compat/sys-queue.h b/crypto/openssh/openbsd-compat/sys-queue.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/sys-queue.h rename to crypto/openssh/openbsd-compat/sys-queue.h diff --git a/crypto/openssh-5/openbsd-compat/sys-tree.h b/crypto/openssh/openbsd-compat/sys-tree.h similarity index 100% rename from crypto/openssh-5/openbsd-compat/sys-tree.h rename to crypto/openssh/openbsd-compat/sys-tree.h diff --git a/crypto/openssh-5/openbsd-compat/xmmap.c b/crypto/openssh/openbsd-compat/xmmap.c similarity index 100% rename from crypto/openssh-5/openbsd-compat/xmmap.c rename to crypto/openssh/openbsd-compat/xmmap.c diff --git a/crypto/openssh-5/packet.c b/crypto/openssh/packet.c similarity index 100% rename from crypto/openssh-5/packet.c rename to crypto/openssh/packet.c diff --git a/crypto/openssh-5/packet.h b/crypto/openssh/packet.h similarity index 100% rename from crypto/openssh-5/packet.h rename to crypto/openssh/packet.h diff --git a/crypto/openssh-5/pathnames.h b/crypto/openssh/pathnames.h similarity index 100% rename from crypto/openssh-5/pathnames.h rename to crypto/openssh/pathnames.h diff --git a/crypto/openssh-5/platform.c b/crypto/openssh/platform.c similarity index 100% rename from crypto/openssh-5/platform.c rename to crypto/openssh/platform.c diff --git a/crypto/openssh-5/platform.h b/crypto/openssh/platform.h similarity index 100% rename from crypto/openssh-5/platform.h rename to crypto/openssh/platform.h diff --git a/crypto/openssh-5/progressmeter.c b/crypto/openssh/progressmeter.c similarity index 100% rename from crypto/openssh-5/progressmeter.c rename to crypto/openssh/progressmeter.c diff --git a/crypto/openssh-5/progressmeter.h b/crypto/openssh/progressmeter.h similarity index 100% rename from crypto/openssh-5/progressmeter.h rename to crypto/openssh/progressmeter.h diff --git a/crypto/openssh-5/readconf.c b/crypto/openssh/readconf.c similarity index 100% rename from crypto/openssh-5/readconf.c rename to crypto/openssh/readconf.c diff --git a/crypto/openssh-5/readconf.h b/crypto/openssh/readconf.h similarity index 100% rename from crypto/openssh-5/readconf.h rename to crypto/openssh/readconf.h diff --git a/crypto/openssh-5/readpass.c b/crypto/openssh/readpass.c similarity index 100% rename from crypto/openssh-5/readpass.c rename to crypto/openssh/readpass.c diff --git a/crypto/openssh-5/rijndael.c b/crypto/openssh/rijndael.c similarity index 100% rename from crypto/openssh-5/rijndael.c rename to crypto/openssh/rijndael.c diff --git a/crypto/openssh-5/rijndael.h b/crypto/openssh/rijndael.h similarity index 100% rename from crypto/openssh-5/rijndael.h rename to crypto/openssh/rijndael.h diff --git a/crypto/openssh-5/rsa.c b/crypto/openssh/rsa.c similarity index 100% rename from crypto/openssh-5/rsa.c rename to crypto/openssh/rsa.c diff --git a/crypto/openssh-5/rsa.h b/crypto/openssh/rsa.h similarity index 100% rename from crypto/openssh-5/rsa.h rename to crypto/openssh/rsa.h diff --git a/crypto/openssh-5/scard-opensc.c b/crypto/openssh/scard-opensc.c similarity index 100% rename from crypto/openssh-5/scard-opensc.c rename to crypto/openssh/scard-opensc.c diff --git a/crypto/openssh-5/scard.c b/crypto/openssh/scard.c similarity index 100% rename from crypto/openssh-5/scard.c rename to crypto/openssh/scard.c diff --git a/crypto/openssh-5/scp.1 b/crypto/openssh/scp.1 similarity index 100% rename from crypto/openssh-5/scp.1 rename to crypto/openssh/scp.1 diff --git a/crypto/openssh-5/scp.c b/crypto/openssh/scp.c similarity index 100% rename from crypto/openssh-5/scp.c rename to crypto/openssh/scp.c diff --git a/crypto/openssh-5/servconf.c b/crypto/openssh/servconf.c similarity index 100% rename from crypto/openssh-5/servconf.c rename to crypto/openssh/servconf.c diff --git a/crypto/openssh-5/servconf.h b/crypto/openssh/servconf.h similarity index 100% rename from crypto/openssh-5/servconf.h rename to crypto/openssh/servconf.h diff --git a/crypto/openssh-5/serverloop.c b/crypto/openssh/serverloop.c similarity index 100% rename from crypto/openssh-5/serverloop.c rename to crypto/openssh/serverloop.c diff --git a/crypto/openssh-5/serverloop.h b/crypto/openssh/serverloop.h similarity index 100% rename from crypto/openssh-5/serverloop.h rename to crypto/openssh/serverloop.h diff --git a/crypto/openssh-5/session.c b/crypto/openssh/session.c similarity index 100% rename from crypto/openssh-5/session.c rename to crypto/openssh/session.c diff --git a/crypto/openssh-5/session.h b/crypto/openssh/session.h similarity index 100% rename from crypto/openssh-5/session.h rename to crypto/openssh/session.h diff --git a/crypto/openssh-5/sftp-client.c b/crypto/openssh/sftp-client.c similarity index 100% rename from crypto/openssh-5/sftp-client.c rename to crypto/openssh/sftp-client.c diff --git a/crypto/openssh-5/sftp-client.h b/crypto/openssh/sftp-client.h similarity index 100% rename from crypto/openssh-5/sftp-client.h rename to crypto/openssh/sftp-client.h diff --git a/crypto/openssh-5/sftp-common.c b/crypto/openssh/sftp-common.c similarity index 100% rename from crypto/openssh-5/sftp-common.c rename to crypto/openssh/sftp-common.c diff --git a/crypto/openssh-5/sftp-common.h b/crypto/openssh/sftp-common.h similarity index 100% rename from crypto/openssh-5/sftp-common.h rename to crypto/openssh/sftp-common.h diff --git a/crypto/openssh-5/sftp-glob.c b/crypto/openssh/sftp-glob.c similarity index 100% rename from crypto/openssh-5/sftp-glob.c rename to crypto/openssh/sftp-glob.c diff --git a/crypto/openssh-5/sftp-server-main.c b/crypto/openssh/sftp-server-main.c similarity index 100% rename from crypto/openssh-5/sftp-server-main.c rename to crypto/openssh/sftp-server-main.c diff --git a/crypto/openssh-5/sftp-server.8 b/crypto/openssh/sftp-server.8 similarity index 100% rename from crypto/openssh-5/sftp-server.8 rename to crypto/openssh/sftp-server.8 diff --git a/crypto/openssh-5/sftp-server.c b/crypto/openssh/sftp-server.c similarity index 100% rename from crypto/openssh-5/sftp-server.c rename to crypto/openssh/sftp-server.c diff --git a/crypto/openssh-5/sftp.1 b/crypto/openssh/sftp.1 similarity index 100% rename from crypto/openssh-5/sftp.1 rename to crypto/openssh/sftp.1 diff --git a/crypto/openssh-5/sftp.c b/crypto/openssh/sftp.c similarity index 100% rename from crypto/openssh-5/sftp.c rename to crypto/openssh/sftp.c diff --git a/crypto/openssh-5/sftp.h b/crypto/openssh/sftp.h similarity index 100% rename from crypto/openssh-5/sftp.h rename to crypto/openssh/sftp.h diff --git a/crypto/openssh-5/ssh-add.1 b/crypto/openssh/ssh-add.1 similarity index 100% rename from crypto/openssh-5/ssh-add.1 rename to crypto/openssh/ssh-add.1 diff --git a/crypto/openssh-5/ssh-add.c b/crypto/openssh/ssh-add.c similarity index 100% rename from crypto/openssh-5/ssh-add.c rename to crypto/openssh/ssh-add.c diff --git a/crypto/openssh-5/ssh-agent.1 b/crypto/openssh/ssh-agent.1 similarity index 100% rename from crypto/openssh-5/ssh-agent.1 rename to crypto/openssh/ssh-agent.1 diff --git a/crypto/openssh-5/ssh-agent.c b/crypto/openssh/ssh-agent.c similarity index 100% rename from crypto/openssh-5/ssh-agent.c rename to crypto/openssh/ssh-agent.c diff --git a/crypto/openssh-5/ssh-dss.c b/crypto/openssh/ssh-dss.c similarity index 100% rename from crypto/openssh-5/ssh-dss.c rename to crypto/openssh/ssh-dss.c diff --git a/crypto/openssh-5/ssh-gss.h b/crypto/openssh/ssh-gss.h similarity index 100% rename from crypto/openssh-5/ssh-gss.h rename to crypto/openssh/ssh-gss.h diff --git a/crypto/openssh-5/ssh-keygen.1 b/crypto/openssh/ssh-keygen.1 similarity index 100% rename from crypto/openssh-5/ssh-keygen.1 rename to crypto/openssh/ssh-keygen.1 diff --git a/crypto/openssh-5/ssh-keygen.c b/crypto/openssh/ssh-keygen.c similarity index 100% rename from crypto/openssh-5/ssh-keygen.c rename to crypto/openssh/ssh-keygen.c diff --git a/crypto/openssh-5/ssh-keyscan.1 b/crypto/openssh/ssh-keyscan.1 similarity index 100% rename from crypto/openssh-5/ssh-keyscan.1 rename to crypto/openssh/ssh-keyscan.1 diff --git a/crypto/openssh-5/ssh-keyscan.c b/crypto/openssh/ssh-keyscan.c similarity index 100% rename from crypto/openssh-5/ssh-keyscan.c rename to crypto/openssh/ssh-keyscan.c diff --git a/crypto/openssh-5/ssh-keysign.8 b/crypto/openssh/ssh-keysign.8 similarity index 100% rename from crypto/openssh-5/ssh-keysign.8 rename to crypto/openssh/ssh-keysign.8 diff --git a/crypto/openssh-5/ssh-keysign.c b/crypto/openssh/ssh-keysign.c similarity index 100% rename from crypto/openssh-5/ssh-keysign.c rename to crypto/openssh/ssh-keysign.c diff --git a/crypto/openssh-5/ssh-rsa.c b/crypto/openssh/ssh-rsa.c similarity index 100% rename from crypto/openssh-5/ssh-rsa.c rename to crypto/openssh/ssh-rsa.c diff --git a/crypto/openssh-5/ssh.1 b/crypto/openssh/ssh.1 similarity index 100% rename from crypto/openssh-5/ssh.1 rename to crypto/openssh/ssh.1 diff --git a/crypto/openssh-5/ssh.c b/crypto/openssh/ssh.c similarity index 100% rename from crypto/openssh-5/ssh.c rename to crypto/openssh/ssh.c diff --git a/crypto/openssh-5/ssh.h b/crypto/openssh/ssh.h similarity index 100% rename from crypto/openssh-5/ssh.h rename to crypto/openssh/ssh.h diff --git a/crypto/openssh-5/ssh1.h b/crypto/openssh/ssh1.h similarity index 100% rename from crypto/openssh-5/ssh1.h rename to crypto/openssh/ssh1.h diff --git a/crypto/openssh-5/ssh2.h b/crypto/openssh/ssh2.h similarity index 100% rename from crypto/openssh-5/ssh2.h rename to crypto/openssh/ssh2.h diff --git a/crypto/openssh-5/ssh_config b/crypto/openssh/ssh_config similarity index 100% rename from crypto/openssh-5/ssh_config rename to crypto/openssh/ssh_config diff --git a/crypto/openssh-5/ssh_config.5 b/crypto/openssh/ssh_config.5 similarity index 100% rename from crypto/openssh-5/ssh_config.5 rename to crypto/openssh/ssh_config.5 diff --git a/crypto/openssh-5/sshconnect.c b/crypto/openssh/sshconnect.c similarity index 100% rename from crypto/openssh-5/sshconnect.c rename to crypto/openssh/sshconnect.c diff --git a/crypto/openssh-5/sshconnect.h b/crypto/openssh/sshconnect.h similarity index 100% rename from crypto/openssh-5/sshconnect.h rename to crypto/openssh/sshconnect.h diff --git a/crypto/openssh-5/sshconnect1.c b/crypto/openssh/sshconnect1.c similarity index 100% rename from crypto/openssh-5/sshconnect1.c rename to crypto/openssh/sshconnect1.c diff --git a/crypto/openssh-5/sshconnect2.c b/crypto/openssh/sshconnect2.c similarity index 100% rename from crypto/openssh-5/sshconnect2.c rename to crypto/openssh/sshconnect2.c diff --git a/crypto/openssh-5/sshd.8 b/crypto/openssh/sshd.8 similarity index 100% rename from crypto/openssh-5/sshd.8 rename to crypto/openssh/sshd.8 diff --git a/crypto/openssh-5/sshd.c b/crypto/openssh/sshd.c similarity index 100% rename from crypto/openssh-5/sshd.c rename to crypto/openssh/sshd.c diff --git a/crypto/openssh-5/sshd_config b/crypto/openssh/sshd_config similarity index 100% rename from crypto/openssh-5/sshd_config rename to crypto/openssh/sshd_config diff --git a/crypto/openssh-5/sshd_config.5 b/crypto/openssh/sshd_config.5 similarity index 100% rename from crypto/openssh-5/sshd_config.5 rename to crypto/openssh/sshd_config.5 diff --git a/crypto/openssh-5/sshlogin.c b/crypto/openssh/sshlogin.c similarity index 100% rename from crypto/openssh-5/sshlogin.c rename to crypto/openssh/sshlogin.c diff --git a/crypto/openssh-5/sshlogin.h b/crypto/openssh/sshlogin.h similarity index 100% rename from crypto/openssh-5/sshlogin.h rename to crypto/openssh/sshlogin.h diff --git a/crypto/openssh-5/sshpty.c b/crypto/openssh/sshpty.c similarity index 100% rename from crypto/openssh-5/sshpty.c rename to crypto/openssh/sshpty.c diff --git a/crypto/openssh-5/sshpty.h b/crypto/openssh/sshpty.h similarity index 100% rename from crypto/openssh-5/sshpty.h rename to crypto/openssh/sshpty.h diff --git a/crypto/openssh-5/sshtty.c b/crypto/openssh/sshtty.c similarity index 100% rename from crypto/openssh-5/sshtty.c rename to crypto/openssh/sshtty.c diff --git a/crypto/openssh-5/ttymodes.c b/crypto/openssh/ttymodes.c similarity index 100% rename from crypto/openssh-5/ttymodes.c rename to crypto/openssh/ttymodes.c diff --git a/crypto/openssh-5/ttymodes.h b/crypto/openssh/ttymodes.h similarity index 100% rename from crypto/openssh-5/ttymodes.h rename to crypto/openssh/ttymodes.h diff --git a/crypto/openssh-5/uidswap.c b/crypto/openssh/uidswap.c similarity index 100% rename from crypto/openssh-5/uidswap.c rename to crypto/openssh/uidswap.c diff --git a/crypto/openssh-5/uidswap.h b/crypto/openssh/uidswap.h similarity index 100% rename from crypto/openssh-5/uidswap.h rename to crypto/openssh/uidswap.h diff --git a/crypto/openssh-5/umac.c b/crypto/openssh/umac.c similarity index 100% rename from crypto/openssh-5/umac.c rename to crypto/openssh/umac.c diff --git a/crypto/openssh-5/umac.h b/crypto/openssh/umac.h similarity index 100% rename from crypto/openssh-5/umac.h rename to crypto/openssh/umac.h diff --git a/crypto/openssh-5/uuencode.c b/crypto/openssh/uuencode.c similarity index 100% rename from crypto/openssh-5/uuencode.c rename to crypto/openssh/uuencode.c diff --git a/crypto/openssh-5/uuencode.h b/crypto/openssh/uuencode.h similarity index 100% rename from crypto/openssh-5/uuencode.h rename to crypto/openssh/uuencode.h diff --git a/crypto/openssh-5/xmalloc.c b/crypto/openssh/xmalloc.c similarity index 100% rename from crypto/openssh-5/xmalloc.c rename to crypto/openssh/xmalloc.c diff --git a/crypto/openssh-5/xmalloc.h b/crypto/openssh/xmalloc.h similarity index 100% rename from crypto/openssh-5/xmalloc.h rename to crypto/openssh/xmalloc.h -- 2.41.0