From nobody Thu Dec 16 22:09:25 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8BA0618D94D1; Thu, 16 Dec 2021 22:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JFR9L0Zdcz3CFY; Thu, 16 Dec 2021 22:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DBFC61051F; Thu, 16 Dec 2021 22:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BGM9PYb089110; Thu, 16 Dec 2021 22:09:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BGM9PSM089109; Thu, 16 Dec 2021 22:09:25 GMT (envelope-from git) Date: Thu, 16 Dec 2021 22:09:25 GMT Message-Id: <202112162209.1BGM9PSM089109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 47fc04958562 - main - crypto: Define POLY1305_BLOCK_LEN constant. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47fc04958562e3a1fca06f9321f89bea3d1dcab7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639692566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90vTh7+/WNqXAoO3U4KGyBk31imk/kUdtCexdbl1QNE=; b=b5+JbPfpYDWJ0PWqWiiAsEFA0JCNYcMZMYEaIRLgNt6b5lNIEuGthCLXeWFjCw7U31g0PE 7BMh8480RlgHPRuzHnla+b8E2Uq/k5pYQPz7dGvKCd7R63wcU6EatKDK2MNvzt5oQBGxtT yfkpd+w6eGv13wkph8v83AQ5o4YjFjOZko3iDK2tnDVmTz+vhYa3yGfJ+cLUkK/miKEOza Zd+Tx5+ZqKpIDYb8+3ObbuCpH4VS1OiHxCwWJJymIXQATH+W++jo4ihA+BQsB71UKq1PHa 5tHPS5CRvQ/pPpuEq4/UF183Ku7cHcqWWMv5HKTB9gVyk9HV3Xe/f4iJaOKYww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639692566; a=rsa-sha256; cv=none; b=KifHRliYpgrU0cRocX3+5xOXTI+YahigoIZFg74KuPX2YUAt66jGRqP6cEycgNAqrZnn5C 6pVpAJI9SsLdDBz2ZLyGJ67Fi7JZ/f08yE2+ldeAQXrwTgMJuill/Q4TR+UkTA1wdRXfHK GuUBe5UH85BolsmM2l+M10xKB6q+Q27KCCZVXovUqQ7DZgH0+nPHRWNT0VHu1766q+ZsYI JBgi3n1ORbpJfK/w9c+FEOxWP0BZLlNlfD+S+f1ykHSNve3voNqeid1awTG/YrvCRjxV2H w6GrR99IC2BgpfAVnfyrk3ICilhCDf9BOk3Vq0fbv3ZoOyj4VvkLuDAM4P9MYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=47fc04958562e3a1fca06f9321f89bea3d1dcab7 commit 47fc04958562e3a1fca06f9321f89bea3d1dcab7 Author: John Baldwin AuthorDate: 2021-12-16 21:47:16 +0000 Commit: John Baldwin CommitDate: 2021-12-16 21:47:16 +0000 crypto: Define POLY1305_BLOCK_LEN constant. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33485 --- sys/opencrypto/cryptodev.h | 1 + sys/opencrypto/xform_poly1305.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h index 6611a8925020..a46ccb71f7f1 100644 --- a/sys/opencrypto/cryptodev.h +++ b/sys/opencrypto/cryptodev.h @@ -95,6 +95,7 @@ #define SHA2_256_BLOCK_LEN 64 #define SHA2_384_BLOCK_LEN 128 #define SHA2_512_BLOCK_LEN 128 +#define POLY1305_BLOCK_LEN 16 /* HMAC values */ #define NULL_HMAC_BLOCK_LEN 64 diff --git a/sys/opencrypto/xform_poly1305.c b/sys/opencrypto/xform_poly1305.c index c885192f9df6..5620c2c42d7d 100644 --- a/sys/opencrypto/xform_poly1305.c +++ b/sys/opencrypto/xform_poly1305.c @@ -14,6 +14,7 @@ CTASSERT(sizeof(union authctx) >= sizeof(struct poly1305_xform_ctx)); CTASSERT(POLY1305_KEY_LEN == crypto_onetimeauth_poly1305_KEYBYTES); CTASSERT(POLY1305_HASH_LEN == crypto_onetimeauth_poly1305_BYTES); +CTASSERT(POLY1305_BLOCK_LEN == crypto_onetimeauth_poly1305_BYTES); static void xform_Poly1305_Init(void *polyctx) @@ -64,7 +65,7 @@ const struct auth_hash auth_hash_poly1305 = { .keysize = POLY1305_KEY_LEN, .hashsize = POLY1305_HASH_LEN, .ctxsize = sizeof(struct poly1305_xform_ctx), - .blocksize = crypto_onetimeauth_poly1305_BYTES, + .blocksize = POLY1305_BLOCK_LEN, .Init = xform_Poly1305_Init, .Setkey = xform_Poly1305_Setkey, .Update = xform_Poly1305_Update,