head	1.45;
access;
symbols
	RELENG_8_4:1.45.0.2
	RELENG_9_1_0_RELEASE:1.43.2.2.2.2
	RELENG_9_1:1.43.2.2.0.2
	RELENG_9_1_BP:1.43.2.2
	RELENG_8_3_0_RELEASE:1.40.2.2.2.1
	RELENG_8_3:1.40.2.2.0.2
	RELENG_8_3_BP:1.40.2.2
	RELENG_9_0_0_RELEASE:1.43.2.1.2.1
	RELENG_9_0:1.43.2.1.0.2
	RELENG_9_0_BP:1.43.2.1
	RELENG_9:1.43.0.2
	RELENG_9_BP:1.43
	RELENG_7_4_0_RELEASE:1.39.12.1
	RELENG_8_2_0_RELEASE:1.40.2.1.6.1
	RELENG_7_4:1.39.0.12
	RELENG_7_4_BP:1.39
	RELENG_8_2:1.40.2.1.0.6
	RELENG_8_2_BP:1.40.2.1
	RELENG_8_1_0_RELEASE:1.40.2.1.4.1
	RELENG_8_1:1.40.2.1.0.4
	RELENG_8_1_BP:1.40.2.1
	RELENG_7_3_0_RELEASE:1.39.10.1
	RELENG_7_3:1.39.0.10
	RELENG_7_3_BP:1.39
	RELENG_8_0_0_RELEASE:1.40.2.1.2.1
	RELENG_8_0:1.40.2.1.0.2
	RELENG_8_0_BP:1.40.2.1
	RELENG_8:1.40.0.2
	RELENG_8_BP:1.40
	RELENG_7_2_0_RELEASE:1.39.8.1
	RELENG_7_2:1.39.0.8
	RELENG_7_2_BP:1.39
	RELENG_7_1_0_RELEASE:1.39.6.1
	RELENG_6_4_0_RELEASE:1.35.2.1.10.1
	RELENG_7_1:1.39.0.6
	RELENG_7_1_BP:1.39
	RELENG_6_4:1.35.2.1.0.10
	RELENG_6_4_BP:1.35.2.1
	RELENG_7_0_0_RELEASE:1.39
	RELENG_6_3_0_RELEASE:1.35.2.1
	RELENG_7_0:1.39.0.4
	RELENG_7_0_BP:1.39
	RELENG_6_3:1.35.2.1.0.8
	RELENG_6_3_BP:1.35.2.1
	RELENG_7:1.39.0.2
	RELENG_7_BP:1.39
	RELENG_6_2_0_RELEASE:1.35.2.1
	RELENG_6_2:1.35.2.1.0.6
	RELENG_6_2_BP:1.35.2.1
	RELENG_5_5_0_RELEASE:1.33.4.1
	RELENG_5_5:1.33.4.1.0.4
	RELENG_5_5_BP:1.33.4.1
	RELENG_6_1_0_RELEASE:1.35.2.1
	RELENG_6_1:1.35.2.1.0.4
	RELENG_6_1_BP:1.35.2.1
	RELENG_6_0_0_RELEASE:1.35.2.1
	RELENG_6_0:1.35.2.1.0.2
	RELENG_6_0_BP:1.35.2.1
	RELENG_6:1.35.0.2
	RELENG_6_BP:1.35
	RELENG_5_4_0_RELEASE:1.33.4.1
	RELENG_5_4:1.33.4.1.0.2
	RELENG_5_4_BP:1.33.4.1
	RELENG_4_11_0_RELEASE:1.24.2.5
	RELENG_4_11:1.24.2.5.0.2
	RELENG_4_11_BP:1.24.2.5
	RELENG_5_3_0_RELEASE:1.33
	RELENG_5_3:1.33.0.6
	RELENG_5_3_BP:1.33
	RELENG_5:1.33.0.4
	RELENG_5_BP:1.33
	RELENG_4_10_0_RELEASE:1.24.2.4
	RELENG_4_10:1.24.2.4.0.14
	RELENG_4_10_BP:1.24.2.4
	RELENG_5_2_1_RELEASE:1.33
	RELENG_5_2_0_RELEASE:1.33
	RELENG_5_2:1.33.0.2
	RELENG_5_2_BP:1.33
	RELENG_4_9_0_RELEASE:1.24.2.4
	RELENG_4_9:1.24.2.4.0.12
	RELENG_4_9_BP:1.24.2.4
	RELENG_5_1_0_RELEASE:1.31
	RELENG_5_1:1.31.0.2
	RELENG_5_1_BP:1.31
	RELENG_4_8_0_RELEASE:1.24.2.4
	RELENG_4_8:1.24.2.4.0.10
	RELENG_4_8_BP:1.24.2.4
	RELENG_5_0_0_RELEASE:1.30
	RELENG_5_0:1.30.0.2
	RELENG_5_0_BP:1.30
	RELENG_4_7_0_RELEASE:1.24.2.4
	RELENG_4_7:1.24.2.4.0.8
	RELENG_4_7_BP:1.24.2.4
	RELENG_4_6_2_RELEASE:1.24.2.4
	RELENG_4_6_1_RELEASE:1.24.2.4
	RELENG_4_6_0_RELEASE:1.24.2.4
	RELENG_4_6:1.24.2.4.0.6
	RELENG_4_6_BP:1.24.2.4
	RELENG_4_5_0_RELEASE:1.24.2.4
	RELENG_4_5:1.24.2.4.0.4
	RELENG_4_5_BP:1.24.2.4
	RELENG_4_4_0_RELEASE:1.24.2.4
	RELENG_4_4:1.24.2.4.0.2
	RELENG_4_4_BP:1.24.2.4
	RELENG_4_3_0_RELEASE:1.24.2.1
	RELENG_4_3:1.24.2.1.0.2
	RELENG_4_3_BP:1.24.2.1
	RELENG_4_2_0_RELEASE:1.24.2.1
	RELENG_4_1_1_RELEASE:1.24.2.1
	PRE_SMPNG:1.26
	RELENG_4_1_0_RELEASE:1.24
	RELENG_3_5_0_RELEASE:1.14.2.1
	RELENG_4_0_0_RELEASE:1.24
	RELENG_4:1.24.0.2
	RELENG_4_BP:1.24
	RELENG_3_4_0_RELEASE:1.14.2.1
	RELENG_3_3_0_RELEASE:1.14.2.1
	RELENG_3_2_PAO:1.14.0.4
	RELENG_3_2_PAO_BP:1.14
	RELENG_3_2_0_RELEASE:1.14
	RELENG_3_1_0_RELEASE:1.14
	RELENG_3:1.14.0.2
	RELENG_3_BP:1.14
	RELENG_2_2_8_RELEASE:1.7
	RELENG_3_0_0_RELEASE:1.14
	RELENG_2_2_7_RELEASE:1.7
	RELENG_2_2_6_RELEASE:1.7
	RELENG_2_2_5_RELEASE:1.7
	RELENG_2_2_2_RELEASE:1.7
	RELENG_2_2_1_RELEASE:1.7
	RELENG_2_2_0_RELEASE:1.7
	RELENG_2_1_7_RELEASE:1.7
	RELENG_2_1_6_1_RELEASE:1.7
	RELENG_2_1_6_RELEASE:1.7
	RELENG_2_2:1.7.0.6
	RELENG_2_2_BP:1.7
	RELENG_2_1_5_RELEASE:1.7
	RELENG_2_1_0_RELEASE:1.7
	RELENG_2_1_0:1.7.0.4
	RELENG_2_1_0_BP:1.7
	RELENG_2_0_5_RELEASE:1.7
	RELENG_2_0_5:1.7.0.2
	RELENG_2_0_5_BP:1.7
	RELENG_2_0_5_ALPHA:1.6
	RELEASE_2_0:1.6
	BETA_2_0:1.6
	ALPHA_2_0:1.5.0.2
	libscript:1.1.1.1
	natecrypt:1.1.1;
