Update to FreeBSD head 2018-04-01

Git mirror commit 8dfb1ccc26d1cea7e2529303003ff61f9f1784c4.

Update #3472.

4 files changed, 511 insertions, 0 deletions

diff --git a/freebsd/sys/crypto/blake2/blake2-sw.c b/freebsd/sys/crypto/blake2/blake2-sw.c
new file mode 100644
index 00000000..807c1ea9
--- /dev/null
+++ b/freebsd/sys/crypto/blake2/blake2-sw.c
@@ -0,0 +1,165 @@
+#include <machine/rtems-bsd-kernel-space.h>
+
+/* This file is in the public domain. */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <contrib/libb2/blake2.h>
+#include <opencrypto/xform_auth.h>
+
+extern int blake2b_init_ref(blake2b_state *S, size_t outlen);
+extern int blake2b_init_param_ref(blake2b_state *S, const blake2b_param *P);
+extern int blake2b_init_key_ref(blake2b_state *S, size_t outlen,
+    const void *key, size_t keylen);
+extern int blake2b_update_ref(blake2b_state *S, const uint8_t *in,
+    size_t inlen);
+extern int blake2b_final_ref(blake2b_state *S, uint8_t *out, size_t outlen);
+extern int blake2b_ref(uint8_t *out, const void *in, const void *key,
+    size_t outlen, size_t inlen, size_t keylen);
+
+extern int blake2s_init_ref(blake2s_state *S, size_t outlen);
+extern int blake2s_init_param_ref(blake2s_state *S, const blake2s_param *P);
+extern int blake2s_init_key_ref(blake2s_state *S, size_t outlen,
+    const void *key, size_t keylen);
+extern int blake2s_update_ref(blake2s_state *S, const uint8_t *in,
+    size_t inlen);
+extern int blake2s_final_ref(blake2s_state *S, uint8_t *out, size_t outlen);
+extern int blake2s_ref(uint8_t *out, const void *in, const void *key,
+    size_t outlen, size_t inlen, size_t keylen);
+
+struct blake2b_xform_ctx {
+	blake2b_state state;
+	uint8_t key[BLAKE2B_KEYBYTES];
+	uint16_t klen;
+};
+CTASSERT(sizeof(union authctx) >= sizeof(struct blake2b_xform_ctx));
+
+static void
+blake2b_xform_init(void *vctx)
+{
+	struct blake2b_xform_ctx *ctx = vctx;
+	int rc;
+
+	if (ctx->klen > 0)
+		rc = blake2b_init_key_ref(&ctx->state, BLAKE2B_OUTBYTES,
+		    ctx->key, ctx->klen);
+	else
+		rc = blake2b_init_ref(&ctx->state, BLAKE2B_OUTBYTES);
+	if (rc != 0)
+		panic("blake2b_init_key: invalid arguments");
+}
+
+static void
+blake2b_xform_setkey(void *vctx, const uint8_t *key, uint16_t klen)
+{
+	struct blake2b_xform_ctx *ctx = vctx;
+
+	if (klen > sizeof(ctx->key))
+		panic("invalid klen %u", (unsigned)klen);
+	memcpy(ctx->key, key, klen);
+	ctx->klen = klen;
+}
+
+static int
+blake2b_xform_update(void *vctx, const uint8_t *data, uint16_t len)
+{
+	struct blake2b_xform_ctx *ctx = vctx;
+	int rc;
+
+	rc = blake2b_update_ref(&ctx->state, data, len);
+	if (rc != 0)
+		return (EINVAL);
+	return (0);
+}
+
+static void
+blake2b_xform_final(uint8_t *out, void *vctx)
+{
+	struct blake2b_xform_ctx *ctx = vctx;
+	int rc;
+
+	rc = blake2b_final_ref(&ctx->state, out, BLAKE2B_OUTBYTES);
+	if (rc != 0)
+		panic("blake2b_final: invalid");
+}
+
+struct auth_hash auth_hash_blake2b = {
+	.type = CRYPTO_BLAKE2B,
+	.name = "Blake2b",
+	.keysize = BLAKE2B_KEYBYTES,
+	.hashsize = BLAKE2B_OUTBYTES,
+	.ctxsize = sizeof(struct blake2b_xform_ctx),
+	.Setkey = blake2b_xform_setkey,
+	.Init = blake2b_xform_init,
+	.Update = blake2b_xform_update,
+	.Final = blake2b_xform_final,
+};
+
+struct blake2s_xform_ctx {
+	blake2s_state state;
+	uint8_t key[BLAKE2S_KEYBYTES];
+	uint16_t klen;
+};
+CTASSERT(sizeof(union authctx) >= sizeof(struct blake2s_xform_ctx));
+
+static void
+blake2s_xform_init(void *vctx)
+{
+	struct blake2s_xform_ctx *ctx = vctx;
+	int rc;
+
+	if (ctx->klen > 0)
+		rc = blake2s_init_key_ref(&ctx->state, BLAKE2S_OUTBYTES,
+		    ctx->key, ctx->klen);
+	else
+		rc = blake2s_init_ref(&ctx->state, BLAKE2S_OUTBYTES);
+	if (rc != 0)
+		panic("blake2s_init_key: invalid arguments");
+}
+
+static void
+blake2s_xform_setkey(void *vctx, const uint8_t *key, uint16_t klen)
+{
+	struct blake2s_xform_ctx *ctx = vctx;
+
+	if (klen > sizeof(ctx->key))
+		panic("invalid klen %u", (unsigned)klen);
+	memcpy(ctx->key, key, klen);
+	ctx->klen = klen;
+}
+
+static int
+blake2s_xform_update(void *vctx, const uint8_t *data, uint16_t len)
+{
+	struct blake2s_xform_ctx *ctx = vctx;
+	int rc;
+
+	rc = blake2s_update_ref(&ctx->state, data, len);
+	if (rc != 0)
+		return (EINVAL);
+	return (0);
+}
+
+static void
+blake2s_xform_final(uint8_t *out, void *vctx)
+{
+	struct blake2s_xform_ctx *ctx = vctx;
+	int rc;
+
+	rc = blake2s_final_ref(&ctx->state, out, BLAKE2S_OUTBYTES);
+	if (rc != 0)
+		panic("blake2s_final: invalid");
+}
+
+struct auth_hash auth_hash_blake2s = {
+	.type = CRYPTO_BLAKE2S,
+	.name = "Blake2s",
+	.keysize = BLAKE2S_KEYBYTES,
+	.hashsize = BLAKE2S_OUTBYTES,
+	.ctxsize = sizeof(struct blake2s_xform_ctx),
+	.Setkey = blake2s_xform_setkey,
+	.Init = blake2s_xform_init,
+	.Update = blake2s_xform_update,
+	.Final = blake2s_xform_final,
+};
diff --git a/freebsd/sys/crypto/chacha20/chacha-sw.c b/freebsd/sys/crypto/chacha20/chacha-sw.c
new file mode 100644
index 00000000..0a03d91b
--- /dev/null
+++ b/freebsd/sys/crypto/chacha20/chacha-sw.c
@@ -0,0 +1,80 @@
+#include <machine/rtems-bsd-kernel-space.h>
+
+/* This file is in the public domain. */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <crypto/chacha20/chacha.h>
+#include <opencrypto/xform_enc.h>
+
+static int
+chacha20_xform_setkey(u_int8_t **sched, u_int8_t *key, int len)
+{
+	struct chacha_ctx *ctx;
+
+	if (len != CHACHA_MINKEYLEN && len != 32)
+		return (EINVAL);
+
+	ctx = malloc(sizeof(*ctx), M_CRYPTO_DATA, M_NOWAIT | M_ZERO);
+	*sched = (void *)ctx;
+	if (ctx == NULL)
+		return (ENOMEM);
+
+	chacha_keysetup(ctx, key, len * 8);
+	return (0);
+}
+
+static void
+chacha20_xform_reinit(caddr_t key, u_int8_t *iv)
+{
+	struct chacha_ctx *ctx;
+
+	ctx = (void *)key;
+	chacha_ivsetup(ctx, iv + 8, iv);
+}
+
+static void
+chacha20_xform_zerokey(u_int8_t **sched)
+{
+	struct chacha_ctx *ctx;
+
+	ctx = (void *)*sched;
+	explicit_bzero(ctx, sizeof(*ctx));
+	free(ctx, M_CRYPTO_DATA);
+	*sched = NULL;
+}
+
+static void
+chacha20_xform_crypt(caddr_t cctx, u_int8_t *bytes)
+{
+	struct chacha_ctx *ctx;
+
+	ctx = (void *)cctx;
+	chacha_encrypt_bytes(ctx, bytes, bytes, 1);
+}
+
+static void
+chacha20_xform_crypt_multi(void *vctx, uint8_t *bytes, size_t len)
+{
+	struct chacha_ctx *ctx;
+
+	ctx = vctx;
+	chacha_encrypt_bytes(ctx, bytes, bytes, len);
+}
+
+struct enc_xform enc_xform_chacha20 = {
+	.type = CRYPTO_CHACHA20,
+	.name = "chacha20",
+	.blocksize = 1,
+	.ivsize = CHACHA_NONCELEN + CHACHA_CTRLEN,
+	.minkey = CHACHA_MINKEYLEN,
+	.maxkey = 32,
+	.encrypt = chacha20_xform_crypt,
+	.decrypt = chacha20_xform_crypt,
+	.setkey = chacha20_xform_setkey,
+	.zerokey = chacha20_xform_zerokey,
+	.reinit = chacha20_xform_reinit,
+	.encrypt_multi = chacha20_xform_crypt_multi,
+	.decrypt_multi = chacha20_xform_crypt_multi,
+};
diff --git a/freebsd/sys/crypto/chacha20/chacha.c b/freebsd/sys/crypto/chacha20/chacha.c
new file mode 100644
index 00000000..74d7fe02
--- /dev/null
+++ b/freebsd/sys/crypto/chacha20/chacha.c
@@ -0,0 +1,234 @@
+#include <machine/rtems-bsd-kernel-space.h>
+
+/*
+chacha-merged.c version 20080118
+D. J. Bernstein
+Public domain.
+*/
+
+/* $OpenBSD: chacha.c,v 1.1 2013/11/21 00:45:44 djm Exp $ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/types.h>
+
+#include <crypto/chacha20/chacha.h>
+
+
+typedef uint8_t u8;
+typedef uint32_t u32;
+
+typedef struct chacha_ctx chacha_ctx;
+
+#define U8C(v) (v##U)
+#define U32C(v) (v##U)
+
+#define U8V(v) ((u8)(v) & U8C(0xFF))
+#define U32V(v) ((u32)(v) & U32C(0xFFFFFFFF))
+
+#define ROTL32(v, n) \
+  (U32V((v) << (n)) | ((v) >> (32 - (n))))
+
+#define U8TO32_LITTLE(p) \
+  (((u32)((p)[0])      ) | \
+   ((u32)((p)[1]) <<  8) | \
+   ((u32)((p)[2]) << 16) | \
+   ((u32)((p)[3]) << 24))
+
+#define U32TO8_LITTLE(p, v) \
+  do { \
+    (p)[0] = U8V((v)      ); \
+    (p)[1] = U8V((v) >>  8); \
+    (p)[2] = U8V((v) >> 16); \
+    (p)[3] = U8V((v) >> 24); \
+  } while (0)
+
+#define ROTATE(v,c) (ROTL32(v,c))
+#define XOR(v,w) ((v) ^ (w))
+#define PLUS(v,w) (U32V((v) + (w)))
+#define PLUSONE(v) (PLUS((v),1))
+
+#define QUARTERROUND(a,b,c,d) \
+  a = PLUS(a,b); d = ROTATE(XOR(d,a),16); \
+  c = PLUS(c,d); b = ROTATE(XOR(b,c),12); \
+  a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \
+  c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
+
+static const char sigma[16] = "expand 32-byte k";
+static const char tau[16] = "expand 16-byte k";
+
+void
+#ifndef __rtems__
+chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits)
+#else /* __rtems__ */
+chacha_keysetup(chacha_ctx *x,const u8 *k,u_int kbits)
+#endif /* __rtems__ */
+{
+  const char *constants;
+
+  x->input[4] = U8TO32_LITTLE(k + 0);
+  x->input[5] = U8TO32_LITTLE(k + 4);
+  x->input[6] = U8TO32_LITTLE(k + 8);
+  x->input[7] = U8TO32_LITTLE(k + 12);
+  if (kbits == 256) { /* recommended */
+    k += 16;
+    constants = sigma;
+  } else { /* kbits == 128 */
+    constants = tau;
+  }
+  x->input[8] = U8TO32_LITTLE(k + 0);
+  x->input[9] = U8TO32_LITTLE(k + 4);
+  x->input[10] = U8TO32_LITTLE(k + 8);
+  x->input[11] = U8TO32_LITTLE(k + 12);
+  x->input[0] = U8TO32_LITTLE(constants + 0);
+  x->input[1] = U8TO32_LITTLE(constants + 4);
+  x->input[2] = U8TO32_LITTLE(constants + 8);
+  x->input[3] = U8TO32_LITTLE(constants + 12);
+}
+
+void
+chacha_ivsetup(chacha_ctx *x, const u8 *iv, const u8 *counter)
+{
+  x->input[12] = counter == NULL ? 0 : U8TO32_LITTLE(counter + 0);
+  x->input[13] = counter == NULL ? 0 : U8TO32_LITTLE(counter + 4);
+  x->input[14] = U8TO32_LITTLE(iv + 0);
+  x->input[15] = U8TO32_LITTLE(iv + 4);
+}
+
+void
+#ifndef __rtems__
+chacha_encrypt_bytes(chacha_ctx *x,const u8 *m,u8 *c,u32 bytes)
+#else /* __rtems__ */
+chacha_encrypt_bytes(chacha_ctx *x,const u8 *m,u8 *c,u_int bytes)
+#endif /* __rtems__ */
+{
+  u32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15;
+  u32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
+  u8 *ctarget = NULL;
+  u8 tmp[64];
+  u_int i;
+
+  if (!bytes) return;
+
+  j0 = x->input[0];
+  j1 = x->input[1];
+  j2 = x->input[2];
+  j3 = x->input[3];
+  j4 = x->input[4];
+  j5 = x->input[5];
+  j6 = x->input[6];
+  j7 = x->input[7];
+  j8 = x->input[8];
+  j9 = x->input[9];
+  j10 = x->input[10];
+  j11 = x->input[11];
+  j12 = x->input[12];
+  j13 = x->input[13];
+  j14 = x->input[14];
+  j15 = x->input[15];
+
+  for (;;) {
+    if (bytes < 64) {
+      for (i = 0;i < bytes;++i) tmp[i] = m[i];
+      m = tmp;
+      ctarget = c;
+      c = tmp;
+    }
+    x0 = j0;
+    x1 = j1;
+    x2 = j2;
+    x3 = j3;
+    x4 = j4;
+    x5 = j5;
+    x6 = j6;
+    x7 = j7;
+    x8 = j8;
+    x9 = j9;
+    x10 = j10;
+    x11 = j11;
+    x12 = j12;
+    x13 = j13;
+    x14 = j14;
+    x15 = j15;
+    for (i = 20;i > 0;i -= 2) {
+      QUARTERROUND( x0, x4, x8,x12)
+      QUARTERROUND( x1, x5, x9,x13)
+      QUARTERROUND( x2, x6,x10,x14)
+      QUARTERROUND( x3, x7,x11,x15)
+      QUARTERROUND( x0, x5,x10,x15)
+      QUARTERROUND( x1, x6,x11,x12)
+      QUARTERROUND( x2, x7, x8,x13)
+      QUARTERROUND( x3, x4, x9,x14)
+    }
+    x0 = PLUS(x0,j0);
+    x1 = PLUS(x1,j1);
+    x2 = PLUS(x2,j2);
+    x3 = PLUS(x3,j3);
+    x4 = PLUS(x4,j4);
+    x5 = PLUS(x5,j5);
+    x6 = PLUS(x6,j6);
+    x7 = PLUS(x7,j7);
+    x8 = PLUS(x8,j8);
+    x9 = PLUS(x9,j9);
+    x10 = PLUS(x10,j10);
+    x11 = PLUS(x11,j11);
+    x12 = PLUS(x12,j12);
+    x13 = PLUS(x13,j13);
+    x14 = PLUS(x14,j14);
+    x15 = PLUS(x15,j15);
+
+    x0 = XOR(x0,U8TO32_LITTLE(m + 0));
+    x1 = XOR(x1,U8TO32_LITTLE(m + 4));
+    x2 = XOR(x2,U8TO32_LITTLE(m + 8));
+    x3 = XOR(x3,U8TO32_LITTLE(m + 12));
+    x4 = XOR(x4,U8TO32_LITTLE(m + 16));
+    x5 = XOR(x5,U8TO32_LITTLE(m + 20));
+    x6 = XOR(x6,U8TO32_LITTLE(m + 24));
+    x7 = XOR(x7,U8TO32_LITTLE(m + 28));
+    x8 = XOR(x8,U8TO32_LITTLE(m + 32));
+    x9 = XOR(x9,U8TO32_LITTLE(m + 36));
+    x10 = XOR(x10,U8TO32_LITTLE(m + 40));
+    x11 = XOR(x11,U8TO32_LITTLE(m + 44));
+    x12 = XOR(x12,U8TO32_LITTLE(m + 48));
+    x13 = XOR(x13,U8TO32_LITTLE(m + 52));
+    x14 = XOR(x14,U8TO32_LITTLE(m + 56));
+    x15 = XOR(x15,U8TO32_LITTLE(m + 60));
+
+    j12 = PLUSONE(j12);
+    if (!j12) {
+      j13 = PLUSONE(j13);
+      /* stopping at 2^70 bytes per nonce is user's responsibility */
+    }
+
+    U32TO8_LITTLE(c + 0,x0);
+    U32TO8_LITTLE(c + 4,x1);
+    U32TO8_LITTLE(c + 8,x2);
+    U32TO8_LITTLE(c + 12,x3);
+    U32TO8_LITTLE(c + 16,x4);
+    U32TO8_LITTLE(c + 20,x5);
+    U32TO8_LITTLE(c + 24,x6);
+    U32TO8_LITTLE(c + 28,x7);
+    U32TO8_LITTLE(c + 32,x8);
+    U32TO8_LITTLE(c + 36,x9);
+    U32TO8_LITTLE(c + 40,x10);
+    U32TO8_LITTLE(c + 44,x11);
+    U32TO8_LITTLE(c + 48,x12);
+    U32TO8_LITTLE(c + 52,x13);
+    U32TO8_LITTLE(c + 56,x14);
+    U32TO8_LITTLE(c + 60,x15);
+
+    if (bytes <= 64) {
+      if (bytes < 64) {
+        for (i = 0;i < bytes;++i) ctarget[i] = c[i];
+      }
+      x->input[12] = j12;
+      x->input[13] = j13;
+      return;
+    }
+    bytes -= 64;
+    c += 64;
+    m += 64;
+  }
+}
diff --git a/freebsd/sys/crypto/chacha20/chacha.h b/freebsd/sys/crypto/chacha20/chacha.h
new file mode 100644
index 00000000..02106eaa
--- /dev/null
+++ b/freebsd/sys/crypto/chacha20/chacha.h
@@ -0,0 +1,32 @@
+/* $OpenBSD: chacha.h,v 1.4 2016/08/27 04:04:56 guenther Exp $ */
+
+/*
+chacha-merged.c version 20080118
+D. J. Bernstein
+Public domain.
+
+ $FreeBSD$
+*/
+
+#ifndef CHACHA_H
+#define CHACHA_H
+
+#include <sys/types.h>
+
+struct chacha_ctx {
+	u_int input[16];
+};
+
+#define CHACHA_MINKEYLEN 	16
+#define CHACHA_NONCELEN		8
+#define CHACHA_CTRLEN		8
+#define CHACHA_STATELEN		(CHACHA_NONCELEN+CHACHA_CTRLEN)
+#define CHACHA_BLOCKLEN		64
+
+void chacha_keysetup(struct chacha_ctx *x, const u_char *k, u_int kbits);
+void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, const u_char *ctr);
+void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m,
+    u_char *c, u_int bytes);
+
+#endif	/* CHACHA_H */
+