git: 0dedcdaa1a02 - main - Revert "ossl: Add support for ETA mode"

[Wojciech Macek]

The branch main has been updated by wma:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=0dedcdaa1a023d46c8951f03cd2f9df7ae025675

commit 0dedcdaa1a023d46c8951f03cd2f9df7ae025675
Author:     Wojciech Macek <w...@freebsd.org>
AuthorDate: 2021-11-06 16:45:50 +0000
Commit:     Wojciech Macek <w...@freebsd.org>
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);