locks; strict;
comment	@# @;


1.45
date	2012.11.17.01.49.47;	author svnexp;	state Exp;
branches
	1.45.2.1;
next	1.44;

1.44
date	2012.06.12.17.14.19;	author des;	state Exp;
branches;
next	1.43;

1.43
date	2011.04.27.21.33.56;	author obrien;	state Exp;
branches
	1.43.2.1;
next	1.42;

1.42
date	2011.04.09.14.02.04;	author markm;	state Exp;
branches;
next	1.41;

1.41
date	2010.01.02.09.58.07;	author ed;	state Exp;
branches;
next	1.40;

1.40
date	2009.07.19.17.25.24;	author kensmith;	state Exp;
branches
	1.40.2.1;
next	1.39;

1.39
date	2007.05.21.02.49.03;	author deischen;	state Exp;
branches
	1.39.2.1
	1.39.6.1
	1.39.8.1
	1.39.10.1
	1.39.12.1;
next	1.38;

1.38
date	2006.03.18.11.01.06;	author ru;	state Exp;
branches;
next	1.37;

1.37
date	2006.03.17.18.54.26;	author ru;	state Exp;
branches;
next	1.36;

1.36
date	2005.07.22.17.19.00;	author kensmith;	state Exp;
branches;
next	1.35;

1.35
date	2004.12.21.10.16.00;	author ru;	state Exp;
branches
	1.35.2.1;
next	1.34;

1.34
date	2004.10.24.15.32.31;	author ru;	state Exp;
branches;
next	1.33;

1.33
date	2003.08.17.08.28.44;	author gordon;	state Exp;
branches
	1.33.4.1;
next	1.32;

1.32
date	2003.06.02.19.29.27;	author markm;	state Exp;
branches;
next	1.31;

1.31
date	2003.05.19.15.51.59;	author des;	state Exp;
branches;
next	1.30;

1.30
date	2001.03.27.17.26.59;	author ru;	state Exp;
branches;
next	1.29;

1.29
date	2001.03.21.22.54.59;	author peter;	state Exp;
branches;
next	1.28;

1.28
date	2001.03.11.16.05.42;	author markm;	state Exp;
branches;
next	1.27;

1.27
date	2000.12.28.10.32.00;	author peter;	state Exp;
branches;
next	1.26;

1.26
date	2000.08.22.02.17.54;	author green;	state Exp;
branches;
next	1.25;

1.25
date	2000.08.22.02.15.52;	author green;	state Exp;
branches;
next	1.24;

1.24
date	2000.01.07.06.33.54;	author kris;	state Exp;
branches
	1.24.2.1;
next	1.23;

1.23
date	99.12.17.20.04.01;	author peter;	state Exp;
branches;
next	1.22;

1.22
date	99.09.21.17.52.05;	author dt;	state Exp;
branches;
next	1.21;

1.21
date	99.09.21.14.44.27;	author peter;	state Exp;
branches;
next	1.20;

1.20
date	99.09.20.12.45.48;	author markm;	state Exp;
branches;
next	1.19;

1.19
date	99.08.28.00.04.19;	author peter;	state Exp;
branches;
next	1.18;

1.18
date	99.03.23.03.41.09;	author bde;	state Exp;
branches;
next	1.17;

1.17
date	99.01.24.07.48.30;	author markm;	state Exp;
branches;
next	1.16;

1.16
date	99.01.23.08.27.36;	author markm;	state Exp;
branches;
next	1.15;

1.15
date	99.01.21.13.50.09;	author brandon;	state Exp;
branches;
next	1.14;

1.14
date	98.09.02.15.09.15;	author bde;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	98.08.30.02.43.45;	author jb;	state Exp;
branches;
next	1.12;

1.12
date	98.08.30.01.48.55;	author jb;	state Exp;
branches;
next	1.11;

1.11
date	98.05.28.12.52.03;	author peter;	state Exp;
branches;
next	1.10;

1.10
date	97.09.05.12.12.35;	author peter;	state Exp;
branches;
next	1.9;

1.9
date	97.02.22.15.06.14;	author peter;	state Exp;
branches;
next	1.8;

1.8
date	97.01.14.06.08.59;	author jkh;	state Exp;
branches;
next	1.7;

1.7
date	95.05.30.05.42.21;	author rgrimes;	state Exp;
branches
	1.7.4.1
	1.7.6.1;
next	1.6;

1.6
date	94.11.14.06.44.45;	author bde;	state Exp;
branches;
next	1.5;

1.5
date	94.11.07.21.07.05;	author phk;	state Exp;
branches;
next	1.4;

1.4
date	94.08.20.18.13.59;	author csgr;	state Exp;
branches;
next	1.3;

1.3
date	94.08.12.21.12.37;	author csgr;	state Exp;
branches;
next	1.2;

1.2
date	94.08.09.18.49.04;	author csgr;	state Exp;
branches;
next	1.1;

1.1
date	94.08.09.17.07.26;	author csgr;	state Exp;
branches
	1.1.1.1;
next	;

1.45.2.1
date	2012.11.17.01.49.47;	author svnexp;	state dead;
branches;
next	1.45.2.2;

1.45.2.2
date	2013.03.28.13.03.13;	author svnexp;	state Exp;
branches;
next	;

1.43.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.43.2.1.2.1;
next	1.43.2.2;

1.43.2.2
date	2012.07.15.11.39.35;	author des;	state Exp;
branches
	1.43.2.2.2.1;
next	1.43.2.3;

1.43.2.3
date	2012.11.17.11.36.22;	author svnexp;	state Exp;
branches;
next	;

1.43.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.43.2.1.2.2;

