diff options
| author | avg <avg@FreeBSD.org> | 2017-02-23 16:05:11 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2017-02-23 16:05:11 +0000 |
| commit | 12ca8477ef8b7f6c3222a381d22f2a6c14bdc282 (patch) | |
| tree | 74a3f21df950be6f7e0784cdc61003e1649eb037 /lib | |
| parent | d20dd8b36e7a565be7bfbb22aade51c8ffd753e9 (diff) | |
| download | FreeBSD-src-12ca8477ef8b7f6c3222a381d22f2a6c14bdc282.zip FreeBSD-src-12ca8477ef8b7f6c3222a381d22f2a6c14bdc282.tar.gz | |
MFC r263215,r263218,r285366: replace the kernel sha256 code
r263215 copy these files from lib/libmd in preperation for moving these
files into the kernel...
r263218 replace the kernel's version w/ cperciva's implementation...
r285366 Complete the move that was started w/ r263218..
Note that the last change is out of order with r282726 that I am going
to merge as well.
Many thanks to cperciva for the more efficient code and to jmg for
integrating it into the kernel.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypt/Makefile | 2 | ||||
| -rw-r--r-- | lib/libmd/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 798b4b6..aca24d8 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -9,7 +9,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 5 LIB= crypt -.PATH: ${.CURDIR}/../libmd +.PATH: ${.CURDIR}/../libmd ${.CURDIR}/../../sys/crypto/sha2 SRCS= crypt.c misc.c \ crypt-md5.c md5c.c \ crypt-nthash.c md4c.c \ diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index d0fe705..727fd86 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -43,7 +43,7 @@ CLEANFILES+= md[245]hl.c md[245].ref md[245].3 mddriver \ sha256.ref sha256hl.c sha512.ref sha512hl.c CFLAGS+= -I${.CURDIR} -.PATH: ${.CURDIR}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2 .if exists(${MACHINE_ARCH}/sha.S) SRCS+= sha.S |
