Attachment #164980 for bug #205817

Lines 1-8 Link Here

(-)sysutils/pefs-kmod/files/patch-module-Makefile (-5 / +5 lines)
1	--- sys/modules/pefs/Makefile.orig	1	--- sys/modules/pefs/Makefile.orig 2016-01-02 20:56:14.022985989 -0800
2	+++ sys/modules/pefs/Makefile	2	+++ sys/modules/pefs/Makefile 2016-01-02 20:56:14.022942963 -0800
3	@@ -8,7 +8,7 @@	3	@@ -12,7 +12,7 @@ SRCS= vnode_if.h \
4	pefs_dircache.c \	4	pefs_xts.c vmac.c \
5	pefs_xts.c vmac.c	5	crypto_verify_bytes.c hmac_sha512.c pbkdf2_hmac_sha512.c
6		6
7	-.if ${MACHINE_CPUARCH} == "i386" \|\| ${MACHINE_CPUARCH} == "amd64"	7	-.if ${MACHINE_CPUARCH} == "i386" \|\| ${MACHINE_CPUARCH} == "amd64"
8	+.if defined(PEFS_AESNI)	8	+.if defined(PEFS_AESNI)




--- lib/libpam/modules/pam_pefs/Makefile.orig	2016-01-02 20:56:14.018824922 -0800
+++ lib/libpam/modules/pam_pefs/Makefile	2016-01-02 20:56:14.018641165 -0800
@@ -9,7 +9,7 @@ MAN=	pam_pefs.8
 SRCS=	pam_pefs.c
 SRCS+=	pefs_key.c pefs_keychain.c pefs_subr.c
 SRCS+=	rijndael-api.c rijndael-api-fst.c rijndael-alg-fst.c
-SRCS+=	sha2.c
+SRCS+=	sha512c.c
 SRCS+=  hmac_sha512.c
 SRCS+=  pbkdf2_hmac_sha512.c
 SRCS+=  crypto_verify_bytes.c
@@ -29,3 +29,6 @@ LDADD= -lutil
 .PATH: ${SYS}/crypto
 .PATH: ${SYS}/crypto/rijndael
 .PATH: ${SYS}/crypto/hmac ${SYS}/crypto/pbkdf2 ${SYS}/crypto/sha2
+
+# Fix build without OBJDIR for shared components
+.NOPATH: ${OBJS}




--- sys/crypto/sha2/sha512.h.orig	2016-01-02 20:56:36.617839406 -0800
+++ sys/crypto/sha2/sha512.h	2016-01-02 20:56:45.852867552 -0800
@@ -0,0 +1,90 @@
+/*-
+ * Copyright 2005 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: head/sys/crypto/sha2/sha512.h 292782 2015-12-27 17:33:59Z allanjude $
+ */
+
+#ifndef _SHA512_H_
+#define _SHA512_H_
+
+#ifndef _KERNEL
+#include <sys/types.h>
+#endif
+
+#define SHA512_BLOCK_LENGTH		128
+#define SHA512_DIGEST_LENGTH		64
+#define SHA512_DIGEST_STRING_LENGTH	(SHA512_DIGEST_LENGTH * 2 + 1)
+
+typedef struct SHA512Context {
+	uint64_t state[8];
+	uint64_t count[2];
+	uint8_t buf[SHA512_BLOCK_LENGTH];
+} SHA512_CTX;
+
+__BEGIN_DECLS
+
+/* Ensure libmd symbols do not clash with libcrypto */
+#ifndef SHA512_Init
+#define SHA512_Init		_libmd_SHA512_Init
+#endif
+#ifndef SHA512_Update
+#define SHA512_Update		_libmd_SHA512_Update
+#endif
+#ifndef SHA512_Final
+#define SHA512_Final		_libmd_SHA512_Final
+#endif
+#ifndef SHA512_End
+#define SHA512_End		_libmd_SHA512_End
+#endif
+#ifndef SHA512_File
+#define SHA512_File		_libmd_SHA512_File
+#endif
+#ifndef SHA512_FileChunk
+#define SHA512_FileChunk	_libmd_SHA512_FileChunk
+#endif
+#ifndef SHA512_Data
+#define SHA512_Data		_libmd_SHA512_Data
+#endif
+
+#ifndef SHA512_Transform
+#define SHA512_Transform	_libmd_SHA512_Transform
+#endif
+#ifndef SHA512_version
+#define SHA512_version		_libmd_SHA512_version
+#endif
+
+void	SHA512_Init(SHA512_CTX *);
+void	SHA512_Update(SHA512_CTX *, const void *, size_t);
+void	SHA512_Final(unsigned char [SHA512_DIGEST_LENGTH], SHA512_CTX *);
+#ifndef _KERNEL
+char   *SHA512_End(SHA512_CTX *, char *);
+char   *SHA512_Data(const void *, unsigned int, char *);
+char   *SHA512_File(const char *, char *);
+char   *SHA512_FileChunk(const char *, char *, off_t, off_t);
+#endif
+
+__END_DECLS
+
+#endif /* !_SHA512_H_ */