1.43.2.1.2.2
date	2012.11.17.08.36.23;	author svnexp;	state Exp;
branches;
next	;

1.43.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.43.2.2.2.2;

1.43.2.2.2.2
date	2012.11.17.08.47.12;	author svnexp;	state Exp;
branches;
next	;

1.40.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.40.2.1.2.1
	1.40.2.1.4.1
	1.40.2.1.6.1;
next	1.40.2.2;

1.40.2.2
date	2012.02.13.16.43.29;	author markm;	state Exp;
branches
	1.40.2.2.2.1;
next	1.40.2.3;

1.40.2.3
date	2012.11.17.10.36.07;	author svnexp;	state Exp;
branches;
next	;

1.40.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.40.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.40.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.40.2.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.40.2.2.2.2;

1.40.2.2.2.2
date	2012.11.17.08.24.48;	author svnexp;	state Exp;
branches;
next	;

1.39.2.1
date	2012.06.16.09.17.21;	author des;	state Exp;
branches;
next	1.39.2.2;

1.39.2.2
date	2012.11.17.08.02.39;	author svnexp;	state Exp;
branches;
next	;

1.39.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.39.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.39.10.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.39.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.39.12.2;

1.39.12.2
date	2012.11.17.08.16.47;	author svnexp;	state Exp;
branches;
next	;

1.35.2.1
date	2005.07.22.17.29.04;	author kensmith;	state Exp;
branches
	1.35.2.1.10.1;
next	1.35.2.2;

1.35.2.2
date	2012.11.17.07.40.21;	author svnexp;	state Exp;
branches;
next	;

1.35.2.1.10.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.33.4.1
date	2005.02.13.07.23.12;	author obrien;	state Exp;
branches;
next	;

1.24.2.1
date	2000.09.20.11.19.53;	author green;	state Exp;
branches;
next	1.24.2.2;

1.24.2.2
date	2001.04.25.10.04.24;	author ru;	state Exp;
branches;
next	1.24.2.3;

1.24.2.3
date	2001.05.24.12.20.02;	author markm;	state Exp;
branches;
next	1.24.2.4;

1.24.2.4
date	2001.07.16.03.28.26;	author peter;	state Exp;
branches;
next	1.24.2.5;

1.24.2.5
date	2004.12.13.13.49.59;	author marius;	state Exp;
branches;
next	1.24.2.6;

1.24.2.6
date	2012.11.17.07.23.53;	author svnexp;	state Exp;
branches;
next	;

1.14.2.1
date	99.08.29.14.56.33;	author peter;	state Exp;
branches;
next	;

1.7.4.1
date	99.09.05.11.18.33;	author peter;	state Exp;
branches;
next	;

1.7.6.1
date	99.09.05.11.16.57;	author peter;	state Exp;
branches;
next	;

1.1.1.1
date	94.08.09.17.07.27;	author csgr;	state Exp;
branches;
next	;


desc
@@


1.45
log
@Switching exporter and resync
@
text
@#
# $FreeBSD: head/lib/libcrypt/Makefile 236967 2012-06-12 17:14:19Z des $
#

SHLIBDIR?=	/lib

.include <bsd.own.mk>

SHLIB_MAJOR=	5
LIB=		crypt

.PATH:		${.CURDIR}/../libmd
SRCS=		crypt.c misc.c \
		crypt-md5.c md5c.c \
		crypt-nthash.c md4c.c \
		crypt-sha256.c sha256c.c \
		crypt-sha512.c sha512c.c
MAN=		crypt.3
MLINKS=		crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
CFLAGS+=	-I${.CURDIR}/../libmd -I${.CURDIR}/../libutil

# Pull in the strong crypto, if it is present.
.if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no"
.PATH:		${.CURDIR}/../../secure/lib/libcrypt
SRCS+=		crypt-des.c crypt-blowfish.c blowfish.c
CFLAGS+=	-I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
.endif

.for sym in MD4Init MD4Final MD4Update MD4Pad \
	    MD5Init MD5Final MD5Update MD5Pad \
	    SHA256_Init SHA256_Final SHA256_Update \
	    SHA512_Init SHA512_Final SHA512_Update
CFLAGS+=	-D${sym}=__${sym}
.endfor

WARNS?=		2

PRECIOUSLIB=

.include <bsd.lib.mk>
@


1.45.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:13 +0000
@
text
@d1 40
@


1.45.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 42
#
# $FreeBSD: releng/8.4/lib/libcrypt/Makefile 231588 2012-02-13 16:43:29Z markm $
#

SHLIBDIR?=	/lib

.include <bsd.own.mk>

SHLIB_MAJOR=	5
LIB=		crypt

.PATH:		${.CURDIR}/../libmd
SRCS=		crypt.c misc.c \
		crypt-md5.c md5c.c \
		crypt-nthash.c md4c.c \
		crypt-sha256.c sha256c.c \
		crypt-sha512.c sha512c.c
MAN=		crypt.3
MLINKS=		crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
CFLAGS+=	-I${.CURDIR}/../libmd -I${.CURDIR}/../libutil

# Pull in the strong crypto, if it is present.
.if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no"
.PATH:		${.CURDIR}/../../secure/lib/libcrypt
SRCS+=		crypt-des.c crypt-blowfish.c blowfish.c
CFLAGS+=	-I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
.endif

# And the auth_getval() code and support.
.PATH:		${.CURDIR}/../libutil
SRCS+=		auth.c property.c
.for sym in auth_getval property_find properties_read properties_free \
	    MD4Init MD4Final MD4Update MD4Pad \
	    MD5Init MD5Final MD5Update MD5Pad \
	    SHA256_Init SHA256_Final SHA256_Update \
	    SHA512_Init SHA512_Final SHA512_Update
CFLAGS+=	-D${sym}=__${sym}
.endfor

PRECIOUSLIB=

.include <bsd.lib.mk>
@


1.44
log
@SVN rev 236967 on 2012-06-12 17:14:19Z by des

Stop using auth_getval() now that it always returns NULL.  Instead,
hardcode the default to what it would be if we didn't hardcode it,
i.e. DES if supported and MD5 otherwise.

MFC after:	3 weeks
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.43
log
@SVN rev 221142 on 2011-04-27 21:33:56Z by obrien

Protect the reachover built symbols after the SHA256/512 crypt(3) addition.
@
text
@d29 1
a29 5
# And the auth_getval() code and support.
.PATH:		${.CURDIR}/../libutil
SRCS+=		auth.c property.c
.for sym in auth_getval property_find properties_read properties_free \
	    MD4Init MD4Final MD4Update MD4Pad \
@


1.43.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.43.2.2
log
@SVN rev 238481 on 2012-07-15 11:39:35Z by des

MFH r236751: document sha256 / sha512 support
MFH r236892: remove mention of auth.conf from programs that don't use it
MFH r236963: remove dead code relating to auth.conf
MFH r236965 r236966 r236967 r237005 r237006 r237011: retire auth.conf

Approved by:    re
@
text
@d29 5
a33 1
.for sym in MD4Init MD4Final MD4Update MD4Pad \
@


1.43.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/lib/libcrypt/Makefile 238481 2012-07-15 11:39:35Z des $
@


1.43.2.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.43.2.2.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/lib/libcrypt/Makefile 238481 2012-07-15 11:39:35Z des $
@


1.43.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.43.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/lib/libcrypt/Makefile 221142 2011-04-27 21:33:56Z obrien $
@


1.42
log
@SVN rev 220497 on 2011-04-09 14:02:04Z by markm

Add SHA256/512 ($5$ and $6$) to crypt(3). Used in linux-world, doesn't
hurt us.

PR:		misc/124164
Submitted by:	KIMURA Yasuhiro < yasu utahime org >
MFC after:	1 month
@
text
@d34 3
a36 1
	    MD5Init MD5Final MD5Update MD5Pad
@


1.41
log
@SVN rev 201381 on 2010-01-02 09:58:07Z by ed

Build lib/ with WARNS=6 by default.

Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
lower it when needed.

I'm setting WARNS?=0 for secure/. It seems secure/ includes the
Makefile.inc provided by lib/. I'm not going to touch that directory.
Most of the code there is contributed anyway.
@
text
@d15 3
a17 1
		crypt-nthash.c md4c.c
@


1.40
log
@SVN rev 195767 on 2009-07-19 17:25:24Z by kensmith

Bump the version of all non-symbol-versioned shared libraries in
preparation for 8.0-RELEASE.  Add the previous version of those
libraries to ObsoleteFiles.inc and bump __FreeBSD_Version.

Reviewed by:    kib
Approved by:    re (rwatson)
@
text
@d36 2
@


1.40.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.40.2.2
log
@SVN rev 231588 on 2012-02-13 16:43:29Z by markm

MFC: sha256 ($5$) and sha512 ($6$) crypt(3) types.

PR:		misc/124164
Delayed by:	markm
@
text
@d15 1
a15 3
		crypt-nthash.c md4c.c \
		crypt-sha256.c sha256c.c \
		crypt-sha512.c sha512c.c
d32 1
a32 3
	    MD5Init MD5Final MD5Update MD5Pad \
	    SHA256_Init SHA256_Final SHA256_Update \
	    SHA512_Init SHA512_Final SHA512_Update
@


1.40.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/lib/libcrypt/Makefile 231588 2012-02-13 16:43:29Z markm $
@


1.40.2.2.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.40.2.2.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/lib/libcrypt/Makefile 231588 2012-02-13 16:43:29Z markm $
@


1.40.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.40.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.40.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.39
log
@Bump library versions in preparation for 7.0.

Ok'd by:	kan
@
text
@d9 1
a9 1
SHLIB_MAJOR=	4
@


1.39.2.1
log
@SVN rev 237157 on 2012-06-16 09:17:21Z by des

Backport sha512 support.
@
text
@d15 1
a15 3
		crypt-nthash.c md4c.c \
		crypt-sha256.c sha256c.c \
		crypt-sha512.c sha512c.c
d32 1
a32 3
	    MD5Init MD5Final MD5Update MD5Pad \
	    SHA256_Init SHA256_Final SHA256_Update \
	    SHA512_Init SHA512_Final SHA512_Update
@


1.39.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/7/lib/libcrypt/Makefile 237157 2012-06-16 09:17:21Z des $
@


1.39.12.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.39.12.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/7.4/lib/libcrypt/Makefile 169807 2007-05-21 02:49:08Z deischen $
@


1.39.10.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.39.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.39.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.38
log
@Provide alternate default for SHLIBDIR before bsd.own.mk does this.

Reported by:	phk
@
text
@d9 1
a9 1
SHLIB_MAJOR=	3
@


1.37
log
@Reimplementation of world/kernel build options.  For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
@
text
@d5 2
a10 1
SHLIBDIR?=	/lib
@


1.36
log
@Bump the shared library version number of all libraries that have not
been bumped since RELENG_5.

Reviewed by:	ru
Approved by:	re (not needed for commit check but in principle...)
@
text
@d5 2
d20 1
a20 1
.if exists(${.CURDIR}/../../secure/lib/libcrypt) && !defined(NO_CRYPT)
@


1.35
log
@NOCRYPT -> NO_CRYPT
@
text
@d5 1
a5 1
SHLIB_MAJOR=	2
@


1.35.2.1
log
@Insta-MFC of the shared library version bump.  All shared libraries
whose version has not already been bumped since RELENG_5 are being
bumped.

Revisions of files being MFC-ed:

> Path						Revision
> src/gnu/lib/libdialog/Makefile		1.43
> src/gnu/lib/libg2c/Makefile			1.16
> src/gnu/lib/libobjc/Makefile			1.27
> src/gnu/lib/libreadline/Makefile.inc		1.12
> src/gnu/lib/libregex/Makefile			1.32
> src/gnu/lib/libstdc++/Makefile		1.56
> src/kerberos5/lib/Makefile.inc		1.7
> src/lib/Makefile.inc				1.3
> src/lib/libalias/Makefile			1.31
> src/lib/libarchive/Makefile			1.37
> src/lib/libbegemot/Makefile			1.3
> src/lib/libbluetooth/Makefile			1.2
> src/lib/libbsnmp/Makefile.inc			1.6
> src/lib/libbz2/Makefile			1.6
> src/lib/libc_r/Makefile			1.42
> src/lib/libcrypt/Makefile			1.36
> src/lib/libdevstat/Makefile			1.15
> src/lib/libdevstat/devstat.h			1.11
> src/lib/libedit/Makefile			1.29
> src/lib/libexpat/Makefile			1.5
> src/lib/libfetch/Makefile			1.45
> src/lib/libftpio/Makefile			1.14
> src/lib/libgpib/Makefile			1.2
> src/lib/libipsec/Makefile			1.17
> src/lib/libkiconv/Makefile			1.3
> src/lib/libmagic/Makefile			1.7
> src/lib/libmp/Makefile			1.10
> src/lib/libncp/Makefile			1.6
> src/lib/libncurses/Makefile			1.79
> src/lib/libnetgraph/Makefile			1.11
> src/lib/libngatm/Makefile			1.6
> src/lib/libopie/Makefile			1.21
> src/lib/libpam/Makefile.inc			1.17
> src/lib/libpthread/Makefile			1.54
> src/lib/libradius/Makefile			1.12
> src/lib/libsdp/Makefile			1.4
> src/lib/libsmb/Makefile			1.8
> src/lib/libtacplus/Makefile			1.7
> src/lib/libthr/Makefile			1.14
> src/lib/libthread_db/Makefile			1.6
> src/lib/libugidfw/Makefile			1.7
> src/lib/libusbhid/Makefile			1.10
> src/lib/libutil/Makefile			1.57
> src/lib/libvgl/Makefile			1.11
> src/lib/libwrap/Makefile			1.17
> src/lib/libypclnt/Makefile			1.13
> src/lib/msun/Makefile				1.72
> src/secure/lib/libcrypto/Makefile		1.74
> src/secure/lib/libssh/Makefile		1.35
> src/secure/lib/libssl/Makefile		1.22
> src/usr.sbin/bsnmpd/modules/Makefile.inc	1.10

