New upstream version 18.11-rc1

[deb_dpdk.git] / drivers / crypto / openssl / rte_openssl_pmd_ops.c

diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
index de22843..c2b029e 100644 (file)
--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
@@ -26,9 +26,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .increment = 1
                                },
                                .digest_size = {
-                                       .min = 16,
+                                       .min = 1,
                                        .max = 16,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .iv_size = { 0 }
                        }, }
@@ -68,9 +68,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .increment = 1
                                },
                                .digest_size = {
-                                       .min = 20,
+                                       .min = 1,
                                        .max = 20,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .iv_size = { 0 }
                        }, }
@@ -110,9 +110,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .increment = 1
                                },
                                .digest_size = {
-                                       .min = 28,
+                                       .min = 1,
                                        .max = 28,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .iv_size = { 0 }
                        }, }
@@ -131,9 +131,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .increment = 0
                                },
                                .digest_size = {
-                                       .min = 28,
+                                       .min = 1,
                                        .max = 28,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .iv_size = { 0 }
                        }, }
@@ -152,9 +152,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .increment = 1
                                },
                                .digest_size = {
-                                       .min = 32,
+                                       .min = 1,
                                        .max = 32,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .iv_size = { 0 }
                        }, }
@@ -194,9 +194,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .increment = 1
                                },
                                .digest_size = {
-                                       .min = 48,
+                                       .min = 1,
                                        .max = 48,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .iv_size = { 0 }
                        }, }
@@ -236,9 +236,9 @@ static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
                                        .increment = 1
                                },
                                .digest_size = {
-                                       .min = 64,
+                                       .min = 1,
                                        .max = 64,
-                                       .increment = 0
+                                       .increment = 1
                                },
                                .iv_size = { 0 }
                        }, }
@@ -875,14 +875,14 @@ static int openssl_set_asym_session_parameters(
                                RSA_free(rsa);
                                goto err_rsa;
                        }
-                       set_rsa_params(rsa, p, q, ret);
+                       ret = set_rsa_params(rsa, p, q);
                        if (ret) {
                                OPENSSL_LOG(ERR,
                                        "failed to set rsa params\n");
                                RSA_free(rsa);
                                goto err_rsa;
                        }
-                       set_rsa_crt_params(rsa, dmp1, dmq1, iqmp, ret);
+                       ret = set_rsa_crt_params(rsa, dmp1, dmq1, iqmp);
                        if (ret) {
                                OPENSSL_LOG(ERR,
                                        "failed to set crt params\n");
@@ -896,7 +896,7 @@ static int openssl_set_asym_session_parameters(
                        }
                }
 
-               set_rsa_keys(rsa, n, e, d, ret);
+               ret = set_rsa_keys(rsa, n, e, d);
                if (ret) {
                        OPENSSL_LOG(ERR, "Failed to load rsa keys\n");
                        RSA_free(rsa);
@@ -1005,7 +1005,7 @@ err_rsa:
                                "failed to allocate resources\n");
                        goto err_dh;
                }
-               set_dh_params(dh, p, g, ret);
+               ret = set_dh_params(dh, p, g);
                if (ret) {
                        DH_free(dh);
                        goto err_dh;
@@ -1087,7 +1087,7 @@ err_dh:
                        goto err_dsa;
                }
 
-               set_dsa_params(dsa, p, q, g, ret);
+               ret = set_dsa_params(dsa, p, q, g);
                if (ret) {
                        DSA_free(dsa);
                        OPENSSL_LOG(ERR, "Failed to dsa params\n");
@@ -1101,7 +1101,7 @@ err_dh:
                 * both versions
                 */
                /* just set dummy public for very 1st call */
-               set_dsa_keys(dsa, pub_key, priv_key, ret);
+               ret = set_dsa_keys(dsa, pub_key, priv_key);
                if (ret) {
                        DSA_free(dsa);
                        OPENSSL_LOG(ERR, "Failed to set keys\n");