--- sys/crypto/sha2/sha512c.c.orig	2016-01-02 20:58:37.852083334 -0800
+++ sys/crypto/sha2/sha512c.c	2016-01-02 20:58:37.852042707 -0800
@@ -0,0 +1,397 @@
+/*-
+ * Copyright 2005 Colin Percival
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: head/sys/crypto/sha2/sha512c.c 292782 2015-12-27 17:33:59Z allanjude $");
+
+#include <sys/endian.h>
+#include <sys/types.h>
+
+#ifdef _KERNEL
+#include <sys/systm.h>
+#else
+#include <string.h>
+#endif
+
+#include "sha512.h"
+#include "sha384.h"
+
+#if BYTE_ORDER == BIG_ENDIAN
+
+/* Copy a vector of big-endian uint64_t into a vector of bytes */
+#define be64enc_vect(dst, src, len)	\
+	memcpy((void *)dst, (const void *)src, (size_t)len)
+
+/* Copy a vector of bytes into a vector of big-endian uint64_t */
+#define be64dec_vect(dst, src, len)	\
+	memcpy((void *)dst, (const void *)src, (size_t)len)
+
+#else /* BYTE_ORDER != BIG_ENDIAN */
+
+/*
+ * Encode a length len/4 vector of (uint64_t) into a length len vector of
+ * (unsigned char) in big-endian form.  Assumes len is a multiple of 8.
+ */
+static void
+be64enc_vect(unsigned char *dst, const uint64_t *src, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len / 8; i++)
+		be64enc(dst + i * 8, src[i]);
+}
+
+/*
+ * Decode a big-endian length len vector of (unsigned char) into a length
+ * len/4 vector of (uint64_t).  Assumes len is a multiple of 8.
+ */
+static void
+be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len / 8; i++)
+		dst[i] = be64dec(src + i * 8);
+}
+
+#endif /* BYTE_ORDER != BIG_ENDIAN */
+
+/* Elementary functions used by SHA512 */
+#define Ch(x, y, z)	((x & (y ^ z)) ^ z)
+#define Maj(x, y, z)	((x & (y | z)) | (y & z))
+#define SHR(x, n)	(x >> n)
+#define ROTR(x, n)	((x >> n) | (x << (64 - n)))
+#define S0(x)		(ROTR(x, 28) ^ ROTR(x, 34) ^ ROTR(x, 39))
+#define S1(x)		(ROTR(x, 14) ^ ROTR(x, 18) ^ ROTR(x, 41))
+#define s0(x)		(ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7))
+#define s1(x)		(ROTR(x, 19) ^ ROTR(x, 61) ^ SHR(x, 6))
+
+/* SHA512 round function */
+#define RND(a, b, c, d, e, f, g, h, k)			\
+	t0 = h + S1(e) + Ch(e, f, g) + k;		\
+	t1 = S0(a) + Maj(a, b, c);			\
+	d += t0;					\
+	h  = t0 + t1;
+
+/* Adjusted round function for rotating state */
+#define RNDr(S, W, i, k)			\
+	RND(S[(80 - i) % 8], S[(81 - i) % 8],	\
+	    S[(82 - i) % 8], S[(83 - i) % 8],	\
+	    S[(84 - i) % 8], S[(85 - i) % 8],	\
+	    S[(86 - i) % 8], S[(87 - i) % 8],	\
+	    W[i] + k)
+
+/*
+ * SHA512 block compression function.  The 512-bit state is transformed via
+ * the 512-bit input block to produce a new state.
+ */
+static void
+SHA512_Transform(uint64_t * state, const unsigned char block[SHA512_BLOCK_LENGTH])
+{
+	uint64_t W[80];
+	uint64_t S[8];
+	uint64_t t0, t1;
+	int i;
+
+	/* 1. Prepare message schedule W. */
+	be64dec_vect(W, block, SHA512_BLOCK_LENGTH);
+	for (i = 16; i < 80; i++)
+		W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16];
+
+	/* 2. Initialize working variables. */
+	memcpy(S, state, SHA512_DIGEST_LENGTH);
+
+	/* 3. Mix. */
+	RNDr(S, W, 0, 0x428a2f98d728ae22ULL);
+	RNDr(S, W, 1, 0x7137449123ef65cdULL);
+	RNDr(S, W, 2, 0xb5c0fbcfec4d3b2fULL);
+	RNDr(S, W, 3, 0xe9b5dba58189dbbcULL);
+	RNDr(S, W, 4, 0x3956c25bf348b538ULL);
+	RNDr(S, W, 5, 0x59f111f1b605d019ULL);
+	RNDr(S, W, 6, 0x923f82a4af194f9bULL);
+	RNDr(S, W, 7, 0xab1c5ed5da6d8118ULL);
+	RNDr(S, W, 8, 0xd807aa98a3030242ULL);
+	RNDr(S, W, 9, 0x12835b0145706fbeULL);
+	RNDr(S, W, 10, 0x243185be4ee4b28cULL);
+	RNDr(S, W, 11, 0x550c7dc3d5ffb4e2ULL);
+	RNDr(S, W, 12, 0x72be5d74f27b896fULL);
+	RNDr(S, W, 13, 0x80deb1fe3b1696b1ULL);
+	RNDr(S, W, 14, 0x9bdc06a725c71235ULL);
+	RNDr(S, W, 15, 0xc19bf174cf692694ULL);
+	RNDr(S, W, 16, 0xe49b69c19ef14ad2ULL);
+	RNDr(S, W, 17, 0xefbe4786384f25e3ULL);
+	RNDr(S, W, 18, 0x0fc19dc68b8cd5b5ULL);
+	RNDr(S, W, 19, 0x240ca1cc77ac9c65ULL);
+	RNDr(S, W, 20, 0x2de92c6f592b0275ULL);
+	RNDr(S, W, 21, 0x4a7484aa6ea6e483ULL);
+	RNDr(S, W, 22, 0x5cb0a9dcbd41fbd4ULL);
+	RNDr(S, W, 23, 0x76f988da831153b5ULL);
+	RNDr(S, W, 24, 0x983e5152ee66dfabULL);
+	RNDr(S, W, 25, 0xa831c66d2db43210ULL);
+	RNDr(S, W, 26, 0xb00327c898fb213fULL);
+	RNDr(S, W, 27, 0xbf597fc7beef0ee4ULL);
+	RNDr(S, W, 28, 0xc6e00bf33da88fc2ULL);
+	RNDr(S, W, 29, 0xd5a79147930aa725ULL);
+	RNDr(S, W, 30, 0x06ca6351e003826fULL);
+	RNDr(S, W, 31, 0x142929670a0e6e70ULL);
+	RNDr(S, W, 32, 0x27b70a8546d22ffcULL);
+	RNDr(S, W, 33, 0x2e1b21385c26c926ULL);
+	RNDr(S, W, 34, 0x4d2c6dfc5ac42aedULL);
+	RNDr(S, W, 35, 0x53380d139d95b3dfULL);
+	RNDr(S, W, 36, 0x650a73548baf63deULL);
+	RNDr(S, W, 37, 0x766a0abb3c77b2a8ULL);
+	RNDr(S, W, 38, 0x81c2c92e47edaee6ULL);
+	RNDr(S, W, 39, 0x92722c851482353bULL);
+	RNDr(S, W, 40, 0xa2bfe8a14cf10364ULL);
+	RNDr(S, W, 41, 0xa81a664bbc423001ULL);
+	RNDr(S, W, 42, 0xc24b8b70d0f89791ULL);
+	RNDr(S, W, 43, 0xc76c51a30654be30ULL);
+	RNDr(S, W, 44, 0xd192e819d6ef5218ULL);
+	RNDr(S, W, 45, 0xd69906245565a910ULL);
+	RNDr(S, W, 46, 0xf40e35855771202aULL);
+	RNDr(S, W, 47, 0x106aa07032bbd1b8ULL);
+	RNDr(S, W, 48, 0x19a4c116b8d2d0c8ULL);
+	RNDr(S, W, 49, 0x1e376c085141ab53ULL);
+	RNDr(S, W, 50, 0x2748774cdf8eeb99ULL);
+	RNDr(S, W, 51, 0x34b0bcb5e19b48a8ULL);
+	RNDr(S, W, 52, 0x391c0cb3c5c95a63ULL);
+	RNDr(S, W, 53, 0x4ed8aa4ae3418acbULL);
+	RNDr(S, W, 54, 0x5b9cca4f7763e373ULL);
+	RNDr(S, W, 55, 0x682e6ff3d6b2b8a3ULL);
+	RNDr(S, W, 56, 0x748f82ee5defb2fcULL);
+	RNDr(S, W, 57, 0x78a5636f43172f60ULL);
+	RNDr(S, W, 58, 0x84c87814a1f0ab72ULL);
+	RNDr(S, W, 59, 0x8cc702081a6439ecULL);
+	RNDr(S, W, 60, 0x90befffa23631e28ULL);
+	RNDr(S, W, 61, 0xa4506cebde82bde9ULL);
+	RNDr(S, W, 62, 0xbef9a3f7b2c67915ULL);
+	RNDr(S, W, 63, 0xc67178f2e372532bULL);
+	RNDr(S, W, 64, 0xca273eceea26619cULL);
+	RNDr(S, W, 65, 0xd186b8c721c0c207ULL);
+	RNDr(S, W, 66, 0xeada7dd6cde0eb1eULL);
+	RNDr(S, W, 67, 0xf57d4f7fee6ed178ULL);
+	RNDr(S, W, 68, 0x06f067aa72176fbaULL);
+	RNDr(S, W, 69, 0x0a637dc5a2c898a6ULL);
+	RNDr(S, W, 70, 0x113f9804bef90daeULL);
+	RNDr(S, W, 71, 0x1b710b35131c471bULL);
+	RNDr(S, W, 72, 0x28db77f523047d84ULL);
+	RNDr(S, W, 73, 0x32caab7b40c72493ULL);
+	RNDr(S, W, 74, 0x3c9ebe0a15c9bebcULL);
+	RNDr(S, W, 75, 0x431d67c49c100d4cULL);
+	RNDr(S, W, 76, 0x4cc5d4becb3e42b6ULL);
+	RNDr(S, W, 77, 0x597f299cfc657e2aULL);
+	RNDr(S, W, 78, 0x5fcb6fab3ad6faecULL);
+	RNDr(S, W, 79, 0x6c44198c4a475817ULL);
+
+	/* 4. Mix local working variables into global state */
+	for (i = 0; i < 8; i++)
+		state[i] += S[i];
+}
+
+static unsigned char PAD[SHA512_BLOCK_LENGTH] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/* Add padding and terminating bit-count. */
+static void
+SHA512_Pad(SHA512_CTX * ctx)
+{
+	unsigned char len[16];
+	uint64_t r, plen;
+
+	/*
+	 * Convert length to a vector of bytes -- we do this now rather
+	 * than later because the length will change after we pad.
+	 */
+	be64enc_vect(len, ctx->count, 16);
+
+	/* Add 1--128 bytes so that the resulting length is 112 mod 128 */
+	r = (ctx->count[1] >> 3) & 0x7f;
+	plen = (r < 112) ? (112 - r) : (240 - r);
+	SHA512_Update(ctx, PAD, (size_t)plen);
+
+	/* Add the terminating bit-count */
+	SHA512_Update(ctx, len, 16);
+}
+
+/* SHA-512 initialization.  Begins a SHA-512 operation. */
+void
+SHA512_Init(SHA512_CTX * ctx)
+{
+
+	/* Zero bits processed so far */
+	ctx->count[0] = ctx->count[1] = 0;
+
+	/* Magic initialization constants */
+	ctx->state[0] = 0x6a09e667f3bcc908ULL;
+	ctx->state[1] = 0xbb67ae8584caa73bULL;
+	ctx->state[2] = 0x3c6ef372fe94f82bULL;
+	ctx->state[3] = 0xa54ff53a5f1d36f1ULL;
+	ctx->state[4] = 0x510e527fade682d1ULL;
+	ctx->state[5] = 0x9b05688c2b3e6c1fULL;
+	ctx->state[6] = 0x1f83d9abfb41bd6bULL;
+	ctx->state[7] = 0x5be0cd19137e2179ULL;
+}
+
+/* Add bytes into the hash */
+void
+SHA512_Update(SHA512_CTX * ctx, const void *in, size_t len)
+{
+	uint64_t bitlen[2];
+	uint64_t r;
+	const unsigned char *src = in;
+
+	/* Number of bytes left in the buffer from previous updates */
+	r = (ctx->count[1] >> 3) & 0x7f;
+
+	/* Convert the length into a number of bits */
+	bitlen[1] = ((uint64_t)len) << 3;
+	bitlen[0] = ((uint64_t)len) >> 61;
+
+	/* Update number of bits */
+	if ((ctx->count[1] += bitlen[1]) < bitlen[1])
+		ctx->count[0]++;
+	ctx->count[0] += bitlen[0];
+
+	/* Handle the case where we don't need to perform any transforms */
+	if (len < SHA512_BLOCK_LENGTH - r) {
+		memcpy(&ctx->buf[r], src, len);
+		return;
+	}
+
+	/* Finish the current block */
+	memcpy(&ctx->buf[r], src, SHA512_BLOCK_LENGTH - r);
+	SHA512_Transform(ctx->state, ctx->buf);
+	src += SHA512_BLOCK_LENGTH - r;
+	len -= SHA512_BLOCK_LENGTH - r;
+
+	/* Perform complete blocks */
+	while (len >= SHA512_BLOCK_LENGTH) {
+		SHA512_Transform(ctx->state, src);
+		src += SHA512_BLOCK_LENGTH;
+		len -= SHA512_BLOCK_LENGTH;
+	}
+
+	/* Copy left over data into buffer */
+	memcpy(ctx->buf, src, len);
+}
+
+/*
+ * SHA-512 finalization.  Pads the input data, exports the hash value,
+ * and clears the context state.
+ */
+void
+SHA512_Final(unsigned char digest[SHA512_DIGEST_LENGTH], SHA512_CTX * ctx)
+{
+
+	/* Add padding */
+	SHA512_Pad(ctx);
+
+	/* Write the hash */
+	be64enc_vect(digest, ctx->state, SHA512_DIGEST_LENGTH);
+
+	/* Clear the context state */
+	memset((void *)ctx, 0, sizeof(*ctx));
+}
+
+/*** SHA-384: *********************************************************/
+/*
+ * the SHA384 and SHA512 transforms are identical, so SHA384 is skipped
+ */
+
+/* SHA-384 initialization.  Begins a SHA-384 operation. */
+void
+SHA384_Init(SHA384_CTX * ctx)
+{
+
+	/* Zero bits processed so far */
+	ctx->count[0] = ctx->count[1] = 0;
+
+	/* Magic initialization constants */
+	ctx->state[0] = 0xcbbb9d5dc1059ed8ULL;
+	ctx->state[1] = 0x629a292a367cd507ULL;
+	ctx->state[2] = 0x9159015a3070dd17ULL;
+	ctx->state[3] = 0x152fecd8f70e5939ULL;
+	ctx->state[4] = 0x67332667ffc00b31ULL;
+	ctx->state[5] = 0x8eb44a8768581511ULL;
+	ctx->state[6] = 0xdb0c2e0d64f98fa7ULL;
+	ctx->state[7] = 0x47b5481dbefa4fa4ULL;
+}
+
+/* Add bytes into the SHA-384 hash */
+void
+SHA384_Update(SHA384_CTX * ctx, const void *in, size_t len)
+{
+
+	SHA512_Update((SHA512_CTX *)ctx, in, len);
+}
+
+/*
+ * SHA-384 finalization.  Pads the input data, exports the hash value,
+ * and clears the context state.
+ */
+void
+SHA384_Final(unsigned char digest[SHA384_DIGEST_LENGTH], SHA384_CTX * ctx)
+{
+
+	/* Add padding */
+	SHA512_Pad((SHA512_CTX *)ctx);
+
+	/* Write the hash */
+	be64enc_vect(digest, ctx->state, SHA384_DIGEST_LENGTH);
+
+	/* Clear the context state */
+	memset((void *)ctx, 0, sizeof(*ctx));
+}
+
+#ifdef WEAK_REFS
+/* When building libmd, provide weak references. Note: this is not
+   activated in the context of compiling these sources for internal
+   use in libcrypt.
+ */
+#undef SHA512_Init
+__weak_reference(_libmd_SHA512_Init, SHA512_Init);
+#undef SHA512_Update
+__weak_reference(_libmd_SHA512_Update, SHA512_Update);
+#undef SHA512_Final
+__weak_reference(_libmd_SHA512_Final, SHA512_Final);
+#undef SHA512_Transform
+__weak_reference(_libmd_SHA512_Transform, SHA512_Transform);
+
+#undef SHA384_Init
+__weak_reference(_libmd_SHA384_Init, SHA384_Init);
+#undef SHA384_Update
+__weak_reference(_libmd_SHA384_Update, SHA384_Update);
+#undef SHA384_Final
+__weak_reference(_libmd_SHA384_Final, SHA384_Final);
+#endif

