head	1.2;
access;
symbols
	RELENG_4_11_0_RELEASE:1.1.1.1.2.5
	RELENG_4_11:1.1.1.1.2.5.0.10
	RELENG_4_11_BP:1.1.1.1.2.5
	RELENG_4_10_0_RELEASE:1.1.1.1.2.5
	RELENG_4_10:1.1.1.1.2.5.0.8
	RELENG_4_10_BP:1.1.1.1.2.5
	RELENG_4_9_0_RELEASE:1.1.1.1.2.5
	RELENG_4_9:1.1.1.1.2.5.0.6
	RELENG_4_9_BP:1.1.1.1.2.5
	RELENG_4_8_0_RELEASE:1.1.1.1.2.5
	RELENG_4_8:1.1.1.1.2.5.0.4
	RELENG_4_8_BP:1.1.1.1.2.5
	RELENG_4_7_0_RELEASE:1.1.1.1.2.5
	RELENG_4_7:1.1.1.1.2.5.0.2
	RELENG_4_7_BP:1.1.1.1.2.5
	RELENG_4_6_2_RELEASE:1.1.1.1.2.4.4.1
	RELENG_4_6_1_RELEASE:1.1.1.1.2.4.4.1
	OpenSSH_3_3:1.1.1.9
	RELENG_4_6_0_RELEASE:1.1.1.1.2.4
	RELENG_4_6:1.1.1.1.2.4.0.4
	RELENG_4_6_BP:1.1.1.1.2.4
	OpenSSH_3_1:1.1.1.8
	RELENG_4_5_0_RELEASE:1.1.1.1.2.4
	RELENG_4_5:1.1.1.1.2.4.0.2
	RELENG_4_5_BP:1.1.1.1.2.4
	RELENG_4_4_0_RELEASE:1.1.1.1.2.3
	RELENG_4_4:1.1.1.1.2.3.0.4
	RELENG_4_4_BP:1.1.1.1.2.3
	OpenSSH_2_9:1.1.1.7
	RELENG_4_3_0_RELEASE:1.1.1.1.2.3
	RELENG_4_3:1.1.1.1.2.3.0.2
	RELENG_4_3_BP:1.1.1.1.2.3
	OpenSSH_2_3_0:1.1.1.6
	OpenBSD:1.1.1
	RELENG_4_2_0_RELEASE:1.1.1.1.2.2
	RELENG_4_1_1_RELEASE:1.1.1.1.2.1
	v_2_2_0_2000_09_09:1.1.1.5
	PRE_SMPNG:1.1.1.4
	RELENG_4_1_0_RELEASE:1.1.1.1.2.1
	v_2_1_0_2000_05_30:1.1.1.4
	v_2_1:1.1.1.3
	v_1_2_3_2000_03_25:1.1.1.2
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.2
	RELENG_4_BP:1.1.1.1
	v_1_2_2000_02_24:1.1.1.1
	OPENBSD:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2002.06.27.22.42.10;	author des;	state dead;
branches;
next	1.1;

1.1
date	2000.02.24.14.29.46;	author markm;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.02.24.14.29.46;	author markm;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2000.03.26.07.07.23;	author kris;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2000.05.15.04.37.24;	author kris;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2000.06.03.09.52.37;	author kris;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2000.09.10.08.31.17;	author kris;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2000.12.05.02.20.18;	author green;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2001.05.04.03.57.04;	author green;	state Exp;
branches;
next	1.1.1.8;

1.1.1.8
date	2002.03.18.09.55.03;	author des;	state Exp;
branches;
next	1.1.1.9;

1.1.1.9
date	2002.06.23.14.01.54;	author des;	state Exp;
branches;
next	;

1.1.1.1.2.1
date	2000.06.09.07.10.30;	author kris;	state Exp;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2000.10.28.23.01.01;	author kris;	state Exp;
branches;
next	1.1.1.1.2.3;

1.1.1.1.2.3
date	2001.01.12.04.26.21;	author green;	state Exp;
branches;
next	1.1.1.1.2.4;

1.1.1.1.2.4
date	2001.09.28.01.33.49;	author green;	state Exp;
branches
	1.1.1.1.2.4.4.1;
next	1.1.1.1.2.5;

1.1.1.1.2.5
date	2002.07.03.22.12.01;	author des;	state dead;
branches;
next	;

1.1.1.1.2.4.4.1
date	2002.07.16.12.33.18;	author des;	state dead;
branches;
next	;


desc
@@


1.2
log
@Forcibly revert to mainline.
@
text
@.PATH:		${.CURDIR}/..

LIB=	ssh
SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
	cipher.c compat.c compress.c crc32.c deattack.c fingerprint.c \
	hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c

NOPROFILE= yes
NOPIC=	yes

install:
	@@echo -n

.include <bsd.own.mk>

.if (${KERBEROS} == "yes")
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
.if (${AFS} == "yes")
CFLAGS+= -DAFS
SRCS+=  radix.c
.endif # AFS
.endif # KERBEROS

.include <bsd.lib.mk>
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Vendor import of OpenSSH.
@
text
@@


1.1.1.1.2.1
log
@MFC: OpenSSH 2.1.0 snapshot
@
text
@d7 1
a7 2
	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c aux.c
d18 1
a18 1
CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
@


1.1.1.1.2.2
log
@MFC: OpenSSH 2.2.0
@
text
@d5 1
a5 1
	cipher.c compat.c compress.c crc32.c deattack.c \
d8 1
a8 1
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c
d18 1
a18 1
.if (${KERBEROS:L} == "yes")
d20 1
a20 1
.if (${AFS:L} == "yes")
@


1.1.1.1.2.3
log
@MFC: OpenSSH 2.3.0

Reviewed by:	freefall
@
text
@d8 1
a8 2
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c \
	cli.c rijndael.c
@


1.1.1.1.2.4
log
@MFC: OpenSSH 2.9

The only difference between this and what's in -CURRENT is that the
default /etc/ssh/ssh_config sets "Protocol 1,2" for all hosts.  This can
be overrided entirely in user ~/.ssh/config files, as always.
@
text
@a0 2
#	$OpenBSD: Makefile,v 1.22 2001/04/03 19:53:30 markus Exp $

d8 2
a9 2
	key.c dispatch.c kex.c mac.c uuencode.c misc.c \
	cli.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c
@


1.1.1.1.2.4.4.1
log
@Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.
@
text
@@


1.1.1.1.2.5
log
@Synch up to OpenSSH 3.4p1 - very nearly the same sources as in -CURRENT,
with a slightly different config.h to account for differences between
-CURRENT and -STABLE.

Privilege separation defaults to off for now as it breaks some aspects
of Kerberos authentication.

Sponsored by:	DARPA, NAI Labs
@
text
@@


1.1.1.2
log
@Virgin import of OpenSSH sources dated 2000/03/25
@
text
@d7 1
a7 2
	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \
	key.c
d18 1
a18 1
CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
@


1.1.1.3
log
@Initial import of OpenSSH v2.1.
@
text
@d8 1
a8 1
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c
@


1.1.1.4
log
@Initial import of OpenSSH snapshot from 2000/05/30

Obtained from:	OpenBSD
@
text
@d8 1
a8 1
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c aux.c
@


1.1.1.5
log
@Initial import of OpenSSH post-2.2.0 snapshot dated 2000-09-09
@
text
@d5 1
a5 1
	cipher.c compat.c compress.c crc32.c deattack.c \
d8 1
a8 1
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c
d18 1
a18 1
.if (${KERBEROS:L} == "yes")
d20 1
a20 1
.if (${AFS:L} == "yes")
@


1.1.1.6
log
@Import of OpenSSH 2.3.0 (virgin OpenBSD source release).
@
text
@d8 1
a8 2
	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c \
	cli.c rijndael.c
@


1.1.1.7
log
@Say "hi" to the latest in the OpenSSH series, version 2.9!

Happy birthday to:	rwatson
@
text
@a0 2
#	$OpenBSD: Makefile,v 1.22 2001/04/03 19:53:30 markus Exp $

d8 2
a9 2
	key.c dispatch.c kex.c mac.c uuencode.c misc.c \
	cli.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c
@


1.1.1.8
log
@Vendor import of OpenSSH 3.1
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.31 2002/02/22 12:20:34 markus Exp $
d7 1
a7 1
	cipher.c compat.c compress.c crc32.c deattack.c fatal.c \
d11 1
a11 2
	rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
	scard.c
a12 1
DEBUGLIBS= no
a27 4

.if (${KERBEROS5:L} == "yes")
CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
.endif # KERBEROS5
@


1.1.1.9
log
@Vendor import of OpenSSH 3.3.
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.36 2002/06/11 15:23:29 hin Exp $
d6 1
a6 1
SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
d9 1
a9 1
	rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
d12 1
a12 1
	scard.c monitor_wrap.c monitor_fdpass.c msg.c
a22 4
.if (${KERBEROS5:L} == "yes")
CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
.endif # KERBEROS5

d30 4
@


