From owner-svn-src-all@freebsd.org Wed Jul 18 04:43:19 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1AE7110346CC;
Wed, 18 Jul 2018 04:43:19 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id BDB3A884AB;
Wed, 18 Jul 2018 04:43:18 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9F04715845;
Wed, 18 Jul 2018 04:43:18 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6I4hILd018453;
Wed, 18 Jul 2018 04:43:18 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6I4hIrs018452;
Wed, 18 Jul 2018 04:43:18 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201807180443.w6I4hIrs018452@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
using -f
From: Conrad Meyer <cem@FreeBSD.org>
Date: Wed, 18 Jul 2018 04:43:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r336444 - head/sys/crypto/aesni
X-SVN-Group: head
X-SVN-Commit-Author: cem
X-SVN-Commit-Paths: head/sys/crypto/aesni
X-SVN-Commit-Revision: 336444
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jul 2018 04:43:19 -0000
Author: cem
Date: Wed Jul 18 04:43:18 2018
New Revision: 336444
URL: https://svnweb.freebsd.org/changeset/base/336444
Log:
aesni(4): Add SHA2-224(-HMAC) support as well
Modified:
head/sys/crypto/aesni/aesni.c
Modified: head/sys/crypto/aesni/aesni.c
==============================================================================
--- head/sys/crypto/aesni/aesni.c Wed Jul 18 04:37:14 2018 (r336443)
+++ head/sys/crypto/aesni/aesni.c Wed Jul 18 04:43:18 2018 (r336444)
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
#include <crypto/aesni/aesni.h>
#include <crypto/aesni/sha_sse.h>
#include <crypto/sha1.h>
+#include <crypto/sha2/sha224.h>
#include <crypto/sha2/sha256.h>
#include <opencrypto/cryptodev.h>
@@ -196,6 +197,8 @@ aesni_attach(device_t dev)
if (sc->has_sha) {
crypto_register(sc->cid, CRYPTO_SHA1, 0, 0);
crypto_register(sc->cid, CRYPTO_SHA1_HMAC, 0, 0);
+ crypto_register(sc->cid, CRYPTO_SHA2_224, 0, 0);
+ crypto_register(sc->cid, CRYPTO_SHA2_224_HMAC, 0, 0);
crypto_register(sc->cid, CRYPTO_SHA2_256, 0, 0);
crypto_register(sc->cid, CRYPTO_SHA2_256_HMAC, 0, 0);
}
@@ -266,6 +269,8 @@ aesni_newsession(device_t dev, crypto_session_t cses,
break;
case CRYPTO_SHA1:
case CRYPTO_SHA1_HMAC:
+ case CRYPTO_SHA2_224:
+ case CRYPTO_SHA2_224_HMAC:
case CRYPTO_SHA2_256:
case CRYPTO_SHA2_256_HMAC:
if (!sc->has_sha)
@@ -352,6 +357,8 @@ aesni_process(device_t dev, struct cryptop *crp, int h
case CRYPTO_AES_256_NIST_GMAC:
case CRYPTO_SHA1:
case CRYPTO_SHA1_HMAC:
+ case CRYPTO_SHA2_224:
+ case CRYPTO_SHA2_224_HMAC:
case CRYPTO_SHA2_256:
case CRYPTO_SHA2_256_HMAC:
if (authcrd != NULL) {
@@ -480,6 +487,8 @@ aesni_cipher_setup(struct aesni_session *ses, struct c
switch (ses->auth_algo) {
case CRYPTO_SHA1:
case CRYPTO_SHA1_HMAC:
+ case CRYPTO_SHA2_224:
+ case CRYPTO_SHA2_224_HMAC:
case CRYPTO_SHA2_256:
case CRYPTO_SHA2_256_HMAC:
error = aesni_authprepare(ses, authini->cri_klen,
@@ -600,6 +609,18 @@ intel_sha256_update(void *vctx, const void *vdata, u_i
}
static void
+SHA224_Init_fn(void *ctx)
+{
+ SHA224_Init(ctx);
+}
+
+static void
+SHA224_Finalize_fn(void *digest, void *ctx)
+{
+ SHA224_Final(digest, ctx);
+}
+
+static void
SHA256_Init_fn(void *ctx)
{
SHA256_Init(ctx);
@@ -868,6 +889,17 @@ aesni_cipher_mac(struct aesni_session *ses, struct cry
InitFn = SHA256_Init_fn;
UpdateFn = intel_sha256_update;
FinalizeFn = SHA256_Finalize_fn;
+ ctx = &sctx.sha2;
+ break;
+
+ case CRYPTO_SHA2_224_HMAC:
+ hmac = true;
+ /* FALLTHROUGH */
+ case CRYPTO_SHA2_224:
+ hashlen = SHA2_224_HASH_LEN;
+ InitFn = SHA224_Init_fn;
+ UpdateFn = intel_sha256_update;
+ FinalizeFn = SHA224_Finalize_fn;
ctx = &sctx.sha2;
break;
default: