diff options
| author | allanjude <allanjude@FreeBSD.org> | 2016-06-01 20:55:25 +0000 |
|---|---|---|
| committer | allanjude <allanjude@FreeBSD.org> | 2016-06-01 20:55:25 +0000 |
| commit | f402b7a826a4f12953487b45e0de71ce57280dbe (patch) | |
| tree | 2633832eb6fde7d41eebf84d658bb98138d6a889 /lib/libcrypt | |
| parent | d9384217a1b33ae8e1f3c9f6eaf0cfbfd2dd9114 (diff) | |
| download | FreeBSD-src-f402b7a826a4f12953487b45e0de71ce57280dbe.zip FreeBSD-src-f402b7a826a4f12953487b45e0de71ce57280dbe.tar.gz | |
Skein was not meant to be connected to libcrypto
It is not a password hashing algorithm
Reported by: cem
Diffstat (limited to 'lib/libcrypt')
| -rw-r--r-- | lib/libcrypt/Makefile | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 2a59b3b..3b982a3 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -10,25 +10,16 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 5 LIB= crypt -.PATH: ${.CURDIR}/../libmd ${.CURDIR}/../../sys/crypto/sha2 ${.CURDIR}/../../sys/crypto/skein +.PATH: ${.CURDIR}/../libmd ${.CURDIR}/../../sys/crypto/sha2 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 \ - skein.c skein_block.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 \ - -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 + -I${.CURDIR}/../../sys/crypto/sha2 # Pull in the strong crypto, if it is present. .if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no" @@ -43,10 +34,7 @@ CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH SHA512_224_Init SHA512_224_Final SHA512_224_Update \ SHA512_256_Init SHA512_256_Final SHA512_256_Update \ SHA384_Init SHA384_Final SHA384_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 + SHA512_Init SHA512_Final SHA512_Update CFLAGS+= -D${sym}=__${sym} .endfor |
