head	1.9;
access;
symbols
	RELEASE_4_5_0:1.7
	RELEASE_4_4_0:1.6
	RELEASE_4_3_0:1.6
	RELEASE_4_2_0:1.6
	RELEASE_4_1_1:1.6
	RELEASE_4_1_0:1.6
	RELEASE_3_5_0:1.6
	RELEASE_4_0_0:1.6
	openssh_1_2:1.1.1.1
	OPENBSD:1.1.1;
locks; strict;
comment	@# @;


1.9
date	2002.03.12.17.54.07;	author dinoex;	state dead;
branches;
next	1.8;

1.8
date	2002.03.08.17.21.59;	author dinoex;	state Exp;
branches;
next	1.7;

1.7
date	2001.10.03.13.15.16;	author dinoex;	state Exp;
branches;
next	1.6;

1.6
date	2000.03.03.06.10.10;	author green;	state Exp;
branches;
next	1.5;

1.5
date	2000.02.15.13.09.45;	author sumikawa;	state Exp;
branches;
next	1.4;

1.4
date	2000.01.13.23.22.17;	author green;	state Exp;
branches;
next	1.3;

1.3
date	99.11.24.03.36.22;	author green;	state dead;
branches;
next	1.2;

1.2
date	99.11.09.12.43.45;	author green;	state Exp;
branches;
next	1.1;

1.1
date	99.11.08.06.20.53;	author green;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.11.08.06.20.53;	author green;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Rename Patches to make navigation much more easier.
@
text
@--- sshconnect.c.orig	Mon Jan 21 16:13:51 2002
+++ sshconnect.c	Fri Mar  8 18:14:50 2002
@@@@ -43,15 +43,21 @@@@
 sockaddr_ntop(struct sockaddr *sa)
 {
 	void *addr;
+#ifdef INET6
 	static char addrbuf[INET6_ADDRSTRLEN];
+#else
+	static char addrbuf[INET_ADDRSTRLEN];
+#endif
 
 	switch (sa->sa_family) {
 	case AF_INET:
 		addr = &((struct sockaddr_in *)sa)->sin_addr;
 		break;
+#ifdef INET6
 	case AF_INET6:
 		addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
 		break;
+#endif
 	default:
 		/* This case should be protected against elsewhere */
 		abort();	/* XXX abort is bad -- do something else */
@@@@ -291,7 +297,11 @@@@
 		/* Loop through addresses for this host, and try each one in
 		   sequence until the connection succeeds. */
 		for (ai = aitop; ai; ai = ai->ai_next) {
+#ifdef INET6
 			if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6)
+#else
+			if (ai->ai_family != AF_INET)
+#endif
 				continue;
 			if (getnameinfo(ai->ai_addr, ai->ai_addrlen,
 			    ntop, sizeof(ntop), strport, sizeof(strport),
@@@@ -537,10 +547,12 @@@@
 		local = (ntohl(((struct sockaddr_in *)hostaddr)->
 		   sin_addr.s_addr) >> 24) == IN_LOOPBACKNET;
 		break;
+#ifdef INET6
 	case AF_INET6:
 		local = IN6_IS_ADDR_LOOPBACK(
 		    &(((struct sockaddr_in6 *)hostaddr)->sin6_addr));
 		break;
+#endif
 	default:
 		local = 0;
 		break;
@


1.8
log
@- Add more INET6 #ifdef's
- Suggested patch modified and extended

PR:		35673
Submitted by:	scheidell@@secnap.net
@
text
@@


1.7
log
@- Update to OpenSSH 2.9.9
- convert portname into lowercase
- PREFIX support for default sshd_config
- security-patch for cookie files obsolete
@
text
@d1 37
a37 3
--- sshconnect.c.orig	Wed Jul 25 16:35:18 2001
+++ sshconnect.c	Wed Oct  3 12:42:20 2001
@@@@ -567,10 +567,12 @@@@
@


1.6
log
@Update this to a CVS_DATE of a few minutes ago.
@
text
@d1 5
a5 5
--- sshconnect.c-	Tue Feb 15 22:00:22 2000
+++ sshconnect.c	Tue Feb 15 22:00:27 2000
@@@@ -1080,9 +1080,11 @@@@
 	case AF_INET:
 		local = (ntohl(((struct sockaddr_in *)hostaddr)->sin_addr.s_addr) >> 24) == IN_LOOPBACKNET;
d9 2
a10 1
 		local = IN6_IS_ADDR_LOOPBACK(&(((struct sockaddr_in6 *)hostaddr)->sin6_addr));
@


1.5
log
@When IPv4-only client connected to a server which have IPv4 and IPv6
addresses, the client couldn't connect to the server via IPv4 because
the client gave up on first rresevport_af().
@
text
@a2 9
@@@@ -150,7 +150,7 @@@@
 		int p = IPPORT_RESERVED - 1;
 		sock = rresvport_af(&p, family);
 		if (sock < 0)
-			fatal("rresvport: af=%d %.100s", family, strerror(errno));
+			error("rresvport: af=%d %.100s", family, strerror(errno));
 		debug("Allocated local port %d.", p);
 	} else {
 		/*
@


1.4
log
@Update to a more current OpenSSH, including...

	IPv6 support!!

Thank you very much, Sumikawa san.

Submitted by:	Munechika SUMIKAWA <sumikawa@@ebina.hitachi.co.jp>
@
text
@d1 12
a12 3
--- sshconnect.c-	Fri Jan 14 08:44:43 2000
+++ sshconnect.c	Fri Jan 14 08:44:56 2000
@@@@ -1078,9 +1078,11 @@@@
@


1.3
log
@Update the CVS_DATE.  This brings in support for TIS authentication,
obsoleting a couple patches (it's the same code, though, except for
additions).

This also brings in KNFization of everything (please hold the cheering
down :) and made me reroll all my patches.

My patches have been almost entirely rewritten.  The places are the
same, but the code's rewritten.  It fits with the style (KNF) now,
and looks better.

I've also added strlcat.c to the build, which, just like strlcpy.c, is
necessary for compatibility with older libcs.  After strlcat() snuck
into the OpenSSH code recently, this would prevent OpenSSH from
building on (e.g.) FreeBSD 3.2.  Adding it to ssh/lib/ makes it work
yet again :)
@
text
@d1 14
a14 27
--- ssh-keygen/Makefile.orig	Thu Oct 28 03:32:00 1999
+++ ssh-keygen/Makefile	Tue Nov  9 06:42:34 1999
@@@@ -2,20 +2,14 @@@@
 
 PROG=	ssh-keygen
 BINOWN=	root
+BINMODE=555
 
-.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "powerpc" || \
-	${MACHINE_ARCH} == "hppa")
-BINMODE=0000
-.else
-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}
@


1.2
log
@Make some various cleanups.  Note that I did not add RESTRICTED since this is
in no way cryptographically encumbered code.  The fact that it's
redistributed by me from freefall is completely coincidental.

Submitted by:	obrien, Christian Weisgerber <naddy@@unix-ag.uni-kl.de>
@
text
@@


1.1
log
@Initial revision
@
text
@d1 3
a3 6
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
d5 11
@


1.1.1.1
log
@Say hello to OpenSSH!  It's more secure, has a better license, and
is actively maintained by members of the OpenBSD project.
@
text
@@