Reviewed by:	ru
Approved by:	re (scottl)
@
text
@d5 1
a5 1
SHLIB_MAJOR=	3
@


1.35.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/6/lib/libcrypt/Makefile 148300 2005-07-22 17:29:10Z kensmith $
@


1.35.2.1.10.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.34
log
@For variables that are only checked with defined(), don't provide
any fake value.
@
text
@d18 1
a18 1
.if exists(${.CURDIR}/../../secure/lib/libcrypt) && !defined(NOCRYPT)
@


1.33
log
@Stage 3 of dynamic root support. Make all the libraries needed to run
binaries in /bin and /sbin installed in /lib. Only the versioned files
reside in /lib, the .so symlink continues to live /usr/lib so the
toolchain doesn't need to be modified.
@
text
@d33 1
a33 1
PRECIOUSLIB=	yes
@


1.33.4.1
log
@MFC: For variables that are only checked with defined(), don't provide
     any fake value.
@
text
@d33 1
a33 1
PRECIOUSLIB=
@


1.32
log
@Add a new hash type. This "NT-hash" is compatible with the password
hashing scheme used in Microsoft's NT machines. IT IS NOT SECURE!
DON'T USE IT! This is for the use of competent sysadmins only!

Submitted by:	Michael Bretterklieber
@
text
@d7 1
@


1.31
log
@Retire the useless NOSECURE knob.

Approved by:	re (scottl)
@
text
@d9 3
a11 1
SRCS=		crypt.c crypt-md5.c md5c.c misc.c
d15 3
a17 4
CFLAGS+=	-DLIBC_SCCS -Wall
# Pull in the crypt-des.c source, assuming it is present.
.if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \
    !defined(NOCRYPT)
d22 1
d26 3
a28 2
.for sym in MD5Init MD5Final MD5Update MD5Pad auth_getval \
	    property_find properties_read properties_free
d31 1
@


1.30
log
@MAN[1-9] -> MAN.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.29 2001/03/21 22:54:59 peter Exp $
d16 1
a16 1
    !defined(NOSECURE) && !defined(NOCRYPT)
@


1.29
log
@Help standalone builds by getting libutil.h from src/lib/libutil
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.28 2001/03/11 16:05:42 markm Exp $
d10 1
a10 1
MAN3=		crypt.3
@


1.28
log
@Add OpenBSD-style blowfish password hashing. This makes one less
gratuitous difference between us and our sister project.

This was given to me _ages_ ago. May apologies to Paul for the length
of time its taken me to commit.

Obtained from:	Niels Provos <provos@@physnet.uni-hamburg.de>/OpenBSD
Submitted by:	Paul Herman <pherman@@frenchfries.net>
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.27 2000/12/28 10:32:00 peter Exp $
d12 1
a12 1
CFLAGS+=	-I${.CURDIR}/../libmd
@


1.27
log
@Merge into a single US-exportable libcrypt, which only provides
one-way hash functions for authentication purposes.  There is no more
"set the libcrypt->libXXXcrypt" nightmare.
- Undo the libmd.so hack, use -D to hide the md5c.c internals.
- Remove the symlink hacks in release/Makefile
- the algorthm is set by set_crypt_format() as before.  If this is
  not called, it tries to heuristically figure out the hash format, and
  if all else fails, it uses the optional auth.conf entry to chose the
  overall default hash.
- Since source has non-hidden crypto in it there may be some issues with
  having the source it in some countries, so preserve the "secure/*"
  division.  You can still build a des-free libcrypt library if you want
  to badly enough.  This should not be a problem in the US or exporting
  from the US as freebsd.org had notified BXA some time ago.  That makes
  this stuff re-exportable by anyone.
- For consistancy, the default in absence of any other clues is md5.  This
  is to try and minimize POLA across buildworld where folk may suddenly
  be activating des-crypt()-hash support.  Since the des hash may not
  always be present, it seemed sensible to make the stronger md5 algorithm
  the default.
All things being equal, no functionality is lost.

Reviewed-by: jkh

(flame-proof suit on)
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.26 2000/08/22 02:17:54 green Exp $
d18 2
a19 2
SRCS+=		crypt-des.c
CFLAGS+=	-I${.CURDIR} -DHAS_DES
@


1.26
log
@How did you sneak in...
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.25 2000/08/22 02:15:52 green Exp $
d6 1
a6 11
LIB=		scrypt

LCRYPTBASE=	libcrypt
LSCRYPTBASE=	lib${LIB}

LCRYPTSO=	${LCRYPTBASE}.so.${SHLIB_MAJOR}
LSCRYPTSO=	${LSCRYPTBASE}.so.${SHLIB_MAJOR}

.if ${OBJFORMAT} == elf
SONAME=		${LCRYPTSO}
.endif
d9 1
a9 3
SRCS=		crypt.c crypt-md5.c misc.c
STATICSRCS=	md5c.c
STATICOBJS=	${STATICSRCS:S/.c/.o/g}
d14 14
a29 20
# Include this early to pick up the definitions of SHLIB_MAJOR and
# SHLIB_MINOR which are used in the existence tests.
.include "${.CURDIR}/../Makefile.inc"

# We only install the links if they do not already exist.
# This may have to be revised
.if !exists(${DESTDIR}${LIBDIR}/${LCRYPTBASE}.a)
SYMLINKS+=	${LSCRYPTBASE}.a ${LIBDIR}/${LCRYPTBASE}.a
.endif
.if !defined(NOPROFILE) && !exists(${DESTDIR}${LIBDIR}/${LCRYPTBASE}_p.a)
SYMLINKS+=	${LSCRYPTBASE}_p.a ${LIBDIR}/${LCRYPTBASE}_p.a
.endif
.if !defined(NOPIC) && !exists(${DESTDIR}${SHLIBDIR}/${LCRYPTSO})
SYMLINKS+=	${LSCRYPTSO} ${SHLIBDIR}/${LCRYPTSO}
.endif
.if !defined(NOPIC) && ${OBJFORMAT} == elf && \
    !exists(${DESTDIR}${SHLIBDIR}/${LCRYPTBASE}.so)
SYMLINKS+=	${LSCRYPTBASE}.so ${SHLIBDIR}/${LCRYPTBASE}.so
.endif

