d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ossl: Add support for ETA mode

Browse Source 
Now that the AES-CBC is supported we can handle ETA requests.

Sponsored by:		Stormshield
Obtained from:		Semihalf
Reviewed by:		jhb
Differential revision:	https://reviews.freebsd.org/D32100
This commit is contained in:
Kornel Duleba 2021-11-02 12:57:20 +01:00 committed by Wojciech Macek
parent 197ff4c35b
commit c4026909bd
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/crypto/openssl/ossl.c
View File

@ -172,6 +172,13 @@ 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:
@ -268,6 +275,10 @@ 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);
@ -341,6 +352,25 @@ ossl_process_hash(struct ossl_session *s, struct cryptop *crp,
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)
{
@ -366,6 +396,9 @@ 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);