Return to bug 205817

Lines 1-9 Link Here

(-)sysutils/pefs-kmod/files/patch-pam_pefs-Makefile (-5 / +14 lines)
1	--- lib/libpam/modules/pam_pefs/Makefile.orig 2013-10-13 11:08:05.000000000 -0700	1	--- lib/libpam/modules/pam_pefs/Makefile.orig 2016-01-02 20:56:14.018824922 -0800
2	+++ lib/libpam/modules/pam_pefs/Makefile 2013-10-13 11:08:33.000000000 -0700	2	+++ lib/libpam/modules/pam_pefs/Makefile 2016-01-02 20:56:14.018641165 -0800
3	@@ -26,3 +26,6 @@	3	@@ -9,7 +9,7 @@ MAN= pam_pefs.8
4	.PATH: ${SYS}/fs/pefs	4	SRCS= pam_pefs.c
		5	SRCS+= pefs_key.c pefs_keychain.c pefs_subr.c
		6	SRCS+= rijndael-api.c rijndael-api-fst.c rijndael-alg-fst.c
		7	-SRCS+= sha2.c
		8	+SRCS+= sha512c.c
		9	SRCS+= hmac_sha512.c
		10	SRCS+= pbkdf2_hmac_sha512.c
		11	SRCS+= crypto_verify_bytes.c
		12	@@ -29,3 +29,6 @@ LDADD= -lutil
		13	.PATH: ${SYS}/crypto