a30 20

afterinstall:
.if !defined(NOPIC)
	@@cd ${DESTDIR}${SHLIBDIR}; \
	rm -f ${LCRYPTSO}; \
	ln -sf ${LSCRYPTSO} ${LCRYPTSO};
.endif
.if !defined(NOPIC) && ${OBJFORMAT} == elf
	@@cd ${DESTDIR}${SHLIBDIR}; \
	rm -f ${LCRYPTBASE}.so; \
	ln -sf ${LSCRYPTBASE}.so libcrypt.so
.endif
	@@cd  ${DESTDIR}${LIBDIR}; \
	rm -f ${LCRYPTBASE}.a; \
	ln -sf ${LSCRYPTBASE}.a libcrypt.a
.if !defined(NOPROFILE)
	@@cd  ${DESTDIR}${LIBDIR}; \
	rm -f ${LCRYPTBASE}_p.a; \
	ln -sf ${LSCRYPTBASE}_p.a libcrypt_p.a
.endif
@


1.25
log
@Add working and easy crypt(3)-switching.  Yes, we need a whole new API
for crypt(3) by now.  In any case:

Add crypt_set_format(3) + documentation to -lcrypt.
Add login_setcryptfmt(3) + documentation to -lutil.
Support for switching crypt formats in passwd(8).
Support for switching crypt formats in pw(8).

The simple synopsis is:
edit login.conf; add a passwd_format field set to "des" or "md5"; go nuts :)

Reviewed by:	peter
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.24 2000/01/07 06:33:54 kris Exp $
d20 1
a20 1
STATICSRCS=	md5c.c sha1c.c
@


1.24
log
@Zap SHA1 password support. This will be re-implemented at a later date.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.23 1999/12/17 20:04:01 peter Exp $
d20 1
a20 1
STATICSRCS=	md5c.c
d23 1
@


1.24.2.1
log
@MFC: login.conf password format switching
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.26 2000/08/22 02:17:54 green Exp $
a22 1
MLINKS=		crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
@


1.24.2.2
log
@MFC: MAN[1-9] -> MAN.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.24.2.1 2000/09/20 11:19:53 green Exp $
d22 1
a22 1
MAN=		crypt.3
@


1.24.2.3
log
@MFC: Blowfish password hashing scheme (From OpenBSD) and remove the dlsym()
hack.
@
text
@d2 1
a2 1
# $FreeBSD$
d19 1
a19 1
SRCS=		crypt.c crypt-md5.c md5c.c misc.c
a25 7
# And the auth_getval() code and support.
.PATH:		${.CURDIR}/../libutil
SRCS+=		auth.c property.c
.for sym in MD5Init MD5Final MD5Update MD5Pad auth_getval \
		property_find properties_read properties_free
CFLAGS+=	-D${sym}=__${sym}
.endfor
@


1.24.2.4
log
@MFC: unify libscrypt/libdescrypt into libcrypt.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.24.2.3 2001/05/24 12:20:02 markm Exp $
d6 11
a16 1
LIB=		crypt
d20 2
d24 1
a24 1
CFLAGS+=	-I${.CURDIR}/../libmd -I${.CURDIR}/../libutil
a25 7
# Pull in the crypt-des.c source, assuming it is present.
.if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \
    !defined(NOSECURE) && !defined(NOCRYPT)
.PATH:		${.CURDIR}/../../secure/lib/libcrypt
SRCS+=		crypt-des.c crypt-blowfish.c blowfish.c
CFLAGS+=	-I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
.endif
d30 1
a30 1
	    property_find properties_read properties_free
d35 20
d56 20
@


1.24.2.5
log
@MFC:
Makefile.inc1 1.361
bin/ed/Makefile 1.22
lib/Makefile 1.157
lib/libcrypt/Makefile 1.31
lib/libfetch/Makefile 1.41
lib/libpam/modules/modules.inc 1.17
libexec/Makefile 1.61
share/examples/etc/make.conf 1.215
share/man/man5/make.conf.5 1.73
usr.bin/Makefile 1.239
usr.bin/fetch/Makefile 1.14
usr.sbin/pkg_install/Makefile 1.14
usr.sbin/pkg_install/add/Makefile 1.17
usr.sbin/pkg_install/info/Makefile 1.17
usr.sbin/pkg_install/version/Makefile 1.12
usr.sbin/ppp/Makefile 1.95, 1.96
usr.sbin/pppd/Makefile 1.25
usr.sbin/sendmail/Makefile 1.40
usr.sbin/tcpdump/tcpdump/Makefile 1.36

Retire the useless NOSECURE knob.

The motivation for this MFC is that MAKE_KERBEROS4 and MAKE_KERBEROS5
are meant to be buildable by various makefiles when NOSECURE is set but
this was broken because Kerberos depends on e.g. des(3) from OpenSSL
which wasn't built when NOSECURE was defined. Fixing the NOSECURE knob
however would have meant to make it do the same as the NOCRYPT knob.
If you had been using the NOSECURE build knob please now use the NOCRYPT
knob instead.

Discussed with:	ru (some months ago)
Reviewed by:	ru (some months ago)
Approved by:	markm (telnet and secure bits, some months ago), kensmith (re)
@
text
@d2 1
a2 1
# $FreeBSD$
d16 1
a16 1
    !defined(NOCRYPT)
@


1.24.2.6
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/4/lib/libcrypt/Makefile 138803 2004-12-13 13:50:02Z marius $
@


1.23
log
@Remove -lmd.  Use dlopen() and dlsym() instead for calls to the MD5* and
SHA* routines so that callers of libcrypt are not exposed to the internal
implementation.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.22 1999/09/21 17:52:05 dt Exp $
d19 2
a20 2
SRCS=		crypt.c crypt-md5.c crypt-shs.c misc.c
STATICSRCS=	md5c.c sha0c.c sha1c.c
@


1.22
log
@Someone changed major numbers of the libraries from 2 to 3 for 0 (zero) reasons.
Revert the major number back to 2.

libcrypt only export one function, before the recent changes and now:
char *crypt(const char *key, const char *salt);
The prototype didn't changed. Internal representation of `char' and `char *'
didn't changed. Therefore, there is no reason to change the version number.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.21 1999/09/21 14:44:27 peter Exp $
a25 3

LDADD+=		-lmd
DPADD+=		${LIBMD}
@


1.21
log
@Somebody deleted the SONAME override causing the symlink to be expanded
at link time and the target name compiled into the binaries.  ie:
everything used libscrypt or libdescrypt explicitly.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.20 1999/09/20 12:45:48 markm Exp $
d5 1
a5 1
SHLIB_MAJOR=	3
@


1.20
log
@Big code cleanup. (Inspired by Brandon Gillespie). Also move as
much as possible away from secure/ to make extending easier.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.19 1999/08/28 00:04:19 peter Exp $
d13 4
@


1.19
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
d5 5
a9 2
LCRYPTBASE= 	libcrypt
LSCRYPTBASE= 	libscrypt
a10 4
.if ${OBJFORMAT} != elf
LCRYPTSO=	${LCRYPTBASE}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
LSCRYPTSO=	${LSCRYPTBASE}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
.else
a12 1
.endif
d14 8
a21 5
# called libscrypt - for scramble crypt!
.PATH:	${.CURDIR}/../libmd
LIB=	scrypt
SRCS=	crypt.c md5c.c
CFLAGS+=	-I${.CURDIR}/../libmd -DLIBC_SCCS
d23 2
a24 3
.if ${OBJFORMAT} == elf
SONAME=	${LCRYPTBASE}.so.${SHLIB_MAJOR}
.endif
d47 20
@


1.18
log
@Simplified using new SYMLINKS macro, mainly to test this macro.  The
ifdefs are too ugly for this to be much of a simplification.  The
existence tests are even uglier now.  Note that the previous commit
was not submitted by me.  It missed the point and just added a second
layer of unused removals.

Fixed hard-coded "libcrypt"s.  The LCRYPTBASE macro mainly makes
things hard to read, but use it while we have it.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.17 1999/01/24 07:48:30 markm Exp $
@


1.17
log
@Fix symlinking. Without the -f "force" option, the wrong version
can be found.
Submitted by:   Bruce
@
text
@d2 1
a2 1
# $Id$
d26 4
d32 5
a36 8

afterinstall:
.if !defined(NOPIC)
	@@cd ${DESTDIR}${SHLIBDIR}; \
	if [ ! -e ${LCRYPTSO} ]; then \
	rm -f ${LCRYPTSO}; \
	ln -sf ${LSCRYPTSO} ${LCRYPTSO}; \
	fi
d38 2
a39 6
.if !defined(NOPIC) && ${OBJFORMAT} == elf
	@@cd ${DESTDIR}${SHLIBDIR}; \
	if [ ! -e ${LCRYPTBASE}.so ]; then \
	rm -f ${LCRYPTBASE}.so; \
	ln -sf ${LSCRYPTBASE}.so libcrypt.so; \
	fi
d41 3
a43 11
	@@cd  ${DESTDIR}${LIBDIR}; \
	if [ ! -e ${LCRYPTBASE}.a ]; then \
	rm -f ${LCRYPTBASE}.a; \
	ln -sf ${LSCRYPTBASE}.a libcrypt.a; \
	fi
.if !defined(NOPROFILE)
	@@cd  ${DESTDIR}${LIBDIR}; \
	if [ ! -e ${LCRYPTBASE}_p.a ]; then \
	rm -f ${LCRYPTBASE}_p.a; \
	ln -sf ${LSCRYPTBASE}_p.a libcrypt_p.a; \
	fi
@


1.16
log
@The new crypt code broke "make world". Back it out.
@
text
@d34 1
a34 1
	ln -s ${LSCRYPTSO} ${LCRYPTSO}; \
d41 1
a41 1
	ln -s ${LSCRYPTBASE}.so libcrypt.so; \
d47 1
a47 1
	ln -s ${LSCRYPTBASE}.a libcrypt.a; \
d53 1
a53 1
	ln -s ${LSCRYPTBASE}_p.a libcrypt_p.a; \
@


1.15
log
@Rewrite of crypt library to be more modular, and addition of the
Secure Hashing Algorithm - 1 (SHA-1), along with the further
refinement of what $x$salt$hash means.  With this new crypt the
following are all acceptable:

    $1$
    $MD5$
    $SHA1$

Note: $2$ is used by OpenBSD's Blowfish, which I considered adding
as $BF$, but there is no actual need for it with SHA-1.  However,
somebody wishing to add OpenBSD password support could easilly add
it in now.

There is also a malloc_crypt() available in the library now, which
behaves exactly the same as crypt(), but it uses a malloced buffer
instead of a static buffer.  However, this is not standard so will
likely not be used much (at all).

Also, for those interested I did a brief speed test Pentium 166/MMX,
which shows the DES crypt to do approximately 2640 crypts a CPU second,
MD5 to do about 62 crypts a CPU second and SHA1 to do about 18 crypts
a CPU second.

Reviewed by:	Mark Murray
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.14 1998/09/02 15:09:15 bde Exp $
d5 2
a6 20
SHLIB_MAJOR=	3
.PATH:		${.CURDIR}/../../lib/libmd
SRCS=		crypt.c crypt-md5.c md5c.c crypt-shs.c shs.c
MAN3=		crypt.3 shs.3 descrypt.3
CFLAGS+=	-I${.CURDIR}/../libmd -DLIBC_SCCS
DESCRYPT=	${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c

## build exportable crypt or des crypt?
.if exists(${DESCRYPT}) && !defined(NOCRYPT) && !defined(NOSECURE)
.PATH:		${.CURDIR}/../../secure/lib/libcrypt
CIPHERTYPE=	des
SRCS+=		crypt-des.c
CFLAGS+=	-I${.CURDIR} -DDES_CRYPT
.else
CIPHERTYPE=	exp
.endif

LIB=${CIPHERTYPE}crypt
LCRYPTBASE=	libcrypt
LSCRYPTBASE=	lib${LIB}
a11 1
SONAME=		${LCRYPTBASE}.so.${SHLIB_MAJOR}
d16 13
d32 1
d35 1
a35 2
	rm -f ${LCRYPTBASE}.so.2; \
	ln -s ${LSCRYPTSO} ${LCRYPTBASE}.so.2
d39 1
d41 2
a42 1
	ln -s ${LSCRYPTBASE}.so libcrypt.so
d45 1
d47 2
a48 1
	ln -s ${LSCRYPTBASE}.a libcrypt.a
d51 1
d53 2
a54 1
	ln -s ${LSCRYPTBASE}_p.a libcrypt_p.a
@


1.14
log
@Fixed the elf case of the creation of the libcrypt.so -> libscrypt->so
link.  Shared libraries are in ${SHLIBDIR}, not necessarily in ${LIBDIR}.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.13 1998/08/30 02:43:45 jb Exp $
d5 20
a24 2
LCRYPTBASE= 	libcrypt
LSCRYPTBASE= 	libscrypt
d30 1
a34 13
# called libscrypt - for scramble crypt!
.PATH:	${.CURDIR}/../libmd
LIB=	scrypt
SRCS=	crypt.c md5c.c
CFLAGS+=	-I${.CURDIR}/../libmd -DLIBC_SCCS

.if ${OBJFORMAT} == elf
SONAME=	${LCRYPTBASE}.so.${SHLIB_MAJOR}
.endif

# We only install the links if they do not already exist.
# This may have to be revised

a37 1
	if [ ! -e ${LCRYPTSO} ]; then \
d40 2
a41 1
	fi
a44 1
	if [ ! -e ${LCRYPTBASE}.so ]; then \
d46 1
a46 2
	ln -s ${LSCRYPTBASE}.so libcrypt.so; \
	fi
a48 1
	if [ ! -e ${LCRYPTBASE}.a ]; then \
d50 1
a50 2
	ln -s ${LSCRYPTBASE}.a libcrypt.a; \
	fi
a52 1
	if [ ! -e ${LCRYPTBASE}_p.a ]; then \
d54 1
a54 2
	ln -s ${LSCRYPTBASE}_p.a libcrypt_p.a; \
	fi
@


1.14.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.13
log
@BINFORMAT -> OBJFORMAT ready for E-day.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.12 1998/08/30 01:48:55 jb Exp $
d38 1
a38 1
	@@cd  ${DESTDIR}${LIBDIR}; \
@


1.12
log
@BINFORMAT -> OBJFORMAT ready for E-day.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.11 1998/05/28 12:52:03 peter Exp $
d8 1
a8 1
.if ${BINFORMAT} != elf
d37 1
a37 1
.if !defined(NOPIC) && ${BINFORMAT} == elf
@


1.11
log
@Turn on the rcsid storage so that it's easier to tell the difference
between libscrypt.a and libdescrypt.a
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.10 1997/09/05 12:12:35 peter Exp $
d22 1
a22 1
.if ${BINFORMAT} == elf
@


1.10
log
@When compiling under elf, use correct library naming conventions.  Also
add the required extra symlink.  Set the -soname to libcrypt.so so that
the symlink is used at runtime rather than resolved at compile time.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.9 1997/02/22 15:06:14 peter Exp $
d20 1
a20 1
CFLAGS+=	-I${.CURDIR}/../libmd
@


1.9
log
@Revert $FreeBSD$ to $Id$
@
text
@d2 1
a2 1
# $Id$
d6 3
a9 2

LSCRYPTBASE= 	libscrypt
d11 4
d22 4
d35 7
@


1.8
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.7
log
@Remove trailing whitespace.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.6 1994/11/14 06:44:45 bde Exp $
@


1.7.4.1
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.7.6.1
log
@$Id$ -> $FreeBSD$
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.6
log
@Install shared libraries in ${DESTDIR}${SHLIBDIR} instead of in
$(DESTDIR)/$(LIBDIR) (I need SHLIBDIR.  The / was a bug and the
$(...) style was inconsistent.)

Install ordinary libraries in ${DESTDIR}${LIBDIR} instead of in
$(DESTDIR)/$(LIBDIR).

Change remaining $(...) to ${...}.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.5 1994/11/07 21:07:05 phk Exp $
d21 1
a21 1
.if !defined(NOPIC) 
@


1.5
log
@*** ATTENTION *** YOU MIGHT BE ABOUT TO BE HOSED *** ATTENTION ***

This effectively changes the non-DES password algoritm.

If you have the "securedist" installed you will have no problems with this.
(Though you might want to consider using this password-encryption instead
of the DES-based if your system is likely to be hacked)

If you are running a -current system without the "securedist" installed:
YOU WILL NEED TO CHANGE ALL PASSWORDS !!    There is no backwards mode.

Suggested procedure is:
	Update your sources
	cd /usr/src/lib/libcrypt
	make clean
	make all
	make install
	passwd root
		<set roots new password>
	change password for any other users on the system.

This algorithm is expected to be much better than the traditional DES-
based algorithm.  It uses the MD5 algorithm at what it is best at, as
opposed to the DES algorithm at something it isn't good at at all.  The
algorithm is designed such that it should very hard to shortcut the
calculations needed to build a dictionary, and to make partial knowledge
(Hmm, his password starts with a 'P'...) useless.  Of course if somebody
breaks the MD5 algorithm this looses too.

The salt is 48 bits (8 char @@ base64).
The encrypted password is 128 bits.

And I am positively delighted to say that it takes 34 msec to crypt() a
password on a Pentium/60Mhz, so building a dictionary is not really an
option for hackers at the moment.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.4 1994/08/20 18:13:59 csgr Exp $
d6 1
a6 1
LCRYPTSO=	$(LCRYPTBASE).so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
d9 1
a9 1
LSCRYPTSO=	$(LSCRYPTBASE).so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
d22 4
a25 4
	@@cd $(DESTDIR)/$(LIBDIR); \
	if [ ! -e $(LCRYPTSO) ]; then \
	rm -f $(LCRYPTSO); \
	ln -s $(LSCRYPTSO) $(LCRYPTSO); \
d28 4
a31 4
	@@cd  $(DESTDIR)/$(LIBDIR); \
	if [ ! -e $(LCRYPTBASE).a ]; then \
	rm -f $(LCRYPTBASE).a; \
	ln -s $(LSCRYPTBASE).a libcrypt.a; \
d34 4
a37 4
	@@cd  $(DESTDIR)/$(LIBDIR); \
	if [ ! -e $(LCRYPTBASE)_p.a ]; then \
	rm -f $(LCRYPTBASE)_p.a; \
	ln -s $(LSCRYPTBASE)_p.a libcrypt_p.a; \
@


1.4
log
@Fix afterinstall rule for generating links to the real libcrypt
Submitted by:	geoff
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.3 1994/08/12 21:12:37 csgr Exp $
a7 1

d12 1
d14 2
a15 1
SRCS=	crypt.c
d19 1
@


1.3
log
@Fix afterinstall rule for NOSHARED case
Submitted by:	Geoff Rehmet
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.2 1994/08/09 18:49:04 csgr Exp $
d19 3
a21 3
.if defined(SHLIB_MAJOR) && !defined(NOSHARED)
	@@if [ ! -e $(LCRYPTSO) ]; then \
	cd  $(DESTDIR)/$(LIBDIR); \
d26 3
a28 3
	@@if [ ! -e $(LCRYPTBASE).a ]; then \
	cd  $(DESTDIR)/$(LIBDIR); \
	rm -f $(LCRYPTBASE).a $(LCRYPTBASE)_p.a; \
d30 5
d37 1
@


1.2
log
@The password scrambler now becomes libscrypt, and libcrypt is
a symlink to it. (The real libcrypt will be installed as libdescrypt.)
Submitted by:	Geoff.
@
text
@d2 1
a2 1
# $Id: Makefile,v 1.1.1.1 1994/04/04 14:57:18 g89r4222 Exp $
d19 1
d24 4
@


1.1
log
@Initial revision
@
text
@d5 7
d15 12
@


1.1.1.1
log
@Nates password scrambler, from FreebSD 1.1.5, but with everything except 
crypt() ripped out
Reviewed by:	Geoff Rehmet
Submitted by:	Nate Williams
@
text
@@
