From owner-svn-src-head@freebsd.org Wed Jun 3 22:15:11 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CC0702F4CFB; Wed, 3 Jun 2020 22:15:11 +0000 (UTC) (envelope-from jhb@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49cjrv520nz3byg; Wed, 3 Jun 2020 22:15:11 +0000 (UTC) (envelope-from jhb@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 A7C79152B4; Wed, 3 Jun 2020 22:15:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053MFBjg032044; Wed, 3 Jun 2020 22:15:11 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053MFBib032043; Wed, 3 Jun 2020 22:15:11 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202006032215.053MFBib032043@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 3 Jun 2020 22:15:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361774 - head/sys/crypto/aesni X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/crypto/aesni X-SVN-Commit-Revision: 361774 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 22:15:11 -0000 Author: jhb Date: Wed Jun 3 22:15:11 2020 New Revision: 361774 URL: https://svnweb.freebsd.org/changeset/base/361774 Log: Explicitly zero on-stack IVs, tags, and HMAC keys. Reviewed by: delphij Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D25057 Modified: head/sys/crypto/aesni/aesni.c Modified: head/sys/crypto/aesni/aesni.c ============================================================================== --- head/sys/crypto/aesni/aesni.c Wed Jun 3 22:11:05 2020 (r361773) +++ head/sys/crypto/aesni/aesni.c Wed Jun 3 22:15:11 2020 (r361774) @@ -815,6 +815,8 @@ out: explicit_bzero(outbuf, crp->crp_payload_length); free(outbuf, M_AESNI); } + explicit_bzero(iv, sizeof(iv)); + explicit_bzero(tag, sizeof(tag)); return (error); } @@ -826,9 +828,7 @@ aesni_cipher_mac(struct aesni_session *ses, struct cry struct SHA256Context sha2 __aligned(16); struct sha1_ctxt sha1 __aligned(16); } sctx; - uint8_t hmac_key[SHA1_BLOCK_LEN] __aligned(16); uint32_t res[SHA2_256_HASH_LEN / sizeof(uint32_t)]; - uint32_t res2[SHA2_256_HASH_LEN / sizeof(uint32_t)]; const uint8_t *key; int i, keylen; @@ -839,6 +839,8 @@ aesni_cipher_mac(struct aesni_session *ses, struct cry keylen = csp->csp_auth_klen; if (ses->hmac) { + uint8_t hmac_key[SHA1_BLOCK_LEN] __aligned(16); + /* Inner hash: (K ^ IPAD) || data */ ses->hash_init(&sctx); for (i = 0; i < keylen; i++) @@ -869,6 +871,7 @@ aesni_cipher_mac(struct aesni_session *ses, struct cry ses->hash_update(&sctx, hmac_key, sizeof(hmac_key)); ses->hash_update(&sctx, res, ses->hash_len); ses->hash_finalize(res, &sctx); + explicit_bzero(hmac_key, sizeof(hmac_key)); } else { ses->hash_init(&sctx); @@ -889,10 +892,14 @@ aesni_cipher_mac(struct aesni_session *ses, struct cry } if (crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) { + uint32_t res2[SHA2_256_HASH_LEN / sizeof(uint32_t)]; + crypto_copydata(crp, crp->crp_digest_start, ses->mlen, res2); if (timingsafe_bcmp(res, res2, ses->mlen) != 0) return (EBADMSG); + explicit_bzero(res2, sizeof(res2)); } else crypto_copyback(crp, crp->crp_digest_start, ses->mlen, res); + explicit_bzero(res, sizeof(res)); return (0); }