Say hello to OpenSSH! It's more secure, has a better license, and

is actively maintained by members of the OpenBSD project.

23 files changed, 354 insertions, 0 deletions

diff --git a/security/openssh/files/patch-aa b/security/openssh/files/patch-aa
new file mode 100644
index 000000000000..ff267ded9258
--- /dev/null
+++ b/security/openssh/files/patch-aa
@@ -0,0 +1,10 @@
+--- Makefile.orig	Tue Oct 26 03:31:00 1999
++++ Makefile	Mon Nov  8 00:28:19 1999
+@@ -1,6 +1,7 @@
+ #	$OpenBSD: Makefile,v 1.5 1999/10/25 20:27:26 markus Exp $
+ 
+ .include <bsd.own.mk>
++.include "Makefile.inc"
+ 
+ SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp
+ 
diff --git a/security/openssh/files/patch-ab b/security/openssh/files/patch-ab
new file mode 100644
index 000000000000..b84a51e75e49
--- /dev/null
+++ b/security/openssh/files/patch-ab
@@ -0,0 +1,19 @@
+diff -ru /home/green/ssh/Makefile.inc ./Makefile.inc
+--- /home/green/ssh/Makefile.inc	Tue Oct 26 03:31:00 1999
++++ ./Makefile.inc	Mon Nov  8 00:12:19 1999
+@@ -1,11 +1,8 @@
+ CFLAGS+=	-I${.CURDIR}/..
+ 
+-.include <bsd.obj.mk>
+-
+-.if exists(${.CURDIR}/../lib/${__objdir})
+-LDADD+=         -L${.CURDIR}/../lib/${__objdir} -lssh
+-DPADD+=         ${.CURDIR}/../lib/${__objdir}/libssh.a
+-.else
++AFS?=		NO
++KERBEROS?=	NO
++SKEY?=		NO
++TCP_WRAPPERS?=	YES
+ LDADD+=         -L${.CURDIR}/../lib -lssh
+ DPADD+=         ${.CURDIR}/../lib/libssh.a
+-.endif
diff --git a/security/openssh/files/patch-ac b/security/openssh/files/patch-ac
new file mode 100644
index 000000000000..e0c919165f9a
--- /dev/null
+++ b/security/openssh/files/patch-ac
@@ -0,0 +1,14 @@
+diff -ru /home/green/ssh/auth-rsa.c ./auth-rsa.c
+--- /home/green/ssh/auth-rsa.c	Wed Nov  3 03:36:00 1999
++++ ./auth-rsa.c	Mon Nov  8 00:06:40 1999
+@@ -25,8 +25,8 @@
+ #include "mpaux.h"
+ #include "uidswap.h"
+ 
+-#include <ssl/rsa.h>
+-#include <ssl/md5.h>
++#include <openssl/rsa.h>
++#include <openssl/md5.h>
+ 
+ /* Flags that may be set in authorized_keys options. */
+ extern int no_port_forwarding_flag;
diff --git a/security/openssh/files/patch-ad b/security/openssh/files/patch-ad
new file mode 100644
index 000000000000..bb39edf77f42
--- /dev/null
+++ b/security/openssh/files/patch-ad
@@ -0,0 +1,12 @@
+diff -ru /home/green/ssh/authfd.c ./authfd.c
+--- /home/green/ssh/authfd.c	Fri Oct 15 03:34:00 1999
++++ ./authfd.c	Mon Nov  8 00:06:40 1999
+@@ -24,7 +24,7 @@
+ #include "xmalloc.h"
+ #include "getput.h"
+ 
+-#include <ssl/rsa.h>
++#include <openssl/rsa.h>
+ 
+ /* Returns the number of the authentication fd, or -1 if there is none. */
+ 
diff --git a/security/openssh/files/patch-ae b/security/openssh/files/patch-ae
new file mode 100644
index 000000000000..4d6ddf3967b8
--- /dev/null
+++ b/security/openssh/files/patch-ae
@@ -0,0 +1,12 @@
+diff -ru /home/green/ssh/authfile.c ./authfile.c
+--- /home/green/ssh/authfile.c	Tue Oct 12 03:47:00 1999
++++ ./authfile.c	Mon Nov  8 00:06:40 1999
+@@ -17,7 +17,7 @@
+ #include "includes.h"
+ RCSID("$Id: authfile.c,v 1.7 1999/10/11 20:00:35 markus Exp $");
+ 
+-#include <ssl/bn.h>
++#include <openssl/bn.h>
+ #include "xmalloc.h"
+ #include "buffer.h"
+ #include "bufaux.h"
diff --git a/security/openssh/files/patch-af b/security/openssh/files/patch-af
new file mode 100644
index 000000000000..15308eb40dba
--- /dev/null
+++ b/security/openssh/files/patch-af
@@ -0,0 +1,12 @@
+diff -ru /home/green/ssh/bufaux.c ./bufaux.c
+--- /home/green/ssh/bufaux.c	Wed Nov  3 03:36:00 1999
++++ ./bufaux.c	Mon Nov  8 00:06:40 1999
+@@ -18,7 +18,7 @@
+ RCSID("$Id: bufaux.c,v 1.3 1999/11/02 19:42:35 markus Exp $");
+ 
+ #include "ssh.h"
+-#include <ssl/bn.h>
++#include <openssl/bn.h>
+ #include "bufaux.h"
+ #include "xmalloc.h"
+ #include "getput.h"
diff --git a/security/openssh/files/patch-ag b/security/openssh/files/patch-ag
new file mode 100644
index 000000000000..8effd22ebf74
--- /dev/null
+++ b/security/openssh/files/patch-ag
@@ -0,0 +1,12 @@
+diff -ru /home/green/ssh/cipher.c ./cipher.c
+--- /home/green/ssh/cipher.c	Wed Nov  3 03:36:00 1999
++++ ./cipher.c	Mon Nov  8 00:06:40 1999
+@@ -17,7 +17,7 @@
+ #include "ssh.h"
+ #include "cipher.h"
+ 
+-#include <ssl/md5.h>
++#include <openssl/md5.h>
+ 
+ /*
+  * What kind of tripple DES are these 2 routines?
diff --git a/security/openssh/files/patch-ah b/security/openssh/files/patch-ah
new file mode 100644
index 000000000000..369de0681301
--- /dev/null
+++ b/security/openssh/files/patch-ah
@@ -0,0 +1,14 @@
+diff -ru /home/green/ssh/cipher.h ./cipher.h
+--- /home/green/ssh/cipher.h	Sun Oct  3 03:39:00 1999
++++ ./cipher.h	Mon Nov  8 00:06:40 1999
+@@ -16,8 +16,8 @@
+ #ifndef CIPHER_H
+ #define CIPHER_H
+ 
+-#include <des.h>
+-#include <ssl/blowfish.h>
++#include <openssl/blowfish.h>
++#include <openssl/des.h>
+ 
+ /* Cipher types.  New types can be added, but old types should not be removed
+    for compatibility.  The maximum allowed value is 31. */
diff --git a/security/openssh/files/patch-ai b/security/openssh/files/patch-ai
new file mode 100644
index 000000000000..fd676782c3d2
--- /dev/null
+++ b/security/openssh/files/patch-ai
@@ -0,0 +1,21 @@
+diff -ru /home/green/ssh/includes.h ./includes.h
+--- /home/green/ssh/includes.h	Wed Nov  3 03:36:00 1999
++++ ./includes.h	Mon Nov  8 00:06:40 1999
+@@ -24,7 +24,6 @@
+ #include <sys/select.h>
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
+-#include <sys/endian.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <sys/time.h>
+@@ -38,7 +37,8 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ 
+-#include <netgroup.h>
++#include <machine/endian.h>
++
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <errno.h>
diff --git a/security/openssh/files/patch-aj b/security/openssh/files/patch-aj
new file mode 100644
index 000000000000..ea2490196e1a
--- /dev/null
+++ b/security/openssh/files/patch-aj
@@ -0,0 +1,11 @@
+diff -ru /home/green/ssh/lib/Makefile ./lib/Makefile
+--- /home/green/ssh/lib/Makefile	Wed Oct 27 03:33:00 1999
++++ ./lib/Makefile	Mon Nov  8 00:06:40 1999
+@@ -13,6 +13,7 @@
+ 	@echo -n
+ 
+ .include <bsd.own.mk>
++.include "../Makefile.inc"
+ 
+ .if (${KERBEROS} == "yes")
+ CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
diff --git a/security/openssh/files/patch-ak b/security/openssh/files/patch-ak
new file mode 100644
index 000000000000..a960ff2029a6
--- /dev/null
+++ b/security/openssh/files/patch-ak
@@ -0,0 +1,11 @@
+diff -ru /home/green/ssh/login.c ./login.c
+--- /home/green/ssh/login.c	Fri Oct  1 03:42:00 1999
++++ ./login.c	Mon Nov  8 00:06:40 1999
+@@ -20,7 +20,6 @@
+ #include "includes.h"
+ RCSID("$Id: login.c,v 1.7 1999/09/30 16:55:06 deraadt Exp $");
+ 
+-#include <util.h>
+ #include <utmp.h>
+ #include "ssh.h"
+ 
diff --git a/security/openssh/files/patch-al b/security/openssh/files/patch-al
new file mode 100644
index 000000000000..dfed584cb6a8
--- /dev/null
+++ b/security/openssh/files/patch-al
@@ -0,0 +1,17 @@
+diff -ru /home/green/ssh/mpaux.c ./mpaux.c
+--- /home/green/ssh/mpaux.c	Thu Oct 28 03:32:00 1999
++++ ./mpaux.c	Mon Nov  8 00:06:40 1999
+@@ -17,11 +17,11 @@
+ #include "includes.h"
+ RCSID("$Id: mpaux.c,v 1.4 1999/10/27 16:37:45 deraadt Exp $");
+ 
+-#include <ssl/bn.h>
++#include <openssl/bn.h>
+ #include "getput.h"
+ #include "xmalloc.h"
+ 
+-#include <ssl/md5.h>
++#include <openssl/md5.h>
+ 
+ void
+ compute_session_id(unsigned char session_id[16],
diff --git a/security/openssh/files/patch-am b/security/openssh/files/patch-am
new file mode 100644
index 000000000000..d76eb91aebb9
--- /dev/null
+++ b/security/openssh/files/patch-am
@@ -0,0 +1,12 @@
+diff -ru /home/green/ssh/packet.h ./packet.h
+--- /home/green/ssh/packet.h	Tue Sep 28 03:45:00 1999
++++ ./packet.h	Mon Nov  8 00:06:40 1999
+@@ -18,7 +18,7 @@
+ #ifndef PACKET_H
+ #define PACKET_H
+ 
+-#include <ssl/bn.h>
++#include <openssl/bn.h>
+ 
+ /* Sets the socket used for communication.  Disables encryption until
+    packet_set_encryption_key is called.  It is permissible that fd_in
diff --git a/security/openssh/files/patch-an b/security/openssh/files/patch-an
new file mode 100644
index 000000000000..bf989a6f1773
--- /dev/null
+++ b/security/openssh/files/patch-an
@@ -0,0 +1,14 @@
+diff -ru /home/green/ssh/rsa.h ./rsa.h
+--- /home/green/ssh/rsa.h	Wed Sep 29 03:42:00 1999
++++ ./rsa.h	Mon Nov  8 00:06:40 1999
+@@ -18,8 +18,8 @@
+ #ifndef RSA_H
+ #define RSA_H
+ 
+-#include <ssl/bn.h>
+-#include <ssl/rsa.h>
++#include <openssl/bn.h>
++#include <openssl/rsa.h>
+ 
+ /* Calls SSL RSA_generate_key, only copies to prv and pub */
+ void rsa_generate_key(RSA *prv, RSA *pub, unsigned int bits);
diff --git a/security/openssh/files/patch-ao b/security/openssh/files/patch-ao
new file mode 100644
index 000000000000..21f9247a72e7
--- /dev/null
+++ b/security/openssh/files/patch-ao
@@ -0,0 +1,14 @@
+diff -ru /home/green/ssh/scp/Makefile ./scp/Makefile
+--- /home/green/ssh/scp/Makefile	Tue Oct 26 03:31:00 1999
++++ ./scp/Makefile	Mon Nov  8 00:13:21 1999
+@@ -10,8 +10,8 @@
+ BINMODE?=555
+ .endif
+ 
+-BINDIR=	/usr/bin
+-MAN=	scp.1
++BINDIR=	/bin
++MAN1=	scp.1
+ 
+ SRCS=	scp.c
+ 
diff --git a/security/openssh/files/patch-ap b/security/openssh/files/patch-ap
new file mode 100644
index 000000000000..69044b65701d
--- /dev/null
+++ b/security/openssh/files/patch-ap
@@ -0,0 +1,28 @@
+diff -ru /home/green/ssh/ssh/Makefile ./ssh/Makefile
+--- /home/green/ssh/ssh/Makefile	Tue Oct 26 03:31:00 1999
++++ ./ssh/Makefile	Mon Nov  8 00:13:55 1999
+@@ -10,14 +10,15 @@
+ BINMODE?=4555
+ .endif
+ 
+-BINDIR=	/usr/bin
+-MAN=	ssh.1
++BINDIR=	/bin
++MAN1=	ssh.1
+ LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
+ MLINKS=	ssh.1 slogin.1
+ 
+ SRCS=	ssh.c sshconnect.c log-client.c readconf.c clientloop.c
+ 
+ .include <bsd.own.mk> # for AFS
++.include "../Makefile.inc"
+ 
+ .if (${KERBEROS} == "yes")
+ CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
+@@ -32,5 +33,5 @@
+ 
+ .include <bsd.prog.mk>
+ 
+-LDADD+=	-lutil -lz -lcrypto
++LDADD+=	-lutil -lz ${CRYPTOLIBS}
+ DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
diff --git a/security/openssh/files/patch-ar b/security/openssh/files/patch-ar
new file mode 100644
index 000000000000..c5607283870c
--- /dev/null
+++ b/security/openssh/files/patch-ar
@@ -0,0 +1,19 @@
+diff -ru /home/green/ssh/ssh-agent/Makefile ./ssh-agent/Makefile
+--- /home/green/ssh/ssh-agent/Makefile	Thu Oct 28 03:32:00 1999
++++ ./ssh-agent/Makefile	Mon Nov  8 00:13:41 1999
+@@ -10,12 +10,12 @@
+ BINMODE?=555
+ .endif
+ 
+-BINDIR=	/usr/bin
+-MAN=	ssh-agent.1
++BINDIR=	/bin
++MAN1=	ssh-agent.1
+ 
+ SRCS=	ssh-agent.c log-client.c
+ 
+ .include <bsd.prog.mk>
+ 
+-LDADD+=	-lcrypto -lutil -lz
++LDADD+=	-lutil -lz ${CRYPTOLIBS}
+ DPADD+=	${LIBCRYPTO} ${LIBDES} ${LIBUTIL} ${LIBZ}
diff --git a/security/openssh/files/patch-as b/security/openssh/files/patch-as
new file mode 100644
index 000000000000..0d7722403806
--- /dev/null
+++ b/security/openssh/files/patch-as
@@ -0,0 +1,12 @@
+diff -ru /home/green/ssh/ssh-agent.c ./ssh-agent.c
+--- /home/green/ssh/ssh-agent.c	Wed Nov  3 03:36:00 1999
++++ ./ssh-agent.c	Mon Nov  8 00:06:40 1999
+@@ -28,7 +28,7 @@
+ #include "getput.h"
+ #include "mpaux.h"
+ 
+-#include <ssl/md5.h>
++#include <openssl/md5.h>
+ 
+ typedef struct
+ {
diff --git a/security/openssh/files/patch-at b/security/openssh/files/patch-at
new file mode 100644
index 000000000000..cfb1fe69fbc9
--- /dev/null
+++ b/security/openssh/files/patch-at
@@ -0,0 +1,19 @@
+diff -ru /home/green/ssh/ssh-keygen/Makefile ./ssh-keygen/Makefile
+--- /home/green/ssh/ssh-keygen/Makefile	Thu Oct 28 03:32:00 1999
++++ ./ssh-keygen/Makefile	Mon Nov  8 00:13:47 1999
+@@ -10,12 +10,12 @@
+ BINMODE?=555
+ .endif
+ 
+-BINDIR=	/usr/bin
+-MAN=	ssh-keygen.1
++BINDIR=	/bin
++MAN1=	ssh-keygen.1
+ 
+ SRCS=	ssh-keygen.c log-client.c
+ 
+ .include <bsd.prog.mk>
+ 
+-LDADD+=	-lcrypto -lutil -lz
++LDADD+=	-lutil -lz ${CRYPTOLIBS}
+ DPADD+=	${LIBCRYPTO} ${LIBDES} ${LIBUTIL} ${LIBZ}
diff --git a/security/openssh/files/patch-au b/security/openssh/files/patch-au
new file mode 100644
index 000000000000..45b30014d990
--- /dev/null
+++ b/security/openssh/files/patch-au
@@ -0,0 +1,13 @@
+diff -ru /home/green/ssh/ssh.c ./ssh.c
+--- /home/green/ssh/ssh.c	Sat Oct 30 03:43:00 1999
++++ ./ssh.c	Mon Nov  8 00:06:40 1999
+@@ -128,6 +128,9 @@
+   log("Using rsh.  WARNING: Connection will not be encrypted.");
+   /* Build argument list for rsh. */
+   i = 0;
++#ifndef	_PATH_RSH
++#define	_PATH_RSH	"/usr/bin/rsh"
++#endif
+   args[i++] = _PATH_RSH;
+   args[i++] = host;    /* may have to come after user on some systems */
+   if (user)
diff --git a/security/openssh/files/patch-av b/security/openssh/files/patch-av
new file mode 100644
index 000000000000..d91a35d12005
--- /dev/null
+++ b/security/openssh/files/patch-av
@@ -0,0 +1,21 @@
+diff -ru /home/green/ssh/sshconnect.c ./sshconnect.c
+--- /home/green/ssh/sshconnect.c	Wed Nov  3 03:36:00 1999
++++ ./sshconnect.c	Mon Nov  8 00:06:40 1999
+@@ -17,7 +17,7 @@
+ #include "includes.h"
+ RCSID("$Id: sshconnect.c,v 1.25 1999/11/02 19:42:36 markus Exp $");
+ 
+-#include <ssl/bn.h>
++#include <openssl/bn.h>
+ #include "xmalloc.h"
+ #include "rsa.h"
+ #include "ssh.h"
+@@ -28,7 +28,7 @@
+ #include "uidswap.h"
+ #include "compat.h"
+ 
+-#include <ssl/md5.h>
++#include <openssl/md5.h>
+ 
+ /* Session id for the current session. */
+ unsigned char session_id[16];
diff --git a/security/openssh/files/patch-aw b/security/openssh/files/patch-aw
new file mode 100644
index 000000000000..946b865ec625
--- /dev/null
+++ b/security/openssh/files/patch-aw
@@ -0,0 +1,29 @@
+diff -ru /home/green/ssh/sshd/Makefile ./sshd/Makefile
+--- /home/green/ssh/sshd/Makefile	Tue Oct 26 03:31:00 1999
++++ ./sshd/Makefile	Mon Nov  8 00:14:02 1999
+@@ -3,13 +3,14 @@
+ PROG=	sshd
+ BINOWN=	root
+ BINMODE=555
+-BINDIR=	/usr/sbin
+-MAN=	sshd.8
++BINDIR=	/sbin
++MAN8=	sshd.8
+ 
+ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
+ 	pty.c log-server.c login.c servconf.c serverloop.c
+ 
+ .include <bsd.own.mk> # for KERBEROS and AFS
++.include "../Makefile.inc"
+ 
+ .if (${KERBEROS} == "yes")
+ CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
+@@ -29,7 +30,7 @@
+ 
+ .include <bsd.prog.mk>
+ 
+-LDADD+=	-lcrypto -lutil -lz
++LDADD+=	-lutil -lz -lcrypt ${CRYPTOLIBS}
+ DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
+ 
+ .if (${TCP_WRAPPERS} == "yes")
diff --git a/security/openssh/files/patch-ay b/security/openssh/files/patch-ay
new file mode 100644
index 000000000000..1daf01e52cea
--- /dev/null
+++ b/security/openssh/files/patch-ay
@@ -0,0 +1,8 @@
+--- OVERVIEW.orig	Mon Nov  8 00:53:18 1999
++++ OVERVIEW	Mon Nov  8 00:53:36 1999
+@@ -1,4 +1,4 @@
+-This document is inteded for those who wish to read the ssh source
++This document is intended for those who wish to read the ssh source
+ code.  This tries to give an overview of the structure of the code.
+       
+ Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>