[API-NEXT,v3,2/3] validation: crypto, ipsec: stop supporting DES operation

Message ID 1514422807-6007-3-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • api: crypto: deprecate DES algorithm
Related show

Commit Message

Github ODP bot Dec. 28, 2017, 1 a.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


RFC 7321 (and RFC 8221) mark single-key DES as 'MUST NOT' be
implemented. Single-key DES is being phased out of ODP, so drop its
support.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 374 (lumag:no-des)
 ** https://github.com/Linaro/odp/pull/374
 ** Patch: https://github.com/Linaro/odp/pull/374.patch
 ** Base sha: a7b46491ca049998dc38b0a5b29213a407931523
 ** Merge commit sha: ff1bca033a3fe0d12c1309ba04b1f9d97d6e95a5
 **/
 test/validation/api/crypto/odp_crypto_test_inp.c | 9 ---------
 test/validation/api/ipsec/ipsec.c                | 4 ----
 2 files changed, 13 deletions(-)

Patch

diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index f1da6989c..0f3f800ac 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -62,8 +62,6 @@  static const char *cipher_alg_name(odp_cipher_alg_t cipher)
 	switch (cipher) {
 	case ODP_CIPHER_ALG_NULL:
 		return "ODP_CIPHER_ALG_NULL";
-	case ODP_CIPHER_ALG_DES:
-		return "ODP_CIPHER_ALG_DES";
 	case ODP_CIPHER_ALG_3DES_CBC:
 		return "ODP_CIPHER_ALG_3DES_CBC";
 	case ODP_CIPHER_ALG_AES_CBC:
@@ -339,9 +337,6 @@  static void alg_test(odp_crypto_op_t op,
 	if (cipher_alg == ODP_CIPHER_ALG_AES_GCM &&
 	    !(capa.ciphers.bit.aes_gcm))
 		rc = -1;
-	if (cipher_alg == ODP_CIPHER_ALG_DES &&
-	    !(capa.ciphers.bit.des))
-		rc = -1;
 	if (cipher_alg == ODP_CIPHER_ALG_NULL &&
 	    !(capa.ciphers.bit.null))
 		rc = -1;
@@ -560,10 +555,6 @@  static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
 		if (!capability.ciphers.bit.null)
 			return ODP_TEST_INACTIVE;
 		break;
-	case ODP_CIPHER_ALG_DES:
-		if (!capability.ciphers.bit.des)
-			return ODP_TEST_INACTIVE;
-		break;
 	case ODP_CIPHER_ALG_3DES_CBC:
 		if (!capability.ciphers.bit.trides_cbc)
 			return ODP_TEST_INACTIVE;
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index ea3cff052..effe6fb02 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -157,10 +157,6 @@  int ipsec_check(odp_bool_t ah,
 		if (!capa.ciphers.bit.null)
 			return ODP_TEST_INACTIVE;
 		break;
-	case ODP_CIPHER_ALG_DES:
-		if (!capa.ciphers.bit.des)
-			return ODP_TEST_INACTIVE;
-		break;
 	case ODP_CIPHER_ALG_3DES_CBC:
 		if (!capa.ciphers.bit.trides_cbc)
 			return ODP_TEST_INACTIVE;