From owner-svn-src-all@freebsd.org Wed Jul 18 04:37:15 2018 Return-Path: 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 700621034252; Wed, 18 Jul 2018 04:37:15 +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 210DA88017; Wed, 18 Jul 2018 04:37:15 +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 EF0AC15699; Wed, 18 Jul 2018 04:37:14 +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 w6I4bEdE013780; Wed, 18 Jul 2018 04:37:14 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6I4bECU013779; Wed, 18 Jul 2018 04:37:14 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201807180437.w6I4bECU013779@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Wed, 18 Jul 2018 04:37:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336443 - 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: 336443 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" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2018 04:37:15 -0000 Author: cem Date: Wed Jul 18 04:37:14 2018 New Revision: 336443 URL: https://svnweb.freebsd.org/changeset/base/336443 Log: aesni(4): Add sha256 plain hash support Modified: head/sys/crypto/aesni/aesni.c Modified: head/sys/crypto/aesni/aesni.c ============================================================================== --- head/sys/crypto/aesni/aesni.c Wed Jul 18 04:29:44 2018 (r336442) +++ head/sys/crypto/aesni/aesni.c Wed Jul 18 04:37:14 2018 (r336443) @@ -196,6 +196,7 @@ 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_256, 0, 0); crypto_register(sc->cid, CRYPTO_SHA2_256_HMAC, 0, 0); } return (0); @@ -265,6 +266,7 @@ aesni_newsession(device_t dev, crypto_session_t cses, break; case CRYPTO_SHA1: case CRYPTO_SHA1_HMAC: + case CRYPTO_SHA2_256: case CRYPTO_SHA2_256_HMAC: if (!sc->has_sha) goto unhandled; @@ -350,6 +352,7 @@ 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_256: case CRYPTO_SHA2_256_HMAC: if (authcrd != NULL) { error = EINVAL; @@ -477,6 +480,7 @@ aesni_cipher_setup(struct aesni_session *ses, struct c switch (ses->auth_algo) { case CRYPTO_SHA1: case CRYPTO_SHA1_HMAC: + case CRYPTO_SHA2_256: case CRYPTO_SHA2_256_HMAC: error = aesni_authprepare(ses, authini->cri_klen, authini->cri_key); @@ -858,6 +862,8 @@ aesni_cipher_mac(struct aesni_session *ses, struct cry case CRYPTO_SHA2_256_HMAC: hmac = true; + /* FALLTHROUGH */ + case CRYPTO_SHA2_256: hashlen = SHA2_256_HASH_LEN; InitFn = SHA256_Init_fn; UpdateFn = intel_sha256_update;