Differential D6166 Diff 17049 lib/libcrypt/Makefile

Changeset View

Standalone View

lib/libcrypt/Makefile

	#			#
	# $FreeBSD$			# $FreeBSD$
	#			#

	PACKAGE=lib${LIB}			PACKAGE=lib${LIB}
	SHLIBDIR?= /lib			SHLIBDIR?= /lib

	.include <src.opts.mk>			.include <src.opts.mk>

	SHLIB_MAJOR= 5			SHLIB_MAJOR= 5
	LIB= crypt			LIB= crypt

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

				# Use assembly optimized skein if available
				.if exists(${MACHINE_ARCH}/skein_block_asm.s)
				.PATH: ${.CURDIR}/../../sys/crypto/skein/${MACHINE_ARCH}
				SRCS += skein_block_asm.s
				CFLAGS += -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792
				ACFLAGS += -DELF -Wa,--noexecstack
				.endif

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

	.for sym in MD4Init MD4Final MD4Update MD4Pad \			.for sym in MD4Init MD4Final MD4Update MD4Pad \
	MD5Init MD5Final MD5Update MD5Pad \			MD5Init MD5Final MD5Update MD5Pad \
	SHA256_Init SHA256_Final SHA256_Update \			SHA256_Init SHA256_Final SHA256_Update \
	SHA512_224_Init SHA512_224_Final SHA512_224_Update \			SHA512_224_Init SHA512_224_Final SHA512_224_Update \
	SHA512_256_Init SHA512_256_Final SHA512_256_Update \			SHA512_256_Init SHA512_256_Final SHA512_256_Update \
				cemUnsubmitted Done Inline Actions Is this just a rebase, or are you including this in the Skein commit? I'd keep them separate. cem: Is this just a rebase, or are you including this in the Skein commit? I'd keep them separate.
				allanjudeAuthorUnsubmitted Not Done Inline Actions it is a rebase, the sha512t256 commit went in earlier today, which had some merge conflicts with this patch since it adds to the same makefiles. allanjude: it is a rebase, the sha512t256 commit went in earlier today, which had some merge conflicts…
	SHA384_Init SHA384_Final SHA384_Update \			SHA384_Init SHA384_Final SHA384_Update \
	SHA512_Init SHA512_Final SHA512_Update			SHA512_Init SHA512_Final SHA512_Update \
				SKEIN256_Init SKEIN256_Final SKEIN256_Update \
				SKEIN512_Init SKEIN512_Final SKEIN512_Update \
				SKEIN1024_Init SKEIN1024_Final SKEIN1024_Update
	CFLAGS+= -D${sym}=__${sym}			CFLAGS+= -D${sym}=__${sym}
	.endfor			.endfor

	WARNS?= 2			WARNS?= 2

	PRECIOUSLIB=			PRECIOUSLIB=

	.if ${MK_TESTS} != "no"			.if ${MK_TESTS} != "no"
	SUBDIR+= tests			SUBDIR+= tests
	.endif			.endif

	.include <bsd.lib.mk>			.include <bsd.lib.mk>
	.include <bsd.subdir.mk>			.include <bsd.subdir.mk>