[lng-odp] [API-NEXT PATCH 12/15] merge fix: odp_crypto_test_inp.c

[Maxim Uvarov]

Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org>
---
 .../validation/api/crypto/odp_crypto_test_inp.c    | 43 ----------------------
 1 file changed, 43 deletions(-)

diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c 
b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index 66d61486..80689387 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -96,7 +96,6 @@ static void alg_test(odp_crypto_op_t op,
        odp_crypto_auth_capability_t   auth_capa[MAX_ALG_CAPA];
        int num, i;
        int found;
-<<<<<<< HEAD
 
        rc = odp_crypto_capability(&capa);
        CU_ASSERT(!rc);
@@ -132,13 +131,10 @@ static void alg_test(odp_crypto_op_t op,
        if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC &&
            !(capa.auths.bit.sha256_hmac))
                rc = -1;
-=======
->>>>>>> v1.13.0.0
 
        CU_ASSERT(!rc);
        CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0);
 
-<<<<<<< HEAD
        num = odp_crypto_cipher_capability(cipher_alg, cipher_capa,
                                           MAX_ALG_CAPA);
 
@@ -148,28 +144,6 @@ static void alg_test(odp_crypto_op_t op,
        } else {
                CU_ASSERT(num == 0);
                found = 1;
-=======
-       if (capability.hw_ciphers.all_bits) {
-               if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC &&
-                   !(capability.hw_ciphers.bit.trides_cbc))
-                       rc = -1;
-               if (cipher_alg == ODP_CIPHER_ALG_AES_CBC &&
-                   !(capability.hw_ciphers.bit.aes_cbc))
-                       rc = -1;
-               if (cipher_alg == ODP_CIPHER_ALG_AES_GCM &&
-                   !(capability.hw_ciphers.bit.aes_gcm))
-                       rc = -1;
-       } else {
-               if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC &&
-                   !(capability.ciphers.bit.trides_cbc))
-                       rc = -1;
-               if (cipher_alg == ODP_CIPHER_ALG_AES_CBC &&
-                   !(capability.ciphers.bit.aes_cbc))
-                       rc = -1;
-               if (cipher_alg == ODP_CIPHER_ALG_AES_GCM &&
-                   !(capability.ciphers.bit.aes_gcm))
-                       rc = -1;
->>>>>>> v1.13.0.0
        }
 
        CU_ASSERT(num <= MAX_ALG_CAPA);
@@ -177,7 +151,6 @@ static void alg_test(odp_crypto_op_t op,
        if (num > MAX_ALG_CAPA)
                num = MAX_ALG_CAPA;
 
-<<<<<<< HEAD
        /* Search for the test case */
        for (i = 0; i < num; i++) {
                if (cipher_capa[i].key_len == cipher_key.length &&
@@ -197,22 +170,6 @@ static void alg_test(odp_crypto_op_t op,
        } else {
                CU_ASSERT(num == 0);
                found = 1;
-=======
-       if (capability.hw_auths.all_bits) {
-               if (auth_alg == ODP_AUTH_ALG_AES_GCM &&
-                   !(capability.hw_auths.bit.aes_gcm))
-                       rc = -1;
-               if (auth_alg == ODP_AUTH_ALG_NULL &&
-                   !(capability.hw_auths.bit.null))
-                       rc = -1;
-       } else {
-               if (auth_alg == ODP_AUTH_ALG_AES_GCM &&
-                   !(capability.auths.bit.aes_gcm))
-                       rc = -1;
-               if (auth_alg == ODP_AUTH_ALG_NULL &&
-                   !(capability.auths.bit.null))
-                       rc = -1;
->>>>>>> v1.13.0.0
        }
 
        CU_ASSERT(num <= MAX_ALG_CAPA);
-- 
2.11.0.295.gd7dffce