From owner-svn-ports-head@freebsd.org Thu Jul 23 23:50:17 2020 Return-Path: Delivered-To: svn-ports-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 2736D36777A; Thu, 23 Jul 2020 23:50:17 +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 4BCTbY0KJMz4KS7; Thu, 23 Jul 2020 23:50:17 +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 E3CF0210CD; Thu, 23 Jul 2020 23:50:16 +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 06NNoGn2064055; Thu, 23 Jul 2020 23:50:16 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06NNoGMk064054; Thu, 23 Jul 2020 23:50:16 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202007232350.06NNoGMk064054@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 23 Jul 2020 23:50:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542975 - head/security/ktls_isa-l_crypto-kmod/files X-SVN-Group: ports-head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/security/ktls_isa-l_crypto-kmod/files X-SVN-Commit-Revision: 542975 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jul 2020 23:50:17 -0000 Author: jhb (src,doc committer) Date: Thu Jul 23 23:50:16 2020 New Revision: 542975 URL: https://svnweb.freebsd.org/changeset/ports/542975 Log: Update security/ktls-isa-l_crypto-kmod to work with KTLS RX API changes. This doesn't enable ISA-L for KTLS RX, just fixes the module to compile after the change to the "try" function's API. Reviewed by: gallatin (maintainer) Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D25698 Modified: head/security/ktls_isa-l_crypto-kmod/files/intelisa_kern.c Modified: head/security/ktls_isa-l_crypto-kmod/files/intelisa_kern.c ============================================================================== --- head/security/ktls_isa-l_crypto-kmod/files/intelisa_kern.c Thu Jul 23 22:36:20 2020 (r542974) +++ head/security/ktls_isa-l_crypto-kmod/files/intelisa_kern.c Thu Jul 23 23:50:16 2020 (r542975) @@ -284,11 +284,19 @@ ktls_intelisa_free(struct ktls_session *tls) } static int +#if KTLS_API_VERSION >= 7 +ktls_intelisa_try(struct socket *so, struct ktls_session *tls, int direction) +#else ktls_intelisa_try(struct socket *so, struct ktls_session *tls) +#endif { struct isa_gcm_struct *isa; int error; +#if KTLS_API_VERSION >= 7 + if (direction != KTLS_TX) + return (EOPNOTSUPP); +#endif if (ktls_use_intel_isa_gcm && tls->params.cipher_algorithm == CRYPTO_AES_NIST_GCM_16) { isa = malloc(sizeof (*isa), M_INTEL_ISA, M_NOWAIT | M_ZERO);