5	.PATH: ${SYS}/crypto/rijndael	14	.PATH: ${SYS}/crypto/rijndael
6	.PATH: ${SYS}/crypto/sha2	15	.PATH: ${SYS}/crypto/hmac ${SYS}/crypto/pbkdf2 ${SYS}/crypto/sha2
7	+	16	+
8	+# Fix build without OBJDIR for shared components	17	+# Fix build without OBJDIR for shared components
9	+.NOPATH: ${OBJS}	18	+.NOPATH: ${OBJS}

Line 0 Link Here

(-)sysutils/pefs-kmod/files/patch-sys_crypto_sha2_sha512.h (+93 lines)
		1	--- sys/crypto/sha2/sha512.h.orig 2016-01-02 20:56:36.617839406 -0800
		2	+++ sys/crypto/sha2/sha512.h 2016-01-02 20:56:45.852867552 -0800
		3	@@ -0,0 +1,90 @@
		4	+/*-
		5	+ * Copyright 2005 Colin Percival
		6	+ * All rights reserved.
		7	+ *
		8	+ * Redistribution and use in source and binary forms, with or without
		9	+ * modification, are permitted provided that the following conditions
		10	+ * are met:
		11	+ * 1. Redistributions of source code must retain the above copyright
		12	+ * notice, this list of conditions and the following disclaimer.
		13	+ * 2. Redistributions in binary form must reproduce the above copyright
		14	+ * notice, this list of conditions and the following disclaimer in the
		15	+ * documentation and/or other materials provided with the distribution.
		16	+ *
		17	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
		18	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		19	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		20	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
		21	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
		22	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
		23	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		24	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
		25	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
		26	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		27	+ * SUCH DAMAGE.
		28	+ *
		29	+ * $FreeBSD: head/sys/crypto/sha2/sha512.h 292782 2015-12-27 17:33:59Z allanjude $
		30	+ */
		31	+
		32	+#ifndef _SHA512_H_
		33	+#define _SHA512_H_
		34	+
		35	+#ifndef _KERNEL
		36	+#include <sys/types.h>
		37	+#endif
		38	+
		39	+#define SHA512_BLOCK_LENGTH 128
		40	+#define SHA512_DIGEST_LENGTH 64
		41	+#define SHA512_DIGEST_STRING_LENGTH (SHA512_DIGEST_LENGTH * 2 + 1)
		42	+
		43	+typedef struct SHA512Context {
		44	+ uint64_t state[8];
		45	+ uint64_t count[2];
		46	+ uint8_t buf[SHA512_BLOCK_LENGTH];
		47	+} SHA512_CTX;
		48	+
		49	+__BEGIN_DECLS
		50	+
		51	+/* Ensure libmd symbols do not clash with libcrypto */
		52	+#ifndef SHA512_Init
		53	+#define SHA512_Init _libmd_SHA512_Init
		54	+#endif
		55	+#ifndef SHA512_Update
		56	+#define SHA512_Update _libmd_SHA512_Update
		57	+#endif
		58	+#ifndef SHA512_Final
		59	+#define SHA512_Final _libmd_SHA512_Final
		60	+#endif
		61	+#ifndef SHA512_End
		62	+#define SHA512_End _libmd_SHA512_End
		63	+#endif
		64	+#ifndef SHA512_File
65	+#define SHA512_File _libmd_SHA512_File
66	+#endif
67	+#ifndef SHA512_FileChunk
68	+#define SHA512_FileChunk _libmd_SHA512_FileChunk
69	+#endif
70	+#ifndef SHA512_Data
71	+#define SHA512_Data _libmd_SHA512_Data
72	+#endif
73	+
74	+#ifndef SHA512_Transform
75	+#define SHA512_Transform _libmd_SHA512_Transform
76	+#endif
77	+#ifndef SHA512_version
78	+#define SHA512_version _libmd_SHA512_version
79	+#endif
80	+
81	+void SHA512_Init(SHA512_CTX *);
82	+void SHA512_Update(SHA512_CTX , const void , size_t);
83	+void SHA512_Final(unsigned char [SHA512_DIGEST_LENGTH], SHA512_CTX *);
84	+#ifndef _KERNEL
85	+char SHA512_End(SHA512_CTX , char *);
86	+char SHA512_Data(const void , unsigned int, char *);
87	+char SHA512_File(const char , char *);
88	+char SHA512_FileChunk(const char , char *, off_t, off_t);
89	+#endif
90	+
91	+__END_DECLS
92	+
93	+#endif /* !_SHA512_H_ */

Line 0 Link Here

(-)sysutils/pefs-kmod/files/patch-sys_crypto_sha2_sha512c.c (+400 lines)
		1	--- sys/crypto/sha2/sha512c.c.orig 2016-01-02 20:58:37.852083334 -0800
		2	+++ sys/crypto/sha2/sha512c.c 2016-01-02 20:58:37.852042707 -0800
		3	@@ -0,0 +1,397 @@
		4	+/*-
		5	+ * Copyright 2005 Colin Percival
		6	+ * All rights reserved.
		7	+ *
		8	+ * Redistribution and use in source and binary forms, with or without
		9	+ * modification, are permitted provided that the following conditions
		10	+ * are met:
		11	+ * 1. Redistributions of source code must retain the above copyright
		12	+ * notice, this list of conditions and the following disclaimer.
		13	+ * 2. Redistributions in binary form must reproduce the above copyright
		14	+ * notice, this list of conditions and the following disclaimer in the
		15	+ * documentation and/or other materials provided with the distribution.
		16	+ *
		17	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
		18	+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		19	+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		20	+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
		21	+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
		22	+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
		23	+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		24	+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
		25	+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
		26	+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		27	+ * SUCH DAMAGE.
		28	+ */
		29	+
		30	+#include <sys/cdefs.h>
		31	+__FBSDID("$FreeBSD: head/sys/crypto/sha2/sha512c.c 292782 2015-12-27 17:33:59Z allanjude $");
		32	+
		33	+#include <sys/endian.h>
		34	+#include <sys/types.h>
		35	+
		36	+#ifdef _KERNEL
		37	+#include <sys/systm.h>
		38	+#else
		39	+#include <string.h>
		40	+#endif
		41	+
		42	+#include "sha512.h"
		43	+#include "sha384.h"
		44	+
		45	+#if BYTE_ORDER == BIG_ENDIAN
		46	+
		47	+/* Copy a vector of big-endian uint64_t into a vector of bytes */
		48	+#define be64enc_vect(dst, src, len) \
		49	+ memcpy((void )dst, (const void )src, (size_t)len)
		50	+
		51	+/* Copy a vector of bytes into a vector of big-endian uint64_t */
		52	+#define be64dec_vect(dst, src, len) \
		53	+ memcpy((void )dst, (const void )src, (size_t)len)
		54	+
		55	+#else /* BYTE_ORDER != BIG_ENDIAN */
		56	+
		57	+/*
		58	+ * Encode a length len/4 vector of (uint64_t) into a length len vector of
		59	+ * (unsigned char) in big-endian form. Assumes len is a multiple of 8.
		60	+ */
		61	+static void
		62	+be64enc_vect(unsigned char dst, const uint64_t src, size_t len)
		63	+{
		64	+ size_t i;
65	+
66	+ for (i = 0; i < len / 8; i++)
67	+ be64enc(dst + i * 8, src[i]);
68	+}
69	+
70	+/*
71	+ * Decode a big-endian length len vector of (unsigned char) into a length
72	+ * len/4 vector of (uint64_t). Assumes len is a multiple of 8.
73	+ */
74	+static void
75	+be64dec_vect(uint64_t dst, const unsigned char src, size_t len)
76	+{
77	+ size_t i;
78	+
79	+ for (i = 0; i < len / 8; i++)
80	+ dst[i] = be64dec(src + i * 8);
81	+}
82	+
83	+#endif /* BYTE_ORDER != BIG_ENDIAN */
84	+
85	+/* Elementary functions used by SHA512 */
86	+#define Ch(x, y, z) ((x & (y ^ z)) ^ z)
87	+#define Maj(x, y, z) ((x & (y \| z)) \| (y & z))
88	+#define SHR(x, n) (x >> n)
89	+#define ROTR(x, n) ((x >> n) \| (x << (64 - n)))
90	+#define S0(x) (ROTR(x, 28) ^ ROTR(x, 34) ^ ROTR(x, 39))
91	+#define S1(x) (ROTR(x, 14) ^ ROTR(x, 18) ^ ROTR(x, 41))
92	+#define s0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7))
93	+#define s1(x) (ROTR(x, 19) ^ ROTR(x, 61) ^ SHR(x, 6))
94	+
95	+/* SHA512 round function */
96	+#define RND(a, b, c, d, e, f, g, h, k) \
97	+ t0 = h + S1(e) + Ch(e, f, g) + k; \
98	+ t1 = S0(a) + Maj(a, b, c); \
99	+ d += t0; \
100	+ h = t0 + t1;
101	+
102	+/* Adjusted round function for rotating state */
103	+#define RNDr(S, W, i, k) \
104	+ RND(S[(80 - i) % 8], S[(81 - i) % 8], \
105	+ S[(82 - i) % 8], S[(83 - i) % 8], \
106	+ S[(84 - i) % 8], S[(85 - i) % 8], \
107	+ S[(86 - i) % 8], S[(87 - i) % 8], \
108	+ W[i] + k)
109	+
110	+/*
111	+ * SHA512 block compression function. The 512-bit state is transformed via
112	+ * the 512-bit input block to produce a new state.
113	+ */
114	+static void
115	+SHA512_Transform(uint64_t * state, const unsigned char block[SHA512_BLOCK_LENGTH])
116	+{
117	+ uint64_t W[80];
118	+ uint64_t S[8];
119	+ uint64_t t0, t1;
120	+ int i;
121	+
122	+ /* 1. Prepare message schedule W. */
123	+ be64dec_vect(W, block, SHA512_BLOCK_LENGTH);
124	+ for (i = 16; i < 80; i++)
125	+ W[i] = s1(W[i - 2]) + W[i - 7] + s0(W[i - 15]) + W[i - 16];
126	+
127	+ /* 2. Initialize working variables. */
128	+ memcpy(S, state, SHA512_DIGEST_LENGTH);
129	+
130	+ /* 3. Mix. */
131	+ RNDr(S, W, 0, 0x428a2f98d728ae22ULL);
132	+ RNDr(S, W, 1, 0x7137449123ef65cdULL);
133	+ RNDr(S, W, 2, 0xb5c0fbcfec4d3b2fULL);
134	+ RNDr(S, W, 3, 0xe9b5dba58189dbbcULL);
135	+ RNDr(S, W, 4, 0x3956c25bf348b538ULL);
136	+ RNDr(S, W, 5, 0x59f111f1b605d019ULL);
137	+ RNDr(S, W, 6, 0x923f82a4af194f9bULL);
138	+ RNDr(S, W, 7, 0xab1c5ed5da6d8118ULL);
139	+ RNDr(S, W, 8, 0xd807aa98a3030242ULL);
140	+ RNDr(S, W, 9, 0x12835b0145706fbeULL);
141	+ RNDr(S, W, 10, 0x243185be4ee4b28cULL);
142	+ RNDr(S, W, 11, 0x550c7dc3d5ffb4e2ULL);
143	+ RNDr(S, W, 12, 0x72be5d74f27b896fULL);
144	+ RNDr(S, W, 13, 0x80deb1fe3b1696b1ULL);
145	+ RNDr(S, W, 14, 0x9bdc06a725c71235ULL);
146	+ RNDr(S, W, 15, 0xc19bf174cf692694ULL);
147	+ RNDr(S, W, 16, 0xe49b69c19ef14ad2ULL);
148	+ RNDr(S, W, 17, 0xefbe4786384f25e3ULL);
149	+ RNDr(S, W, 18, 0x0fc19dc68b8cd5b5ULL);
150	+ RNDr(S, W, 19, 0x240ca1cc77ac9c65ULL);
151	+ RNDr(S, W, 20, 0x2de92c6f592b0275ULL);
152	+ RNDr(S, W, 21, 0x4a7484aa6ea6e483ULL);
153	+ RNDr(S, W, 22, 0x5cb0a9dcbd41fbd4ULL);
154	+ RNDr(S, W, 23, 0x76f988da831153b5ULL);
155	+ RNDr(S, W, 24, 0x983e5152ee66dfabULL);
156	+ RNDr(S, W, 25, 0xa831c66d2db43210ULL);
157	+ RNDr(S, W, 26, 0xb00327c898fb213fULL);
158	+ RNDr(S, W, 27, 0xbf597fc7beef0ee4ULL);
159	+ RNDr(S, W, 28, 0xc6e00bf33da88fc2ULL);
160	+ RNDr(S, W, 29, 0xd5a79147930aa725ULL);
161	+ RNDr(S, W, 30, 0x06ca6351e003826fULL);
162	+ RNDr(S, W, 31, 0x142929670a0e6e70ULL);
163	+ RNDr(S, W, 32, 0x27b70a8546d22ffcULL);
164	+ RNDr(S, W, 33, 0x2e1b21385c26c926ULL);
165	+ RNDr(S, W, 34, 0x4d2c6dfc5ac42aedULL);
166	+ RNDr(S, W, 35, 0x53380d139d95b3dfULL);
167	+ RNDr(S, W, 36, 0x650a73548baf63deULL);
168	+ RNDr(S, W, 37, 0x766a0abb3c77b2a8ULL);
169	+ RNDr(S, W, 38, 0x81c2c92e47edaee6ULL);
170	+ RNDr(S, W, 39, 0x92722c851482353bULL);
171	+ RNDr(S, W, 40, 0xa2bfe8a14cf10364ULL);
172	+ RNDr(S, W, 41, 0xa81a664bbc423001ULL);
173	+ RNDr(S, W, 42, 0xc24b8b70d0f89791ULL);
174	+ RNDr(S, W, 43, 0xc76c51a30654be30ULL);
175	+ RNDr(S, W, 44, 0xd192e819d6ef5218ULL);
176	+ RNDr(S, W, 45, 0xd69906245565a910ULL);
177	+ RNDr(S, W, 46, 0xf40e35855771202aULL);
178	+ RNDr(S, W, 47, 0x106aa07032bbd1b8ULL);
179	+ RNDr(S, W, 48, 0x19a4c116b8d2d0c8ULL);
180	+ RNDr(S, W, 49, 0x1e376c085141ab53ULL);
181	+ RNDr(S, W, 50, 0x2748774cdf8eeb99ULL);
182	+ RNDr(S, W, 51, 0x34b0bcb5e19b48a8ULL);
183	+ RNDr(S, W, 52, 0x391c0cb3c5c95a63ULL);
184	+ RNDr(S, W, 53, 0x4ed8aa4ae3418acbULL);
185	+ RNDr(S, W, 54, 0x5b9cca4f7763e373ULL);
186	+ RNDr(S, W, 55, 0x682e6ff3d6b2b8a3ULL);
187	+ RNDr(S, W, 56, 0x748f82ee5defb2fcULL);
188	+ RNDr(S, W, 57, 0x78a5636f43172f60ULL);
189	+ RNDr(S, W, 58, 0x84c87814a1f0ab72ULL);
190	+ RNDr(S, W, 59, 0x8cc702081a6439ecULL);
191	+ RNDr(S, W, 60, 0x90befffa23631e28ULL);
192	+ RNDr(S, W, 61, 0xa4506cebde82bde9ULL);
193	+ RNDr(S, W, 62, 0xbef9a3f7b2c67915ULL);
194	+ RNDr(S, W, 63, 0xc67178f2e372532bULL);
195	+ RNDr(S, W, 64, 0xca273eceea26619cULL);
196	+ RNDr(S, W, 65, 0xd186b8c721c0c207ULL);
197	+ RNDr(S, W, 66, 0xeada7dd6cde0eb1eULL);
198	+ RNDr(S, W, 67, 0xf57d4f7fee6ed178ULL);
199	+ RNDr(S, W, 68, 0x06f067aa72176fbaULL);
200	+ RNDr(S, W, 69, 0x0a637dc5a2c898a6ULL);
201	+ RNDr(S, W, 70, 0x113f9804bef90daeULL);
202	+ RNDr(S, W, 71, 0x1b710b35131c471bULL);
203	+ RNDr(S, W, 72, 0x28db77f523047d84ULL);
204	+ RNDr(S, W, 73, 0x32caab7b40c72493ULL);
205	+ RNDr(S, W, 74, 0x3c9ebe0a15c9bebcULL);
206	+ RNDr(S, W, 75, 0x431d67c49c100d4cULL);
207	+ RNDr(S, W, 76, 0x4cc5d4becb3e42b6ULL);
208	+ RNDr(S, W, 77, 0x597f299cfc657e2aULL);
209	+ RNDr(S, W, 78, 0x5fcb6fab3ad6faecULL);
210	+ RNDr(S, W, 79, 0x6c44198c4a475817ULL);
211	+
212	+ /* 4. Mix local working variables into global state */
213	+ for (i = 0; i < 8; i++)
214	+ state[i] += S[i];
215	+}
216	+
217	+static unsigned char PAD[SHA512_BLOCK_LENGTH] = {
218	+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
219	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
220	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
221	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
222	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
223	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
224	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
225	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
226	+};
227	+
228	+/* Add padding and terminating bit-count. */
229	+static void
230	+SHA512_Pad(SHA512_CTX * ctx)
231	+{
232	+ unsigned char len[16];
233	+ uint64_t r, plen;
234	+
235	+ /*
236	+ * Convert length to a vector of bytes -- we do this now rather
237	+ * than later because the length will change after we pad.
238	+ */
239	+ be64enc_vect(len, ctx->count, 16);
240	+
241	+ /* Add 1--128 bytes so that the resulting length is 112 mod 128 */
242	+ r = (ctx->count[1] >> 3) & 0x7f;
243	+ plen = (r < 112) ? (112 - r) : (240 - r);
244	+ SHA512_Update(ctx, PAD, (size_t)plen);
245	+
246	+ /* Add the terminating bit-count */
247	+ SHA512_Update(ctx, len, 16);
248	+}
249	+
250	+/* SHA-512 initialization. Begins a SHA-512 operation. */
251	+void
252	+SHA512_Init(SHA512_CTX * ctx)
253	+{
254	+
255	+ /* Zero bits processed so far */
256	+ ctx->count[0] = ctx->count[1] = 0;
257	+
258	+ /* Magic initialization constants */
259	+ ctx->state[0] = 0x6a09e667f3bcc908ULL;
260	+ ctx->state[1] = 0xbb67ae8584caa73bULL;
261	+ ctx->state[2] = 0x3c6ef372fe94f82bULL;
262	+ ctx->state[3] = 0xa54ff53a5f1d36f1ULL;
263	+ ctx->state[4] = 0x510e527fade682d1ULL;
264	+ ctx->state[5] = 0x9b05688c2b3e6c1fULL;
265	+ ctx->state[6] = 0x1f83d9abfb41bd6bULL;
266	+ ctx->state[7] = 0x5be0cd19137e2179ULL;
267	+}
268	+
269	+/* Add bytes into the hash */
270	+void
271	+SHA512_Update(SHA512_CTX * ctx, const void *in, size_t len)
272	+{
273	+ uint64_t bitlen[2];
274	+ uint64_t r;
275	+ const unsigned char *src = in;
276	+
277	+ /* Number of bytes left in the buffer from previous updates */
278	+ r = (ctx->count[1] >> 3) & 0x7f;
279	+
280	+ /* Convert the length into a number of bits */
281	+ bitlen[1] = ((uint64_t)len) << 3;
282	+ bitlen[0] = ((uint64_t)len) >> 61;
283	+
284	+ /* Update number of bits */
285	+ if ((ctx->count[1] += bitlen[1]) < bitlen[1])
286	+ ctx->count[0]++;
287	+ ctx->count[0] += bitlen[0];
288	+
289	+ /* Handle the case where we don't need to perform any transforms */
290	+ if (len < SHA512_BLOCK_LENGTH - r) {
291	+ memcpy(&ctx->buf[r], src, len);
292	+ return;
293	+ }
294	+
295	+ /* Finish the current block */
296	+ memcpy(&ctx->buf[r], src, SHA512_BLOCK_LENGTH - r);
297	+ SHA512_Transform(ctx->state, ctx->buf);
298	+ src += SHA512_BLOCK_LENGTH - r;
299	+ len -= SHA512_BLOCK_LENGTH - r;
300	+
301	+ /* Perform complete blocks */
302	+ while (len >= SHA512_BLOCK_LENGTH) {
303	+ SHA512_Transform(ctx->state, src);
304	+ src += SHA512_BLOCK_LENGTH;
305	+ len -= SHA512_BLOCK_LENGTH;
306	+ }
307	+
308	+ /* Copy left over data into buffer */
309	+ memcpy(ctx->buf, src, len);
310	+}
311	+
312	+/*
313	+ * SHA-512 finalization. Pads the input data, exports the hash value,
314	+ * and clears the context state.
315	+ */
316	+void
317	+SHA512_Final(unsigned char digest[SHA512_DIGEST_LENGTH], SHA512_CTX * ctx)
318	+{
319	+
320	+ /* Add padding */
321	+ SHA512_Pad(ctx);
322	+
323	+ /* Write the hash */
324	+ be64enc_vect(digest, ctx->state, SHA512_DIGEST_LENGTH);
325	+
326	+ /* Clear the context state */
327	+ memset((void )ctx, 0, sizeof(ctx));
328	+}
329	+
330	+/* SHA-384: *******************************************************/
331	+/*
332	+ * the SHA384 and SHA512 transforms are identical, so SHA384 is skipped
333	+ */
334	+
335	+/* SHA-384 initialization. Begins a SHA-384 operation. */
336	+void
337	+SHA384_Init(SHA384_CTX * ctx)
338	+{
339	+
340	+ /* Zero bits processed so far */
341	+ ctx->count[0] = ctx->count[1] = 0;
342	+
343	+ /* Magic initialization constants */
344	+ ctx->state[0] = 0xcbbb9d5dc1059ed8ULL;
345	+ ctx->state[1] = 0x629a292a367cd507ULL;
346	+ ctx->state[2] = 0x9159015a3070dd17ULL;
347	+ ctx->state[3] = 0x152fecd8f70e5939ULL;
348	+ ctx->state[4] = 0x67332667ffc00b31ULL;
349	+ ctx->state[5] = 0x8eb44a8768581511ULL;
350	+ ctx->state[6] = 0xdb0c2e0d64f98fa7ULL;
351	+ ctx->state[7] = 0x47b5481dbefa4fa4ULL;
352	+}
353	+
354	+/* Add bytes into the SHA-384 hash */
355	+void
356	+SHA384_Update(SHA384_CTX * ctx, const void *in, size_t len)
357	+{
358	+
359	+ SHA512_Update((SHA512_CTX *)ctx, in, len);
360	+}
361	+
362	+/*
363	+ * SHA-384 finalization. Pads the input data, exports the hash value,
364	+ * and clears the context state.
365	+ */
366	+void
367	+SHA384_Final(unsigned char digest[SHA384_DIGEST_LENGTH], SHA384_CTX * ctx)
368	+{
369	+
370	+ /* Add padding */
371	+ SHA512_Pad((SHA512_CTX *)ctx);
372	+
373	+ /* Write the hash */
374	+ be64enc_vect(digest, ctx->state, SHA384_DIGEST_LENGTH);
375	+
376	+ /* Clear the context state */
377	+ memset((void )ctx, 0, sizeof(ctx));
378	+}
379	+
380	+#ifdef WEAK_REFS
381	+/* When building libmd, provide weak references. Note: this is not
382	+ activated in the context of compiling these sources for internal
383	+ use in libcrypt.
384	+ */
385	+#undef SHA512_Init
386	+__weak_reference(_libmd_SHA512_Init, SHA512_Init);
387	+#undef SHA512_Update
388	+__weak_reference(_libmd_SHA512_Update, SHA512_Update);
389	+#undef SHA512_Final
390	+__weak_reference(_libmd_SHA512_Final, SHA512_Final);
391	+#undef SHA512_Transform
392	+__weak_reference(_libmd_SHA512_Transform, SHA512_Transform);
393	+
394	+#undef SHA384_Init
395	+__weak_reference(_libmd_SHA384_Init, SHA384_Init);
396	+#undef SHA384_Update
397	+__weak_reference(_libmd_SHA384_Update, SHA384_Update);
398	+#undef SHA384_Final
399	+__weak_reference(_libmd_SHA384_Final, SHA384_Final);
400	+#endif