From owner-svn-src-head@freebsd.org Mon May 25 23:20:34 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 3BEE12CE61D; Mon, 25 May 2020 23:20:34 +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 49WCkV0w0Sz3bK4; Mon, 25 May 2020 23:20:34 +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 1641B1A021; Mon, 25 May 2020 23:20:34 +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 04PNKXt1043112; Mon, 25 May 2020 23:20:33 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04PNKXeY043111; Mon, 25 May 2020 23:20:33 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202005252320.04PNKXeY043111@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 25 May 2020 23:20:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361490 - head/sys/dev/sec X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/dev/sec X-SVN-Commit-Revision: 361490 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: Mon, 25 May 2020 23:20:34 -0000 Author: jhb Date: Mon May 25 23:20:33 2020 New Revision: 361490 URL: https://svnweb.freebsd.org/changeset/base/361490 Log: Update sec(4) for separate output buffers changes in r361481. This does not add support for separate output buffers but updates the driver to cope with the changes. Pointy hat to: jhb Modified: head/sys/dev/sec/sec.c Modified: head/sys/dev/sec/sec.c ============================================================================== --- head/sys/dev/sec/sec.c Mon May 25 23:12:49 2020 (r361489) +++ head/sys/dev/sec/sec.c Mon May 25 23:20:33 2020 (r361490) @@ -842,14 +842,14 @@ sec_desc_map_dma(struct sec_softc *sc, struct sec_dma_ if (dma_mem->dma_vaddr != NULL) return (EBUSY); - switch (crp->crp_buf_type) { + switch (crp->crp_buf.cb_type) { case CRYPTO_BUF_CONTIG: break; case CRYPTO_BUF_UIO: size = SEC_FREE_LT_CNT(sc) * SEC_MAX_DMA_BLOCK_SIZE; break; case CRYPTO_BUF_MBUF: - size = m_length(crp->crp_mbuf, NULL); + size = m_length(crp->crp_buf.cb_mbuf, NULL); break; default: return (EINVAL); @@ -1245,7 +1245,7 @@ sec_process(device_t dev, struct cryptop *crp, int hin csp = crypto_get_params(crp->crp_session); /* Check for input length */ - if (crp->crp_ilen > SEC_MAX_DMA_BLOCK_SIZE) { + if (crypto_buffer_len(&crp->crp_buf) > SEC_MAX_DMA_BLOCK_SIZE) { crp->crp_etype = E2BIG; crypto_done(crp); return (0);