From nobody Sat Nov 6 16:46:18 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F3FD7184F244; Sat, 6 Nov 2021 16:46:18 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hmjty6Z7Hz3JMl; Sat, 6 Nov 2021 16:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C252B6BC5; Sat, 6 Nov 2021 16:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A6GkIoH036878; Sat, 6 Nov 2021 16:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A6GkIj4036877; Sat, 6 Nov 2021 16:46:18 GMT (envelope-from git) Date: Sat, 6 Nov 2021 16:46:18 GMT Message-Id: <202111061646.1A6GkIj4036877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: 0dedcdaa1a02 - main - Revert "ossl: Add support for ETA mode" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dedcdaa1a023d46c8951f03cd2f9df7ae025675 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=0dedcdaa1a023d46c8951f03cd2f9df7ae025675 commit 0dedcdaa1a023d46c8951f03cd2f9df7ae025675 Author: Wojciech Macek AuthorDate: 2021-11-06 16:45:50 +0000 Commit: Wojciech Macek CommitDate: 2021-11-06 16:45:50 +0000 Revert "ossl: Add support for ETA mode" This reverts commit 048a71b46e816de8fb95b553a8ad0e98c0d51e12. --- sys/crypto/openssl/ossl.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/sys/crypto/openssl/ossl.c b/sys/crypto/openssl/ossl.c index f41ff09c371d..f46b5a966bb1 100644 --- a/sys/crypto/openssl/ossl.c +++ b/sys/crypto/openssl/ossl.c @@ -172,13 +172,6 @@ ossl_probesession(device_t dev, const struct crypto_session_params *csp) if (ossl_lookup_cipher(csp) == NULL) return (EINVAL); break; - case CSP_MODE_ETA: - if (!sc->has_aes || - csp->csp_cipher_alg == CRYPTO_CHACHA20 || - ossl_lookup_hash(csp) == NULL || - ossl_lookup_cipher(csp) == NULL) - return (EINVAL); - break; case CSP_MODE_AEAD: switch (csp->csp_cipher_alg) { case CRYPTO_CHACHA20_POLY1305: @@ -275,10 +268,6 @@ ossl_newsession(device_t dev, crypto_session_t cses, case CSP_MODE_CIPHER: error = ossl_newsession_cipher(s, csp); break; - case CSP_MODE_ETA: - ossl_newsession_hash(s, csp); - error = ossl_newsession_cipher(s, csp); - break; } return (error); @@ -352,25 +341,6 @@ out: return (error); } -static int -ossl_process_eta(struct ossl_session *s, struct cryptop *crp, - const struct crypto_session_params *csp) -{ - int error; - - if (CRYPTO_OP_IS_ENCRYPT(crp->crp_op)) { - error = s->cipher.cipher->process(&s->cipher, crp, csp); - if (error == 0) - error = ossl_process_hash(s, crp, csp); - } else { - error = ossl_process_hash(s, crp, csp); - if (error == 0) - error = s->cipher.cipher->process(&s->cipher, crp, csp); - } - - return (error); -} - static int ossl_process(device_t dev, struct cryptop *crp, int hint) { @@ -396,9 +366,6 @@ ossl_process(device_t dev, struct cryptop *crp, int hint) case CSP_MODE_CIPHER: error = s->cipher.cipher->process(&s->cipher, crp, csp); break; - case CSP_MODE_ETA: - error = ossl_process_eta(s, crp, csp); - break; case CSP_MODE_AEAD: if (CRYPTO_OP_IS_ENCRYPT(crp->crp_op)) error = ossl_chacha20_poly1305_encrypt(crp, csp);