crypto/openssl: fix AEAD parameters
authorPablo de Lara <pablo.de.lara.guarch@intel.com>
Thu, 21 Sep 2017 13:11:17 +0000 (14:11 +0100)
committerPablo de Lara <pablo.de.lara.guarch@intel.com>
Thu, 12 Oct 2017 14:15:21 +0000 (15:15 +0100)
When using AES-GCM with OpenSSL, cipher direction
and authentication operation were being set incorrectly,
as the PMD was looking at the cipher and authentication
transform, instead of the new AEAD.

Fixes: b79e4c00af0e ("cryptodev: use AES-GCM/CCM as AEAD algorithms")
Cc: stable@dpdk.org
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
drivers/crypto/openssl/rte_openssl_pmd.c

index 0c822a4..cc1ec39 100644 (file)
@@ -509,8 +509,15 @@ static int
 openssl_set_session_aead_parameters(struct openssl_session *sess,
                const struct rte_crypto_sym_xform *xform)
 {
-       /* Select cipher direction */
-       sess->cipher.direction = xform->cipher.op;
+       /* Select cipher direction and auth operation */
+       if (xform->aead.op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {
+               sess->cipher.direction = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+               sess->auth.operation = RTE_CRYPTO_AUTH_OP_GENERATE;
+       } else {
+               sess->cipher.direction = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+               sess->auth.operation = RTE_CRYPTO_AUTH_OP_VERIFY;
+       }
+
        /* Select cipher key */
        sess->cipher.key.length = xform->aead.key.length;
 
@@ -518,10 +525,6 @@ openssl_set_session_aead_parameters(struct openssl_session *sess,
        sess->iv.offset = xform->aead.iv.offset;
        sess->iv.length = xform->aead.iv.length;
 
-       /* Select auth generate/verify */
-       sess->auth.operation = xform->auth.op;
-       sess->auth.algo = xform->auth.algo;
-
        /* Select auth algo */
        switch (xform->aead.algo) {
        case RTE_CRYPTO_AEAD_AES_GCM: