5f521d7ba7
glibc has a pretty nice function called crypt_r(3), which is nothing more than crypt(3), but thread-safe. It accomplishes this by introducing a 'struct crypt_data' structure that contains a buffer that is large enough to hold the resulting string. Let's go ahead and also add this function. It would be a shame if a useful function like this wouldn't be usable in multithreaded apps. Refactor crypt.c and all of the backends to no longer declare static arrays, but write their output in a provided buffer. There is no need to do any buffer length computation here, as we'll just need to ensure that 'struct crypt_data' is large enough, which it is. _PASSWORD_LEN is defined to 128 bytes, but in this case I'm picking 256, as this is going to be part of the actual ABI. Differential Revision: https://reviews.freebsd.org/D7306
52 lines
1.2 KiB
Makefile
52 lines
1.2 KiB
Makefile
#
|
|
# $FreeBSD$
|
|
#
|
|
|
|
PACKAGE=lib${LIB}
|
|
SHLIBDIR?= /lib
|
|
|
|
.include <src.opts.mk>
|
|
|
|
SHLIB_MAJOR= 5
|
|
LIB= crypt
|
|
|
|
.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
|
|
MAN= crypt.3
|
|
MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_r.3 \
|
|
crypt.3 crypt_set_format.3
|
|
CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil \
|
|
-I${.CURDIR}/../../sys/crypto/sha2
|
|
|
|
# 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_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
|
|
CFLAGS+= -D${sym}=__${sym}
|
|
.endfor
|
|
|
|
WARNS?= 2
|
|
|
|
PRECIOUSLIB=
|
|
|
|
.if ${MK_TESTS} != "no"
|
|
SUBDIR+= tests
|
|
.endif
|
|
|
|
.include <bsd.lib.mk>
|
|
.include <bsd.subdir.mk>
|