From owner-svn-src-head@freebsd.org  Wed Jun  3 22:18:22 2020
Return-Path: <owner-svn-src-head@freebsd.org>
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 8E5C62F4E55;
 Wed,  3 Jun 2020 22:18:22 +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 49cjwZ2Q9Qz3c8X;
 Wed,  3 Jun 2020 22:18:22 +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 71B1B15492;
 Wed,  3 Jun 2020 22:18:21 +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 053MIL8J032409;
 Wed, 3 Jun 2020 22:18:21 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053MILPO032408;
 Wed, 3 Jun 2020 22:18:21 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <202006032218.053MILPO032408@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 3 Jun 2020 22:18:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r361776 - head/sys/dev/cxgbe/crypto
X-SVN-Group: head
X-SVN-Commit-Author: jhb
X-SVN-Commit-Paths: head/sys/dev/cxgbe/crypto
X-SVN-Commit-Revision: 361776
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jun 2020 22:18:24 -0000

Author: jhb
Date: Wed Jun  3 22:18:21 2020
New Revision: 361776
URL: https://svnweb.freebsd.org/changeset/base/361776

Log:
  Explicitly zero AES key schedules on the stack.
  
  Reviewed by:	delphij
  MFC after:	1 week
  Sponsored by:	Netflix
  Differential Revision:	https://reviews.freebsd.org/D25057

Modified:
  head/sys/dev/cxgbe/crypto/t4_keyctx.c

Modified: head/sys/dev/cxgbe/crypto/t4_keyctx.c
==============================================================================
--- head/sys/dev/cxgbe/crypto/t4_keyctx.c	Wed Jun  3 22:18:15 2020	(r361775)
+++ head/sys/dev/cxgbe/crypto/t4_keyctx.c	Wed Jun  3 22:18:21 2020	(r361776)
@@ -75,6 +75,7 @@ t4_init_gmac_hash(const char *key, int klen, char *gha
 
 	rounds = rijndaelKeySetupEnc(keysched, key, klen * 8);
 	rijndaelEncrypt(keysched, rounds, zeroes, ghash);
+	explicit_bzero(keysched, sizeof(keysched));
 }
 
 /* Copy out the partial hash state from a software hash implementation. */
@@ -169,4 +170,5 @@ t4_aes_getdeckey(void *dec_key, const void *enc_key, u
 		break;
 	}
 	MPASS(dkey == dec_key);
+	explicit_bzero(ek, sizeof(ek));
 }