diff mbox series

[2/5] cryptodev: rename fields for Windows compatibility

Message ID 20210915214052.143098-3-dmitry.kozliuk@gmail.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series lib: Windows compatibility renaming |

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Dmitry Kozlyuk Sept. 15, 2021, 9:40 p.m. UTC 
  Windows SDK headers define `min` and `max` macros which break definition
of `struct rte_crypto_param_range`. Rename the structure fields
to `minimum` and `maximum` to allow inclusion of both DPDK and Windows
headers in the same file. Deprecation notice:
https://mails.dpdk.org/archives/dev/2021-July/215270.html

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
 app/test/test_cryptodev_asym.c                |   4 +-
 doc/guides/rel_notes/deprecation.rst          |   3 -
 doc/guides/rel_notes/release_20_11.rst        |   3 +
 drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c  |  28 +-
 .../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c    | 284 +++++-----
 drivers/crypto/armv8/rte_armv8_pmd_ops.c      |  24 +-
 drivers/crypto/bcmfs/bcmfs_sym_capabilities.c | 288 +++++-----
 drivers/crypto/caam_jr/caam_jr_capabilities.c |  88 +--
 drivers/crypto/ccp/ccp_pmd_ops.c              | 208 ++++----
 .../crypto/cnxk/cnxk_cryptodev_capabilities.c | 300 +++++------
 drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h     | 280 +++++-----
 drivers/crypto/dpaa_sec/dpaa_sec.h            | 208 ++++----
 drivers/crypto/kasumi/rte_kasumi_pmd_ops.c    |  16 +-
 drivers/crypto/mlx5/mlx5_crypto.c             |   8 +-
 drivers/crypto/mvsam/rte_mrvl_pmd_ops.c       | 192 +++----
 .../crypto/nitrox/nitrox_sym_capabilities.c   |  56 +-
 drivers/crypto/null/null_crypto_pmd_ops.c     |  12 +-
 .../octeontx/otx_cryptodev_capabilities.c     | 252 ++++-----
 .../octeontx2/otx2_cryptodev_capabilities.c   | 284 +++++-----
 drivers/crypto/openssl/rte_openssl_pmd_ops.c  | 208 ++++----
 drivers/crypto/qat/qat_asym_capabilities.h    |  12 +-
 drivers/crypto/qat/qat_sym_capabilities.h     | 504 +++++++++---------
 .../scheduler/rte_cryptodev_scheduler.c       |  20 +-
 drivers/crypto/snow3g/rte_snow3g_pmd_ops.c    |  20 +-
 .../virtio/virtio_crypto_capabilities.h       |  16 +-
 drivers/crypto/zuc/rte_zuc_pmd_ops.c          |  20 +-
 drivers/net/ixgbe/ixgbe_ipsec.c               |  28 +-
 drivers/net/octeontx2/otx2_ethdev_sec.c       |  32 +-
 drivers/net/txgbe/txgbe_ipsec.c               |  28 +-
 examples/l2fwd-crypto/main.c                  |  66 +--
 lib/cryptodev/rte_cryptodev.c                 |  14 +-
 lib/cryptodev/rte_cryptodev.h                 |   4 +-
 32 files changed, 1755 insertions(+), 1755 deletions(-)
diff mbox series

Patch

diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index 847b074a4f..e138ed0890 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -1041,8 +1041,8 @@  static inline void print_asym_capa(
 		case RTE_CRYPTO_ASYM_XFORM_DH:
 		case RTE_CRYPTO_ASYM_XFORM_DSA:
 			printf(" modlen: min %d max %d increment %d",
-					capa->modlen.min,
-					capa->modlen.max,
+					capa->modlen.minimum,
+					capa->modlen.maximum,
 					capa->modlen.increment);
 		break;
 		case RTE_CRYPTO_ASYM_XFORM_ECDSA:
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 7b848528ff..6d48155b35 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -196,9 +196,6 @@  Deprecation Notices
   and ``rte_vhost_driver_set_protocol_features`` functions will be removed
   and the API functions will be made stable in DPDK 21.11.
 
-* cryptodev: ``min`` and ``max`` fields of ``rte_crypto_param_range`` structure
-  will be renamed in DPDK 21.11 to avoid conflict with Windows Sockets headers.
-
 * cryptodev: The field ``dataunit_len`` of the ``struct rte_crypto_cipher_xform``
   has a limited size ``uint16_t``.
   It will be moved and extended as ``uint32_t`` in DPDK 21.11.
diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
index d93790c3b1..3eb30f855c 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -665,6 +665,9 @@  API Changes
 * compressdev: Renamed ``min`` and ``max`` fields of ``rte_param_log2_range``
   structure to ``minimum`` and ``maximum``, respectively.
 
+* cryptodev: Renamed ``min`` and ``max`` fields of ``rte_crypto_param_range``
+  structure to ``minimum`` and ``maximum``, respectively.
+
 
 ABI Changes
 -----------
diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
index 18dbc4c18c..e75082dd8f 100644
--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c
@@ -19,18 +19,18 @@  static const struct rte_cryptodev_capabilities aesni_gcm_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_GMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -44,23 +44,23 @@  static const struct rte_cryptodev_capabilities aesni_gcm_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 65535,
+					.minimum = 0,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
index fc7fdfec8e..f572ad2da7 100644
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
@@ -22,13 +22,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -43,13 +43,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 65535,
+					.minimum = 1,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 20,
+					.minimum = 1,
+					.maximum = 20,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -64,13 +64,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 20,
+					.minimum = 1,
+					.maximum = 20,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -85,13 +85,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 65535,
+					.minimum = 1,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 28,
+					.minimum = 1,
+					.maximum = 28,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -106,13 +106,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 28,
+					.minimum = 1,
+					.maximum = 28,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -127,13 +127,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 65535,
+					.minimum = 1,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 32,
+					.minimum = 1,
+					.maximum = 32,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -148,13 +148,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 32,
+					.minimum = 1,
+					.maximum = 32,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -169,13 +169,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 65535,
+					.minimum = 1,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 48,
+					.minimum = 1,
+					.maximum = 48,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -190,13 +190,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384,
 				.block_size = 128,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 48,
+					.minimum = 1,
+					.maximum = 48,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -211,13 +211,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 65535,
+					.minimum = 1,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -232,13 +232,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512,
 				.block_size = 128,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -253,13 +253,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -274,13 +274,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -294,13 +294,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				}
 			}, }
@@ -314,18 +314,18 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
+					.minimum = 16,
 #if IMB_VERSION_NUM >= IMB_VERSION(0, 53, 3)
-					.max = 32,
+					.maximum = 32,
 					.increment = 16
 #else
-					.max = 16,
+					.maximum = 16,
 					.increment = 0
 #endif
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -339,13 +339,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -359,13 +359,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 24,
+					.minimum = 8,
+					.maximum = 24,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -379,13 +379,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_DES_DOCSISBPI,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -399,28 +399,28 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_CCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
+					.minimum = 16,
 #if IMB_VERSION(0, 54, 2) <= IMB_VERSION_NUM
-					.max = 32,
+					.maximum = 32,
 					.increment = 16
 #else
-					.max = 16,
+					.maximum = 16,
 					.increment = 0
 #endif
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 16,
+					.minimum = 4,
+					.maximum = 16,
 					.increment = 2
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 46,
+					.minimum = 0,
+					.maximum = 46,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 7,
-					.max = 13,
+					.minimum = 7,
+					.maximum = 13,
 					.increment = 1
 				},
 			}, }
@@ -434,13 +434,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_CMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -455,23 +455,23 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 65535,
+					.minimum = 0,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -485,18 +485,18 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_GMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -511,8 +511,8 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_ECB,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = { 0 }
@@ -529,18 +529,18 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -554,13 +554,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 			}, }
@@ -574,18 +574,18 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -599,13 +599,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -619,13 +619,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_KASUMI_F9,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -640,13 +640,13 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_KASUMI_F8,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -662,23 +662,23 @@  static const struct rte_cryptodev_capabilities aesni_mb_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305,
 				.block_size = 64,
 				.key_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 240,
+					.minimum = 0,
+					.maximum = 240,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				},
 			}, }
@@ -699,13 +699,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 16
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
diff --git a/drivers/crypto/armv8/rte_armv8_pmd_ops.c b/drivers/crypto/armv8/rte_armv8_pmd_ops.c
index 01ccfb4b23..5d0eae6b45 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd_ops.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd_ops.c
@@ -20,13 +20,13 @@  static const struct rte_cryptodev_capabilities
 					.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 					.block_size = 64,
 					.key_size = {
-						.min = 1,
-						.max = 64,
+						.minimum = 1,
+						.maximum = 64,
 						.increment = 1
 					},
 					.digest_size = {
-						.min = 1,
-						.max = 20,
+						.minimum = 1,
+						.maximum = 20,
 						.increment = 1
 					},
 					.iv_size = { 0 }
@@ -41,13 +41,13 @@  static const struct rte_cryptodev_capabilities
 					.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 					.block_size = 64,
 					.key_size = {
-						.min = 1,
-						.max = 64,
+						.minimum = 1,
+						.maximum = 64,
 						.increment = 1
 					},
 					.digest_size = {
-						.min = 1,
-						.max = 32,
+						.minimum = 1,
+						.maximum = 32,
 						.increment = 1
 					},
 					.iv_size = { 0 }
@@ -62,13 +62,13 @@  static const struct rte_cryptodev_capabilities
 					.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 					.block_size = 16,
 					.key_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					},
 					.iv_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					}
 				}, }
diff --git a/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c b/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c
index afed7696a6..ec15ca2323 100644
--- a/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c
+++ b/drivers/crypto/bcmfs/bcmfs_sym_capabilities.c
@@ -17,13 +17,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 20,
-					.max = 20,
+					.minimum = 20,
+					.maximum = 20,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -39,13 +39,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 			}, }
@@ -60,13 +60,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -82,13 +82,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -104,13 +104,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 48,
-					.max = 48,
+					.minimum = 48,
+					.maximum = 48,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -126,13 +126,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 64,
-					.max = 64,
+					.minimum = 64,
+					.maximum = 64,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -148,13 +148,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA3_224,
 				.block_size = 144,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -170,13 +170,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA3_256,
 				.block_size = 136,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -192,13 +192,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA3_384,
 				.block_size = 104,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 48,
-					.max = 48,
+					.minimum = 48,
+					.maximum = 48,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -214,13 +214,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA3_512,
 				.block_size = 72,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 64,
-					.max = 64,
+					.minimum = 64,
+					.maximum = 64,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -236,13 +236,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 20,
-					.max = 20,
+					.minimum = 20,
+					.maximum = 20,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -258,13 +258,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -280,13 +280,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -302,13 +302,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -324,13 +324,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 48,
-					.max = 48,
+					.minimum = 48,
+					.maximum = 48,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -346,13 +346,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 64,
-					.max = 64,
+					.minimum = 64,
+					.maximum = 64,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -368,13 +368,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA3_224_HMAC,
 				.block_size = 144,
 				.key_size = {
-					.min = 1,
-					.max = 144,
+					.minimum = 1,
+					.maximum = 144,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -390,13 +390,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA3_256_HMAC,
 				.block_size = 136,
 				.key_size = {
-					.min = 1,
-					.max = 136,
+					.minimum = 1,
+					.maximum = 136,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -412,13 +412,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA3_384_HMAC,
 				.block_size = 104,
 				.key_size = {
-					.min = 1,
-					.max = 104,
+					.minimum = 1,
+					.maximum = 104,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 48,
-					.max = 48,
+					.minimum = 48,
+					.maximum = 48,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -434,13 +434,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA3_512_HMAC,
 				.block_size = 72,
 				.key_size = {
-					.min = 1,
-					.max = 72,
+					.minimum = 1,
+					.maximum = 72,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 64,
-					.max = 64,
+					.minimum = 64,
+					.maximum = 64,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -456,13 +456,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -478,23 +478,23 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_GMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 65535,
+					.minimum = 0,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				},
 			}, }
@@ -509,13 +509,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_CMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -531,13 +531,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_CBC_MAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = { 0 }
@@ -553,13 +553,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_ECB,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, }
@@ -574,13 +574,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -595,13 +595,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -616,13 +616,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_XTS,
 				.block_size = 16,
 				.key_size = {
-					.min = 32,
-					.max = 64,
+					.minimum = 32,
+					.maximum = 64,
 					.increment = 32
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -637,13 +637,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -658,13 +658,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -679,13 +679,13 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_ECB,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, }
@@ -700,23 +700,23 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 65535,
+					.minimum = 0,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				},
 			}, }
@@ -731,23 +731,23 @@  static const struct rte_cryptodev_capabilities bcmfs_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_CCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 16,
+					.minimum = 4,
+					.maximum = 16,
 					.increment = 2
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 65535,
+					.minimum = 0,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 7,
-					.max = 13,
+					.minimum = 7,
+					.maximum = 13,
 					.increment = 1
 				},
 			}, }
diff --git a/drivers/crypto/caam_jr/caam_jr_capabilities.c b/drivers/crypto/caam_jr/caam_jr_capabilities.c
index c51593c4bb..991a3b46ab 100644
--- a/drivers/crypto/caam_jr/caam_jr_capabilities.c
+++ b/drivers/crypto/caam_jr/caam_jr_capabilities.c
@@ -13,13 +13,13 @@  static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -34,13 +34,13 @@  static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 20,
+					.minimum = 1,
+					.maximum = 20,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -55,13 +55,13 @@  static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 28,
+					.minimum = 1,
+					.maximum = 28,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -76,13 +76,13 @@  static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 32,
+					.minimum = 1,
+					.maximum = 32,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -97,13 +97,13 @@  static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 48,
+					.minimum = 1,
+					.maximum = 48,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -118,13 +118,13 @@  static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -139,23 +139,23 @@  static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 8,
-					.max = 16,
+					.minimum = 8,
+					.maximum = 16,
 					.increment = 4
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 240,
+					.minimum = 0,
+					.maximum = 240,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				},
 			}, }
@@ -169,13 +169,13 @@  static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -189,13 +189,13 @@  static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -209,13 +209,13 @@  static const struct rte_cryptodev_capabilities caam_jr_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 24,
+					.minimum = 16,
+					.maximum = 24,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
diff --git a/drivers/crypto/ccp/ccp_pmd_ops.c b/drivers/crypto/ccp/ccp_pmd_ops.c
index 98f964f361..60f3c14d87 100644
--- a/drivers/crypto/ccp/ccp_pmd_ops.c
+++ b/drivers/crypto/ccp/ccp_pmd_ops.c
@@ -21,13 +21,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA1,		\
 				 .block_size = 64,			\
 				 .key_size = {				\
-					 .min = 0,			\
-					 .max = 0,			\
+					 .minimum = 0,			\
+					 .maximum = 0,			\
 					 .increment = 0			\
 				 },					\
 				 .digest_size = {			\
-					 .min = 20,			\
-					 .max = 20,			\
+					 .minimum = 20,			\
+					 .maximum = 20,			\
 					 .increment = 0			\
 				 },					\
 				 .aad_size = { 0 }			\
@@ -42,13 +42,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA1_HMAC,     \
 				 .block_size = 64,                      \
 				 .key_size = {                          \
-					 .min = 1,                      \
-					 .max = 64,                     \
+					 .minimum = 1,                      \
+					 .maximum = 64,                     \
 					 .increment = 1                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 1,                      \
-					 .max = 20,                     \
+					 .minimum = 1,                      \
+					 .maximum = 20,                     \
 					 .increment = 1                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -63,13 +63,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA224,        \
 				 .block_size = 64,                      \
 				 .key_size = {                          \
-					 .min = 0,                      \
-					 .max = 0,			\
+					 .minimum = 0,                      \
+					 .maximum = 0,			\
 					 .increment = 0                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 28,                     \
-					 .max = 28,                     \
+					 .minimum = 28,                     \
+					 .maximum = 28,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -84,13 +84,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA224_HMAC,   \
 				 .block_size = 64,                      \
 				 .key_size = {                          \
-					 .min = 1,                      \
-					 .max = 64,                     \
+					 .minimum = 1,                      \
+					 .maximum = 64,                     \
 					 .increment = 1                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 1,                     \
-					 .max = 28,                     \
+					 .minimum = 1,                     \
+					 .maximum = 28,                     \
 					 .increment = 1                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -105,13 +105,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA3_224,      \
 				 .block_size = 144,                     \
 				 .key_size = {                          \
-					 .min = 0,                      \
-					 .max = 0,                      \
+					 .minimum = 0,                      \
+					 .maximum = 0,                      \
 					 .increment = 0                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 28,                     \
-					 .max = 28,                     \
+					 .minimum = 28,                     \
+					 .maximum = 28,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -126,13 +126,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA3_224_HMAC, \
 				 .block_size = 144,                     \
 				 .key_size = {                          \
-					 .min = 1,                      \
-					 .max = 144,                    \
+					 .minimum = 1,                      \
+					 .maximum = 144,                    \
 					 .increment = 1                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 28,                     \
-					 .max = 28,                     \
+					 .minimum = 28,                     \
+					 .maximum = 28,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -147,13 +147,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA256,        \
 				 .block_size = 64,                      \
 				 .key_size = {                          \
-					 .min = 0,                      \
-					 .max = 0,                      \
+					 .minimum = 0,                      \
+					 .maximum = 0,                      \
 					 .increment = 0                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 32,                     \
-					 .max = 32,                     \
+					 .minimum = 32,                     \
+					 .maximum = 32,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -168,13 +168,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA256_HMAC,   \
 				 .block_size = 64,                      \
 				 .key_size = {                          \
-					 .min = 1,                      \
-					 .max = 64,                     \
+					 .minimum = 1,                      \
+					 .maximum = 64,                     \
 					 .increment = 1                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 1,                     \
-					 .max = 32,                     \
+					 .minimum = 1,                     \
+					 .maximum = 32,                     \
 					 .increment = 1                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -189,13 +189,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA3_256,      \
 				 .block_size = 136,                     \
 				 .key_size = {                          \
-					 .min = 0,                      \
-					 .max = 0,                      \
+					 .minimum = 0,                      \
+					 .maximum = 0,                      \
 					 .increment = 0                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 32,                     \
-					 .max = 32,                     \
+					 .minimum = 32,                     \
+					 .maximum = 32,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -210,13 +210,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA3_256_HMAC, \
 				 .block_size = 136,                     \
 				 .key_size = {                          \
-					 .min = 1,                      \
-					 .max = 136,                    \
+					 .minimum = 1,                      \
+					 .maximum = 136,                    \
 					 .increment = 1                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 32,                     \
-					 .max = 32,                     \
+					 .minimum = 32,                     \
+					 .maximum = 32,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -231,13 +231,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA384,        \
 				 .block_size = 128,                     \
 				 .key_size = {                          \
-					 .min = 0,                      \
-					 .max = 0,                      \
+					 .minimum = 0,                      \
+					 .maximum = 0,                      \
 					 .increment = 0                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 48,                     \
-					 .max = 48,                     \
+					 .minimum = 48,                     \
+					 .maximum = 48,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -252,13 +252,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA384_HMAC,   \
 				 .block_size = 128,                     \
 				 .key_size = {                          \
-					 .min = 1,                      \
-					 .max = 128,                    \
+					 .minimum = 1,                      \
+					 .maximum = 128,                    \
 					 .increment = 1                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 1,                     \
-					 .max = 48,                     \
+					 .minimum = 1,                     \
+					 .maximum = 48,                     \
 					 .increment = 1                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -273,13 +273,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA3_384,      \
 				 .block_size = 104,                     \
 				 .key_size = {                          \
-					 .min = 0,                      \
-					 .max = 0,                      \
+					 .minimum = 0,                      \
+					 .maximum = 0,                      \
 					 .increment = 0                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 48,                     \
-					 .max = 48,                     \
+					 .minimum = 48,                     \
+					 .maximum = 48,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -294,13 +294,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA3_384_HMAC, \
 				 .block_size = 104,                     \
 				 .key_size = {                          \
-					 .min = 1,                      \
-					 .max = 104,                    \
+					 .minimum = 1,                      \
+					 .maximum = 104,                    \
 					 .increment = 1                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 48,                     \
-					 .max = 48,                     \
+					 .minimum = 48,                     \
+					 .maximum = 48,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -315,13 +315,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA512,        \
 				 .block_size = 128,                     \
 				 .key_size = {                          \
-					 .min = 0,                      \
-					 .max = 0,                      \
+					 .minimum = 0,                      \
+					 .maximum = 0,                      \
 					 .increment = 0                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 64,                     \
-					 .max = 64,                     \
+					 .minimum = 64,                     \
+					 .maximum = 64,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }			\
@@ -336,13 +336,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA512_HMAC,   \
 				 .block_size = 128,                     \
 				 .key_size = {                          \
-					 .min = 1,                      \
-					 .max = 128,                    \
+					 .minimum = 1,                      \
+					 .maximum = 128,                    \
 					 .increment = 1                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 1,                     \
-					 .max = 64,                     \
+					 .minimum = 1,                     \
+					 .maximum = 64,                     \
 					 .increment = 1                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -357,13 +357,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA3_512,      \
 				 .block_size = 72,                      \
 				 .key_size = {                          \
-					 .min = 0,                      \
-					 .max = 0,                      \
+					 .minimum = 0,                      \
+					 .maximum = 0,                      \
 					 .increment = 0                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 64,                     \
-					 .max = 64,                     \
+					 .minimum = 64,                     \
+					 .maximum = 64,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -378,13 +378,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_SHA3_512_HMAC, \
 				 .block_size = 72,                      \
 				 .key_size = {                          \
-					 .min = 1,                      \
-					 .max = 72,                     \
+					 .minimum = 1,                      \
+					 .maximum = 72,                     \
 					 .increment = 1                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 1,                     \
-					 .max = 64,                     \
+					 .minimum = 1,                     \
+					 .maximum = 64,                     \
 					 .increment = 1                 \
 				 },                                     \
 				 .aad_size = { 0 }                      \
@@ -399,13 +399,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_AES_CMAC,      \
 				 .block_size = 16,                      \
 				 .key_size = {                          \
-					 .min = 16,                     \
-					 .max = 32,                     \
+					 .minimum = 16,                     \
+					 .maximum = 32,                     \
 					 .increment = 8                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 16,                     \
-					 .max = 16,                     \
+					 .minimum = 16,                     \
+					 .maximum = 16,                     \
 					 .increment = 0                 \
 				 },                                     \
 			}, }                                            \
@@ -419,13 +419,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_ECB,      \
 				.block_size = 16,                       \
 				.key_size = {                           \
-				   .min = 16,                           \
-				   .max = 32,                           \
+				   .minimum = 16,                           \
+				   .maximum = 32,                           \
 				   .increment = 8                       \
 				},                                      \
 				.iv_size = {                            \
-				   .min = 0,                            \
-				   .max = 0,                            \
+				   .minimum = 0,                            \
+				   .maximum = 0,                            \
 				   .increment = 0                       \
 				}                                       \
 			}, }						\
@@ -439,13 +439,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,      \
 				.block_size = 16,                       \
 				.key_size = {                           \
-					.min = 16,                      \
-					.max = 32,                      \
+					.minimum = 16,                      \
+					.maximum = 32,                      \
 					.increment = 8                  \
 				},                                      \
 				.iv_size = {                            \
-					.min = 16,                      \
-					.max = 16,                      \
+					.minimum = 16,                      \
+					.maximum = 16,                      \
 					.increment = 0                  \
 				}                                       \
 			}, }                                            \
@@ -459,13 +459,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,      \
 				.block_size = 16,                       \
 				.key_size = {                           \
-					.min = 16,                      \
-					.max = 32,                      \
+					.minimum = 16,                      \
+					.maximum = 32,                      \
 					.increment = 8                  \
 				},                                      \
 				.iv_size = {                            \
-					.min = 16,                      \
-					.max = 16,                      \
+					.minimum = 16,                      \
+					.maximum = 16,                      \
 					.increment = 0                  \
 				}                                       \
 			}, }                                            \
@@ -479,13 +479,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,     \
 				.block_size = 8,                        \
 				.key_size = {                           \
-					.min = 16,                      \
-					.max = 24,                      \
+					.minimum = 16,                      \
+					.maximum = 24,                      \
 					.increment = 8                  \
 				},                                      \
 				.iv_size = {                            \
-					.min = 8,                       \
-					.max = 8,                       \
+					.minimum = 8,                       \
+					.maximum = 8,                       \
 					.increment = 0                  \
 				}                                       \
 			}, }                                            \
@@ -499,23 +499,23 @@ 
 				 .algo = RTE_CRYPTO_AEAD_AES_GCM,       \
 				 .block_size = 16,                      \
 				 .key_size = {                          \
-					 .min = 16,                     \
-					 .max = 32,                     \
+					 .minimum = 16,                     \
+					 .maximum = 32,                     \
 					 .increment = 8                 \
 				 },                                     \
 				 .digest_size = {                       \
-					 .min = 16,                     \
-					 .max = 16,                     \
+					 .minimum = 16,                     \
+					 .maximum = 16,                     \
 					 .increment = 0                 \
 				 },                                     \
 				 .aad_size = {                          \
-					 .min = 0,                      \
-					 .max = 65535,                  \
+					 .minimum = 0,                      \
+					 .maximum = 65535,                  \
 					 .increment = 1                 \
 				 },                                     \
 				 .iv_size = {                           \
-					 .min = 12,                     \
-					 .max = 16,                     \
+					 .minimum = 12,                     \
+					 .maximum = 16,                     \
 					 .increment = 4                 \
 				 },                                     \
 			}, }                                            \
@@ -531,13 +531,13 @@ 
 				 .algo = RTE_CRYPTO_AUTH_MD5_HMAC,	\
 				 .block_size = 64,			\
 				 .key_size = {				\
-					 .min = 1,			\
-					 .max = 64,			\
+					 .minimum = 1,			\
+					 .maximum = 64,			\
 					 .increment = 1			\
 				 },					\
 				 .digest_size = {			\
-					 .min = 1,			\
-					 .max = 16,			\
+					 .minimum = 1,			\
+					 .maximum = 16,			\
 					 .increment = 1			\
 				 },					\
 				 .aad_size = { 0 }			\
diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c b/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
index c4f7824332..a2903116f9 100644
--- a/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
+++ b/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
@@ -39,8 +39,8 @@  static const struct rte_cryptodev_capabilities caps_mul[] = {
 					(1 << RTE_CRYPTO_ASYM_OP_ENCRYPT) |
 					(1 << RTE_CRYPTO_ASYM_OP_DECRYPT)),
 				{.modlen = {
-					.min = 17,
-					.max = 1024,
+					.minimum = 17,
+					.maximum = 1024,
 					.increment = 1
 				}, }
 			}
@@ -53,8 +53,8 @@  static const struct rte_cryptodev_capabilities caps_mul[] = {
 				.xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX,
 				.op_types = 0,
 				{.modlen = {
-					.min = 17,
-					.max = 1024,
+					.minimum = 17,
+					.maximum = 1024,
 					.increment = 1
 				}, }
 			}
@@ -92,13 +92,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 20,
-					.max = 20,
+					.minimum = 20,
+					.maximum = 20,
 					.increment = 0
 				},
 			}, }
@@ -112,13 +112,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 20,
+					.minimum = 12,
+					.maximum = 20,
 					.increment = 8
 				},
 			}, }
@@ -132,13 +132,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224,
 				.block_size = 64,
 					.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 			}, }
@@ -152,13 +152,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 					.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 			}, }
@@ -172,13 +172,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 			}, }
@@ -192,13 +192,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 16
 				},
 			}, }
@@ -212,13 +212,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 48,
-					.max = 48,
+					.minimum = 48,
+					.maximum = 48,
 					.increment = 0
 					},
 			}, }
@@ -232,13 +232,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 24,
-					.max = 48,
+					.minimum = 24,
+					.maximum = 48,
 					.increment = 24
 					},
 			}, }
@@ -252,13 +252,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512,
 				.block_size = 128,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 64,
-					.max = 64,
+					.minimum = 64,
+					.maximum = 64,
 					.increment = 0
 				},
 			}, }
@@ -272,13 +272,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 64,
+					.minimum = 32,
+					.maximum = 64,
 					.increment = 32
 				},
 			}, }
@@ -292,13 +292,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 			}, }
@@ -312,13 +312,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 8,
-					.max = 64,
+					.minimum = 8,
+					.maximum = 64,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				},
 			}, }
@@ -335,23 +335,23 @@  static const struct rte_cryptodev_capabilities caps_chacha20[] = {
 				.algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305,
 				.block_size = 64,
 				.key_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 1024,
+					.minimum = 0,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				},
 			}, }
@@ -368,13 +368,13 @@  static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = {
 				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -388,13 +388,13 @@  static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = {
 				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -408,18 +408,18 @@  static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = {
 				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -433,18 +433,18 @@  static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = {
 				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -461,18 +461,18 @@  static const struct rte_cryptodev_capabilities caps_aes[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_GMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 8,
-					.max = 16,
+					.minimum = 8,
+					.maximum = 16,
 					.increment = 4
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -486,13 +486,13 @@  static const struct rte_cryptodev_capabilities caps_aes[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -506,13 +506,13 @@  static const struct rte_cryptodev_capabilities caps_aes[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				}
 			}, }
@@ -526,13 +526,13 @@  static const struct rte_cryptodev_capabilities caps_aes[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_XTS,
 				.block_size = 16,
 				.key_size = {
-					.min = 32,
-					.max = 64,
+					.minimum = 32,
+					.maximum = 64,
 					.increment = 32
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -546,23 +546,23 @@  static const struct rte_cryptodev_capabilities caps_aes[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 16,
+					.minimum = 4,
+					.maximum = 16,
 					.increment = 1
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 1024,
+					.minimum = 0,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -579,13 +579,13 @@  static const struct rte_cryptodev_capabilities caps_kasumi[] = {
 				.algo = RTE_CRYPTO_CIPHER_KASUMI_F8,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -599,13 +599,13 @@  static const struct rte_cryptodev_capabilities caps_kasumi[] = {
 				.algo = RTE_CRYPTO_AUTH_KASUMI_F9,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 			}, }
@@ -622,13 +622,13 @@  static const struct rte_cryptodev_capabilities caps_des[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 16,
+					.minimum = 8,
+					.maximum = 16,
 					.increment = 8
 				}
 			}, }
@@ -642,13 +642,13 @@  static const struct rte_cryptodev_capabilities caps_des[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_ECB,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, }
@@ -662,13 +662,13 @@  static const struct rte_cryptodev_capabilities caps_des[] = {
 				.algo = RTE_CRYPTO_CIPHER_DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -685,13 +685,13 @@  static const struct rte_cryptodev_capabilities caps_null[] = {
 				.algo = RTE_CRYPTO_AUTH_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 			}, },
@@ -705,13 +705,13 @@  static const struct rte_cryptodev_capabilities caps_null[] = {
 				.algo = RTE_CRYPTO_CIPHER_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, },
@@ -732,23 +732,23 @@  static const struct rte_cryptodev_capabilities sec_caps_aes[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 8,
-					.max = 12,
+					.minimum = 8,
+					.maximum = 12,
 					.increment = 4
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -762,13 +762,13 @@  static const struct rte_cryptodev_capabilities sec_caps_aes[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -785,13 +785,13 @@  static const struct rte_cryptodev_capabilities sec_caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 20,
-					.max = 64,
+					.minimum = 20,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				},
 			}, }
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
index 7dbc69f6cb..7bd6f89fd5 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h
@@ -209,13 +209,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -230,13 +230,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -251,13 +251,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -272,13 +272,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 20,
-					.max = 20,
+					.minimum = 20,
+					.maximum = 20,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -293,13 +293,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 20,
+					.minimum = 1,
+					.maximum = 20,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -314,13 +314,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224,
 				.block_size = 64,
 					.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -335,13 +335,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 28,
+					.minimum = 1,
+					.maximum = 28,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -356,13 +356,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -377,13 +377,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 32,
+					.minimum = 1,
+					.maximum = 32,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -398,13 +398,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 48,
-					.max = 48,
+					.minimum = 48,
+					.maximum = 48,
 					.increment = 0
 					},
 				.iv_size = { 0 }
@@ -419,13 +419,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 48,
+					.minimum = 1,
+					.maximum = 48,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -440,13 +440,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512,
 				.block_size = 128,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 64,
-					.max = 64,
+					.minimum = 64,
+					.maximum = 64,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -461,13 +461,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -482,23 +482,23 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 8,
-					.max = 16,
+					.minimum = 8,
+					.maximum = 16,
 					.increment = 4
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 240,
+					.minimum = 0,
+					.maximum = 240,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				},
 			}, }
@@ -512,13 +512,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				},
 				.aad_size = { 0 },
@@ -534,13 +534,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_CMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 16,
+					.minimum = 4,
+					.maximum = 16,
 					.increment = 4
 				},
 				.aad_size = { 0 }
@@ -555,13 +555,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, },
@@ -575,13 +575,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -595,13 +595,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 			}, }
@@ -615,13 +615,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -635,13 +635,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 24,
+					.minimum = 16,
+					.maximum = 24,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -655,18 +655,18 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -680,13 +680,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -700,13 +700,13 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -720,18 +720,18 @@  static const struct rte_cryptodev_capabilities dpaa2_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -751,18 +751,18 @@  static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -776,13 +776,13 @@  static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -796,13 +796,13 @@  static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -816,13 +816,13 @@  static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -837,13 +837,13 @@  static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, },
@@ -857,13 +857,13 @@  static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -877,18 +877,18 @@  static const struct rte_cryptodev_capabilities dpaa2_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h
index 368699678b..ff15708e10 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.h
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.h
@@ -227,13 +227,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -248,13 +248,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -269,13 +269,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 20,
+					.minimum = 1,
+					.maximum = 20,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -290,13 +290,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 28,
+					.minimum = 1,
+					.maximum = 28,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -311,13 +311,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 32,
+					.minimum = 1,
+					.maximum = 32,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -332,13 +332,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 48,
+					.minimum = 1,
+					.maximum = 48,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -353,13 +353,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -374,23 +374,23 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 8,
-					.max = 16,
+					.minimum = 8,
+					.maximum = 16,
 					.increment = 4
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 240,
+					.minimum = 0,
+					.maximum = 240,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				},
 			}, }
@@ -404,13 +404,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, },
@@ -424,13 +424,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -444,13 +444,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 			}, }
@@ -464,13 +464,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 24,
+					.minimum = 16,
+					.maximum = 24,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -484,18 +484,18 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -509,13 +509,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -529,13 +529,13 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -549,18 +549,18 @@  static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -579,18 +579,18 @@  static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -604,13 +604,13 @@  static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -624,13 +624,13 @@  static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -644,13 +644,13 @@  static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -665,13 +665,13 @@  static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, },
@@ -685,13 +685,13 @@  static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -705,18 +705,18 @@  static const struct rte_cryptodev_capabilities dpaa_pdcp_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c b/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c
index 43376c1aa0..51d1f97407 100644
--- a/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd_ops.c
@@ -19,13 +19,13 @@  static const struct rte_cryptodev_capabilities kasumi_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_KASUMI_F9,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -40,13 +40,13 @@  static const struct rte_cryptodev_capabilities kasumi_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_KASUMI_F8,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
diff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c
index e01be15ade..d5b83e8fdd 100644
--- a/drivers/crypto/mlx5/mlx5_crypto.c
+++ b/drivers/crypto/mlx5/mlx5_crypto.c
@@ -48,13 +48,13 @@  const struct rte_cryptodev_capabilities mlx5_crypto_caps[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_XTS,
 				.block_size = 16,
 				.key_size = {
-					.min = 32,
-					.max = 64,
+					.minimum = 32,
+					.maximum = 64,
 					.increment = 32
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.dataunit_set =
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
index fa36461276..3c22c48c24 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
@@ -26,13 +26,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				},
 			}, }
@@ -46,13 +46,13 @@  static const struct rte_cryptodev_capabilities
 					.algo = RTE_CRYPTO_AUTH_MD5,
 					.block_size = 64,
 					.key_size = {
-						.min = 0,
-						.max = 0,
+						.minimum = 0,
+						.maximum = 0,
 						.increment = 0
 					},
 					.digest_size = {
-						.min = 12,
-						.max = 16,
+						.minimum = 12,
+						.maximum = 16,
 						.increment = 4
 					},
 				}, }
@@ -66,13 +66,13 @@  static const struct rte_cryptodev_capabilities
 					.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 					.block_size = 64,
 					.key_size = {
-						.min = 1,
-						.max = 64,
+						.minimum = 1,
+						.maximum = 64,
 						.increment = 1
 					},
 					.digest_size = {
-						.min = 12,
-						.max = 20,
+						.minimum = 12,
+						.maximum = 20,
 						.increment = 4
 					},
 				}, }
@@ -86,13 +86,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AUTH_SHA1,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 20,
+					.minimum = 12,
+					.maximum = 20,
 					.increment = 4
 				},
 			}, }
@@ -107,13 +107,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 28,
+					.minimum = 12,
+					.maximum = 28,
 					.increment = 0
 				},
 			}, }
@@ -127,13 +127,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AUTH_SHA224,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 28,
+					.minimum = 12,
+					.maximum = 28,
 					.increment = 4
 				},
 			}, }
@@ -147,13 +147,13 @@  static const struct rte_cryptodev_capabilities
 					.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 					.block_size = 64,
 					.key_size = {
-						.min = 1,
-						.max = 64,
+						.minimum = 1,
+						.maximum = 64,
 						.increment = 1
 					},
 					.digest_size = {
-						.min = 12,
-						.max = 32,
+						.minimum = 12,
+						.maximum = 32,
 						.increment = 4
 					},
 				}, }
@@ -167,13 +167,13 @@  static const struct rte_cryptodev_capabilities
 					.algo = RTE_CRYPTO_AUTH_SHA256,
 					.block_size = 64,
 					.key_size = {
-						.min = 0,
-						.max = 0,
+						.minimum = 0,
+						.maximum = 0,
 						.increment = 0
 					},
 					.digest_size = {
-						.min = 12,
-						.max = 32,
+						.minimum = 12,
+						.maximum = 32,
 						.increment = 4
 					},
 				}, }
@@ -187,13 +187,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 48,
+					.minimum = 12,
+					.maximum = 48,
 					.increment = 4
 				},
 			}, }
@@ -207,13 +207,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AUTH_SHA384,
 				.block_size = 128,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 48,
+					.minimum = 12,
+					.maximum = 48,
 					.increment = 4
 				},
 			}, }
@@ -227,13 +227,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 64,
+					.minimum = 12,
+					.maximum = 64,
 					.increment = 4
 				},
 			}, }
@@ -247,13 +247,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AUTH_SHA512,
 				.block_size = 128,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 64,
+					.minimum = 12,
+					.maximum = 64,
 					.increment = 0
 				},
 			}, }
@@ -267,13 +267,13 @@  static const struct rte_cryptodev_capabilities
 					.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 					.block_size = 16,
 					.key_size = {
-						.min = 16,
-						.max = 32,
+						.minimum = 16,
+						.maximum = 32,
 						.increment = 8
 					},
 					.iv_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					}
 				}, }
@@ -287,13 +287,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -307,13 +307,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_CIPHER_AES_ECB,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, }
@@ -327,23 +327,23 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 64,
+					.minimum = 0,
+					.maximum = 64,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				}
 			}, }
@@ -357,18 +357,18 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AUTH_AES_GMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 65532,
+					.minimum = 8,
+					.maximum = 65532,
 					.increment = 4
 				}
 			}, }
@@ -382,13 +382,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -402,13 +402,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_CIPHER_3DES_CTR,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -422,13 +422,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_CIPHER_3DES_ECB,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, }
@@ -442,18 +442,18 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_AUTH_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, },
@@ -467,13 +467,13 @@  static const struct rte_cryptodev_capabilities
 				.algo = RTE_CRYPTO_CIPHER_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, },
diff --git a/drivers/crypto/nitrox/nitrox_sym_capabilities.c b/drivers/crypto/nitrox/nitrox_sym_capabilities.c
index a30cd9f8fa..510e5c74eb 100644
--- a/drivers/crypto/nitrox/nitrox_sym_capabilities.c
+++ b/drivers/crypto/nitrox/nitrox_sym_capabilities.c
@@ -13,13 +13,13 @@  static const struct rte_cryptodev_capabilities nitrox_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 20,
+					.minimum = 1,
+					.maximum = 20,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -34,13 +34,13 @@  static const struct rte_cryptodev_capabilities nitrox_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 28,
+					.minimum = 1,
+					.maximum = 28,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -55,13 +55,13 @@  static const struct rte_cryptodev_capabilities nitrox_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 32,
+					.minimum = 1,
+					.maximum = 32,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -76,13 +76,13 @@  static const struct rte_cryptodev_capabilities nitrox_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -96,13 +96,13 @@  static const struct rte_cryptodev_capabilities nitrox_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -116,23 +116,23 @@  static const struct rte_cryptodev_capabilities nitrox_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 512,
+					.minimum = 0,
+					.maximum = 512,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				},
 			}, }
diff --git a/drivers/crypto/null/null_crypto_pmd_ops.c b/drivers/crypto/null/null_crypto_pmd_ops.c
index d67892a1bb..55526f2e6d 100644
--- a/drivers/crypto/null/null_crypto_pmd_ops.c
+++ b/drivers/crypto/null/null_crypto_pmd_ops.c
@@ -19,13 +19,13 @@  static const struct rte_cryptodev_capabilities null_crypto_pmd_capabilities[] =
 				.algo = RTE_CRYPTO_AUTH_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -40,8 +40,8 @@  static const struct rte_cryptodev_capabilities null_crypto_pmd_capabilities[] =
 				.algo = RTE_CRYPTO_CIPHER_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = { 0 }
diff --git a/drivers/crypto/octeontx/otx_cryptodev_capabilities.c b/drivers/crypto/octeontx/otx_cryptodev_capabilities.c
index 3f734b232c..88f02b07ad 100644
--- a/drivers/crypto/octeontx/otx_cryptodev_capabilities.c
+++ b/drivers/crypto/octeontx/otx_cryptodev_capabilities.c
@@ -16,13 +16,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 			}, },
@@ -36,18 +36,18 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_GMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 8,
-					.max = 16,
+					.minimum = 8,
+					.maximum = 16,
 					.increment = 4
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -61,13 +61,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_KASUMI_F9,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 			}, }
@@ -81,13 +81,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 			}, }
@@ -101,13 +101,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 8,
-					.max = 64,
+					.minimum = 8,
+					.maximum = 64,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 			}, }
@@ -121,13 +121,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 20,
-					.max = 20,
+					.minimum = 20,
+					.maximum = 20,
 					.increment = 0
 				},
 			}, }
@@ -141,13 +141,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 20,
-					.max = 20,
+					.minimum = 20,
+					.maximum = 20,
 					.increment = 0
 				},
 			}, }
@@ -161,13 +161,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224,
 				.block_size = 64,
 					.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 			}, }
@@ -181,13 +181,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 					.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 			}, }
@@ -201,13 +201,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 			}, }
@@ -221,13 +221,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 			}, }
@@ -241,13 +241,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 48,
-					.max = 48,
+					.minimum = 48,
+					.maximum = 48,
 					.increment = 0
 					},
 			}, }
@@ -261,13 +261,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 48,
-					.max = 48,
+					.minimum = 48,
+					.maximum = 48,
 					.increment = 0
 					},
 			}, }
@@ -281,13 +281,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512,
 				.block_size = 128,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 64,
-					.max = 64,
+					.minimum = 64,
+					.maximum = 64,
 					.increment = 0
 				},
 			}, }
@@ -301,13 +301,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 64,
-					.max = 64,
+					.minimum = 64,
+					.maximum = 64,
 					.increment = 0
 				},
 			}, }
@@ -321,18 +321,18 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -346,18 +346,18 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -371,13 +371,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, },
@@ -391,13 +391,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 16,
+					.minimum = 8,
+					.maximum = 16,
 					.increment = 8
 				}
 			}, }
@@ -411,13 +411,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_ECB,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, }
@@ -431,13 +431,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -451,13 +451,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				}
 			}, }
@@ -471,13 +471,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_XTS,
 				.block_size = 16,
 				.key_size = {
-					.min = 32,
-					.max = 64,
+					.minimum = 32,
+					.maximum = 64,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -491,13 +491,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -511,13 +511,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_KASUMI_F8,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -531,13 +531,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -551,13 +551,13 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -571,23 +571,23 @@  static const struct rte_cryptodev_capabilities otx_sym_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 8,
-					.max = 16,
+					.minimum = 8,
+					.maximum = 16,
 					.increment = 4
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 1024,
+					.minimum = 0,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -609,8 +609,8 @@  static const struct rte_cryptodev_capabilities otx_asym_capabilities[] = {
 					(1 << RTE_CRYPTO_ASYM_OP_ENCRYPT) |
 					(1 << RTE_CRYPTO_ASYM_OP_DECRYPT)),
 				{.modlen = {
-					.min = 17,
-					.max = 1024,
+					.minimum = 17,
+					.maximum = 1024,
 					.increment = 1
 				}, }
 			}
@@ -623,8 +623,8 @@  static const struct rte_cryptodev_capabilities otx_asym_capabilities[] = {
 				.xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX,
 				.op_types = 0,
 				{.modlen = {
-					.min = 17,
-					.max = 1024,
+					.minimum = 17,
+					.maximum = 1024,
 					.increment = 1
 				}, }
 			}
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c b/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c
index 80f3729995..b4a03f3913 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c
@@ -52,8 +52,8 @@  static const struct rte_cryptodev_capabilities caps_mul[] = {
 					(1 << RTE_CRYPTO_ASYM_OP_ENCRYPT) |
 					(1 << RTE_CRYPTO_ASYM_OP_DECRYPT)),
 				{.modlen = {
-					.min = 17,
-					.max = 1024,
+					.minimum = 17,
+					.maximum = 1024,
 					.increment = 1
 				}, }
 			}
@@ -66,8 +66,8 @@  static const struct rte_cryptodev_capabilities caps_mul[] = {
 				.xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX,
 				.op_types = 0,
 				{.modlen = {
-					.min = 17,
-					.max = 1024,
+					.minimum = 17,
+					.maximum = 1024,
 					.increment = 1
 				}, }
 			}
@@ -105,13 +105,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 20,
-					.max = 20,
+					.minimum = 20,
+					.maximum = 20,
 					.increment = 0
 				},
 			}, }
@@ -125,13 +125,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 20,
+					.minimum = 12,
+					.maximum = 20,
 					.increment = 8
 				},
 			}, }
@@ -145,13 +145,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224,
 				.block_size = 64,
 					.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 			}, }
@@ -165,13 +165,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 					.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 28,
-					.max = 28,
+					.minimum = 28,
+					.maximum = 28,
 					.increment = 0
 				},
 			}, }
@@ -185,13 +185,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 			}, }
@@ -205,13 +205,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 16
 				},
 			}, }
@@ -225,13 +225,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 48,
-					.max = 48,
+					.minimum = 48,
+					.maximum = 48,
 					.increment = 0
 					},
 			}, }
@@ -245,13 +245,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 24,
-					.max = 48,
+					.minimum = 24,
+					.maximum = 48,
 					.increment = 24
 					},
 			}, }
@@ -265,13 +265,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512,
 				.block_size = 128,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 64,
-					.max = 64,
+					.minimum = 64,
+					.maximum = 64,
 					.increment = 0
 				},
 			}, }
@@ -285,13 +285,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 1024,
+					.minimum = 1,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 64,
+					.minimum = 32,
+					.maximum = 64,
 					.increment = 32
 				},
 			}, }
@@ -305,13 +305,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 			}, }
@@ -325,13 +325,13 @@  static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 8,
-					.max = 64,
+					.minimum = 8,
+					.maximum = 64,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				},
 			}, }
@@ -348,23 +348,23 @@  static const struct rte_cryptodev_capabilities caps_chacha20[] = {
 				.algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305,
 				.block_size = 64,
 				.key_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 1024,
+					.minimum = 0,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				},
 			}, }
@@ -381,13 +381,13 @@  static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = {
 				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -401,13 +401,13 @@  static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = {
 				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -421,18 +421,18 @@  static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = {
 				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -446,18 +446,18 @@  static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = {
 				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -474,18 +474,18 @@  static const struct rte_cryptodev_capabilities caps_aes[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_GMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 8,
-					.max = 16,
+					.minimum = 8,
+					.maximum = 16,
 					.increment = 4
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -499,13 +499,13 @@  static const struct rte_cryptodev_capabilities caps_aes[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -519,13 +519,13 @@  static const struct rte_cryptodev_capabilities caps_aes[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				}
 			}, }
@@ -539,13 +539,13 @@  static const struct rte_cryptodev_capabilities caps_aes[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_XTS,
 				.block_size = 16,
 				.key_size = {
-					.min = 32,
-					.max = 64,
+					.minimum = 32,
+					.maximum = 64,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -559,23 +559,23 @@  static const struct rte_cryptodev_capabilities caps_aes[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 16,
+					.minimum = 4,
+					.maximum = 16,
 					.increment = 1
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 1024,
+					.minimum = 0,
+					.maximum = 1024,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -592,13 +592,13 @@  static const struct rte_cryptodev_capabilities caps_kasumi[] = {
 				.algo = RTE_CRYPTO_CIPHER_KASUMI_F8,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -612,13 +612,13 @@  static const struct rte_cryptodev_capabilities caps_kasumi[] = {
 				.algo = RTE_CRYPTO_AUTH_KASUMI_F9,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 			}, }
@@ -635,13 +635,13 @@  static const struct rte_cryptodev_capabilities caps_des[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 16,
+					.minimum = 8,
+					.maximum = 16,
 					.increment = 8
 				}
 			}, }
@@ -655,13 +655,13 @@  static const struct rte_cryptodev_capabilities caps_des[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_ECB,
 				.block_size = 8,
 				.key_size = {
-					.min = 24,
-					.max = 24,
+					.minimum = 24,
+					.maximum = 24,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, }
@@ -675,13 +675,13 @@  static const struct rte_cryptodev_capabilities caps_des[] = {
 				.algo = RTE_CRYPTO_CIPHER_DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -698,13 +698,13 @@  static const struct rte_cryptodev_capabilities caps_null[] = {
 				.algo = RTE_CRYPTO_AUTH_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 			}, },
@@ -718,13 +718,13 @@  static const struct rte_cryptodev_capabilities caps_null[] = {
 				.algo = RTE_CRYPTO_CIPHER_NULL,
 				.block_size = 1,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				}
 			}, },
@@ -745,23 +745,23 @@  static const struct rte_cryptodev_capabilities sec_caps_aes[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 8,
-					.max = 12,
+					.minimum = 8,
+					.maximum = 12,
 					.increment = 4
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
index ed75877581..71d918ec83 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
@@ -21,13 +21,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 16,
+					.minimum = 1,
+					.maximum = 16,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -42,13 +42,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_MD5,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -63,13 +63,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 20,
+					.minimum = 1,
+					.maximum = 20,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -84,13 +84,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 20,
-					.max = 20,
+					.minimum = 20,
+					.maximum = 20,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -105,13 +105,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 28,
+					.minimum = 1,
+					.maximum = 28,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -126,13 +126,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA224,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 28,
+					.minimum = 1,
+					.maximum = 28,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -147,13 +147,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 32,
+					.minimum = 1,
+					.maximum = 32,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -168,13 +168,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA256,
 				.block_size = 64,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 32,
-					.max = 32,
+					.minimum = 32,
+					.maximum = 32,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -189,13 +189,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 48,
+					.minimum = 1,
+					.maximum = 48,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -210,13 +210,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA384,
 				.block_size = 128,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 48,
-					.max = 48,
+					.minimum = 48,
+					.maximum = 48,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -231,13 +231,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
 				.block_size = 128,
 				.key_size = {
-					.min = 1,
-					.max = 128,
+					.minimum = 1,
+					.maximum = 128,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 1,
-					.max = 64,
+					.minimum = 1,
+					.maximum = 64,
 					.increment = 1
 				},
 				.iv_size = { 0 }
@@ -252,13 +252,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA512,
 				.block_size = 128,
 				.key_size = {
-					.min = 0,
-					.max = 0,
+					.minimum = 0,
+					.maximum = 0,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 64,
-					.max = 64,
+					.minimum = 64,
+					.maximum = 64,
 					.increment = 0
 				},
 				.iv_size = { 0 }
@@ -273,13 +273,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -293,13 +293,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -313,23 +313,23 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 65535,
+					.minimum = 0,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				},
 			}, }
@@ -343,23 +343,23 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_CCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 16,
+					.minimum = 4,
+					.maximum = 16,
 					.increment = 2
 				},
 				.aad_size = {
-					.min = 0,
-					.max = 65535,
+					.minimum = 0,
+					.maximum = 65535,
 					.increment = 1
 				},
 				.iv_size = {
-					.min = 7,
-					.max = 13,
+					.minimum = 7,
+					.maximum = 13,
 					.increment = 1
 				},
 			}, }
@@ -373,18 +373,18 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_AES_GMAC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 16,
+					.minimum = 12,
+					.maximum = 16,
 					.increment = 4
 				}
 			}, }
@@ -398,13 +398,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 24,
+					.minimum = 8,
+					.maximum = 24,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -418,13 +418,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_3DES_CTR,
 				.block_size = 8,
 				.key_size = {
-					.min = 16,
-					.max = 24,
+					.minimum = 16,
+					.maximum = 24,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -438,13 +438,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_DES_CBC,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -458,13 +458,13 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_DES_DOCSISBPI,
 				.block_size = 8,
 				.key_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 8,
-					.max = 8,
+					.minimum = 8,
+					.maximum = 8,
 					.increment = 0
 				}
 			}, }
@@ -482,9 +482,9 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				{
 				.modlen = {
 				/* min length is based on openssl rsa keygen */
-				.min = 30,
+				.minimum = 30,
 				/* value 0 symbolizes no limit on max length */
-				.max = 0,
+				.maximum = 0,
 				.increment = 1
 				}, }
 			}
@@ -500,9 +500,9 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				{
 				.modlen = {
 				/* value 0 symbolizes no limit on min length */
-				.min = 0,
+				.minimum = 0,
 				/* value 0 symbolizes no limit on max length */
-				.max = 0,
+				.maximum = 0,
 				.increment = 1
 				}, }
 			}
@@ -518,9 +518,9 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				{
 				.modlen = {
 				/* value 0 symbolizes no limit on min length */
-				.min = 0,
+				.minimum = 0,
 				/* value 0 symbolizes no limit on max length */
-				.max = 0,
+				.maximum = 0,
 				.increment = 1
 				}, }
 			}
@@ -540,9 +540,9 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				{
 				.modlen = {
 				/* value 0 symbolizes no limit on min length */
-				.min = 0,
+				.minimum = 0,
 				/* value 0 symbolizes no limit on max length */
-				.max = 0,
+				.maximum = 0,
 				.increment = 1
 				}, }
 			}
@@ -560,9 +560,9 @@  static const struct rte_cryptodev_capabilities openssl_pmd_capabilities[] = {
 				{
 				.modlen = {
 				/* value 0 symbolizes no limit on min length */
-				.min = 0,
+				.minimum = 0,
 				/* value 0 symbolizes no limit on max length */
-				.max = 0,
+				.maximum = 0,
 				.increment = 1
 				}, }
 			}
diff --git a/drivers/crypto/qat/qat_asym_capabilities.h b/drivers/crypto/qat/qat_asym_capabilities.h
index 523b4da6d3..f4e5573a98 100644
--- a/drivers/crypto/qat/qat_asym_capabilities.h
+++ b/drivers/crypto/qat/qat_asym_capabilities.h
@@ -14,8 +14,8 @@ 
 				.op_types = 0,					\
 				{						\
 				.modlen = {					\
-				.min = 1,					\
-				.max = 512,					\
+				.minimum = 1,					\
+				.maximum = 512,					\
 				.increment = 1					\
 				}, }						\
 			}							\
@@ -30,8 +30,8 @@ 
 				.op_types = 0,					\
 				{						\
 				.modlen = {					\
-				.min = 1,					\
-				.max = 512,					\
+				.minimum = 1,					\
+				.maximum = 512,					\
 				.increment = 1					\
 				}, }						\
 			}							\
@@ -50,9 +50,9 @@ 
 				{						\
 				.modlen = {					\
 				/* min length is based on openssl rsa keygen */	\
-				.min = 64,					\
+				.minimum = 64,					\
 				/* value 0 symbolizes no limit on max length */	\
-				.max = 512,					\
+				.maximum = 512,					\
 				.increment = 64					\
 				}, }						\
 			}							\
diff --git a/drivers/crypto/qat/qat_sym_capabilities.h b/drivers/crypto/qat/qat_sym_capabilities.h
index cfb176ca94..05b2083d96 100644
--- a/drivers/crypto/qat/qat_sym_capabilities.h
+++ b/drivers/crypto/qat/qat_sym_capabilities.h
@@ -14,13 +14,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA1,		\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 20,			\
+					.minimum = 1,			\
+					.maximum = 20,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -35,13 +35,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA224,		\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 28,			\
+					.minimum = 1,			\
+					.maximum = 28,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -56,13 +56,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA256,		\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 32,			\
+					.minimum = 1,			\
+					.maximum = 32,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -77,13 +77,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA384,		\
 				.block_size = 128,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 48,			\
+					.minimum = 1,			\
+					.maximum = 48,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -98,13 +98,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA512,		\
 				.block_size = 128,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -119,13 +119,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,	\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 20,			\
+					.minimum = 1,			\
+					.maximum = 20,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -140,13 +140,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,	\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 28,			\
+					.minimum = 1,			\
+					.maximum = 28,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -161,13 +161,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,	\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 32,			\
+					.minimum = 1,			\
+					.maximum = 32,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -182,13 +182,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,	\
 				.block_size = 128,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 128,			\
+					.minimum = 1,			\
+					.maximum = 128,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 48,			\
+					.minimum = 1,			\
+					.maximum = 48,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -203,13 +203,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,	\
 				.block_size = 128,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 128,			\
+					.minimum = 1,			\
+					.maximum = 128,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -224,13 +224,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,	\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 16,			\
+					.minimum = 1,			\
+					.maximum = 16,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -245,13 +245,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 12,			\
-					.max = 12,			\
+					.minimum = 12,			\
+					.maximum = 12,			\
 					.increment = 0			\
 				},					\
 				.aad_size = { 0 },			\
@@ -267,13 +267,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_AES_CMAC,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 4,			\
-					.max = 16,			\
+					.minimum = 4,			\
+					.maximum = 16,			\
 					.increment = 4			\
 				}					\
 			}, }						\
@@ -287,23 +287,23 @@ 
 				.algo = RTE_CRYPTO_AEAD_AES_CCM,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 4,			\
-					.max = 16,			\
+					.minimum = 4,			\
+					.maximum = 16,			\
 					.increment = 2			\
 				},					\
 				.aad_size = {				\
-					.min = 0,			\
-					.max = 224,			\
+					.minimum = 0,			\
+					.maximum = 224,			\
 					.increment = 1			\
 				},					\
 				.iv_size = {				\
-					.min = 7,			\
-					.max = 13,			\
+					.minimum = 7,			\
+					.maximum = 13,			\
 					.increment = 1			\
 				},					\
 			}, }						\
@@ -317,23 +317,23 @@ 
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 8			\
 				},					\
 				.digest_size = {			\
-					.min = 8,			\
-					.max = 16,			\
+					.minimum = 8,			\
+					.maximum = 16,			\
 					.increment = 4			\
 				},					\
 				.aad_size = {				\
-					.min = 0,			\
-					.max = 240,			\
+					.minimum = 0,			\
+					.maximum = 240,			\
 					.increment = 1			\
 				},					\
 				.iv_size = {				\
-					.min = 0,			\
-					.max = 12,			\
+					.minimum = 0,			\
+					.maximum = 12,			\
 					.increment = 12			\
 				},					\
 			}, }						\
@@ -347,18 +347,18 @@ 
 				.algo = RTE_CRYPTO_AUTH_AES_GMAC,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 8			\
 				},					\
 				.digest_size = {			\
-					.min = 8,			\
-					.max = 16,			\
+					.minimum = 8,			\
+					.maximum = 16,			\
 					.increment = 4			\
 				},					\
 				.iv_size = {				\
-					.min = 0,			\
-					.max = 12,			\
+					.minimum = 0,			\
+					.maximum = 12,			\
 					.increment = 12			\
 				}					\
 			}, }						\
@@ -372,18 +372,18 @@ 
 				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 4,			\
-					.max = 4,			\
+					.minimum = 4,			\
+					.maximum = 4,			\
 					.increment = 0			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -397,13 +397,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 8			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -417,13 +417,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_XTS,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 32,			\
-					.max = 64,			\
+					.minimum = 32,			\
+					.maximum = 64,			\
 					.increment = 32			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -437,13 +437,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 16			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -457,13 +457,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -477,13 +477,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 8			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -497,13 +497,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_NULL,		\
 				.block_size = 1,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.iv_size = { 0 }			\
@@ -518,13 +518,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_NULL,		\
 				.block_size = 1,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.iv_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				}					\
 			}, },						\
@@ -538,13 +538,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_KASUMI_F8,	\
 				.block_size = 8,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.iv_size = {				\
-					.min = 8,			\
-					.max = 8,			\
+					.minimum = 8,			\
+					.maximum = 8,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -558,13 +558,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_KASUMI_F9,	\
 				.block_size = 8,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 4,			\
-					.max = 4,			\
+					.minimum = 4,			\
+					.maximum = 4,			\
 					.increment = 0			\
 				},					\
 				.iv_size = { 0 }			\
@@ -579,13 +579,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,	\
 				.block_size = 8,			\
 				.key_size = {				\
-					.min = 8,			\
-					.max = 24,			\
+					.minimum = 8,			\
+					.maximum = 24,			\
 					.increment = 8			\
 				},					\
 				.iv_size = {				\
-					.min = 8,			\
-					.max = 8,			\
+					.minimum = 8,			\
+					.maximum = 8,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -599,13 +599,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_3DES_CTR,	\
 				.block_size = 8,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 24,			\
+					.minimum = 16,			\
+					.maximum = 24,			\
 					.increment = 8			\
 				},					\
 				.iv_size = {				\
-					.min = 8,			\
-					.max = 8,			\
+					.minimum = 8,			\
+					.maximum = 8,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -619,13 +619,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_DES_CBC,	\
 				.block_size = 8,			\
 				.key_size = {				\
-					.min = 8,			\
-					.max = 8,			\
+					.minimum = 8,			\
+					.maximum = 8,			\
 					.increment = 0			\
 				},					\
 				.iv_size = {				\
-					.min = 8,			\
-					.max = 8,			\
+					.minimum = 8,			\
+					.maximum = 8,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -639,13 +639,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_DES_DOCSISBPI,\
 				.block_size = 8,			\
 				.key_size = {				\
-					.min = 8,			\
-					.max = 8,			\
+					.minimum = 8,			\
+					.maximum = 8,			\
 					.increment = 0			\
 				},					\
 				.iv_size = {				\
-					.min = 8,			\
-					.max = 8,			\
+					.minimum = 8,			\
+					.maximum = 8,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -661,13 +661,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -681,18 +681,18 @@ 
 				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 4,			\
-					.max = 4,			\
+					.minimum = 4,			\
+					.maximum = 4,			\
 					.increment = 0			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -708,23 +708,23 @@ 
 				.algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305, \
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 32,			\
-					.max = 32,			\
+					.minimum = 32,			\
+					.maximum = 32,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.aad_size = {				\
-					.min = 0,			\
-					.max = 240,			\
+					.minimum = 0,			\
+					.maximum = 240,			\
 					.increment = 1			\
 				},					\
 				.iv_size = {				\
-					.min = 12,			\
-					.max = 12,			\
+					.minimum = 12,			\
+					.maximum = 12,			\
 					.increment = 0			\
 				},					\
 			}, }						\
@@ -740,13 +740,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 8			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -760,13 +760,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,	\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 20,			\
+					.minimum = 1,			\
+					.maximum = 20,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -781,13 +781,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,	\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 28,			\
+					.minimum = 1,			\
+					.maximum = 28,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -802,13 +802,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,	\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 32,			\
+					.minimum = 1,			\
+					.maximum = 32,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -823,13 +823,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,	\
 				.block_size = 128,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 128,			\
+					.minimum = 1,			\
+					.maximum = 128,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 48,			\
+					.minimum = 1,			\
+					.maximum = 48,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -844,13 +844,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,	\
 				.block_size = 128,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 128,			\
+					.minimum = 1,			\
+					.maximum = 128,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -865,13 +865,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 12,			\
-					.max = 12,			\
+					.minimum = 12,			\
+					.maximum = 12,			\
 					.increment = 0			\
 				},					\
 				.aad_size = { 0 },			\
@@ -887,13 +887,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_AES_CMAC,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 4,			\
-					.max = 16,			\
+					.minimum = 4,			\
+					.maximum = 16,			\
 					.increment = 4			\
 				}					\
 			}, }						\
@@ -907,13 +907,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 16			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -927,13 +927,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_NULL,		\
 				.block_size = 1,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.iv_size = { 0 }			\
@@ -948,13 +948,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_NULL,		\
 				.block_size = 1,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.iv_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				}					\
 			}, },						\
@@ -968,13 +968,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA1,		\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 20,			\
+					.minimum = 1,			\
+					.maximum = 20,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -989,13 +989,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA224,		\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 28,			\
+					.minimum = 1,			\
+					.maximum = 28,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -1010,13 +1010,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA256,		\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 32,			\
+					.minimum = 1,			\
+					.maximum = 32,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -1031,13 +1031,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA384,		\
 				.block_size = 128,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 48,			\
+					.minimum = 1,			\
+					.maximum = 48,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -1052,13 +1052,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA512,		\
 				.block_size = 128,			\
 				.key_size = {				\
-					.min = 0,			\
-					.max = 0,			\
+					.minimum = 0,			\
+					.maximum = 0,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -1073,13 +1073,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_CTR,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 8			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
@@ -1093,23 +1093,23 @@ 
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 8			\
 				},					\
 				.digest_size = {			\
-					.min = 8,			\
-					.max = 16,			\
+					.minimum = 8,			\
+					.maximum = 16,			\
 					.increment = 4			\
 				},					\
 				.aad_size = {				\
-					.min = 0,			\
-					.max = 240,			\
+					.minimum = 0,			\
+					.maximum = 240,			\
 					.increment = 1			\
 				},					\
 				.iv_size = {				\
-					.min = 0,			\
-					.max = 12,			\
+					.minimum = 0,			\
+					.maximum = 12,			\
 					.increment = 12			\
 				},					\
 			}, }						\
@@ -1123,23 +1123,23 @@ 
 				.algo = RTE_CRYPTO_AEAD_AES_CCM,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 4,			\
-					.max = 16,			\
+					.minimum = 4,			\
+					.maximum = 16,			\
 					.increment = 2			\
 				},					\
 				.aad_size = {				\
-					.min = 0,			\
-					.max = 224,			\
+					.minimum = 0,			\
+					.maximum = 224,			\
 					.increment = 1			\
 				},					\
 				.iv_size = {				\
-					.min = 7,			\
-					.max = 13,			\
+					.minimum = 7,			\
+					.maximum = 13,			\
 					.increment = 1			\
 				},					\
 			}, }						\
@@ -1153,23 +1153,23 @@ 
 				.algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305, \
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 32,			\
-					.max = 32,			\
+					.minimum = 32,			\
+					.maximum = 32,			\
 					.increment = 0			\
 				},					\
 				.digest_size = {			\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				},					\
 				.aad_size = {				\
-					.min = 0,			\
-					.max = 240,			\
+					.minimum = 0,			\
+					.maximum = 240,			\
 					.increment = 1			\
 				},					\
 				.iv_size = {				\
-					.min = 12,			\
-					.max = 12,			\
+					.minimum = 12,			\
+					.maximum = 12,			\
 					.increment = 0			\
 				},					\
 			}, }						\
@@ -1183,18 +1183,18 @@ 
 				.algo = RTE_CRYPTO_AUTH_AES_GMAC,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 8			\
 				},					\
 				.digest_size = {			\
-					.min = 8,			\
-					.max = 16,			\
+					.minimum = 8,			\
+					.maximum = 16,			\
 					.increment = 4			\
 				},					\
 				.iv_size = {				\
-					.min = 0,			\
-					.max = 12,			\
+					.minimum = 0,			\
+					.maximum = 12,			\
 					.increment = 12			\
 				}					\
 			}, }						\
@@ -1213,13 +1213,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 16			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
index 1e0b4df0ca..fe96ca949a 100644
--- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
+++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.c
@@ -49,16 +49,16 @@  sync_caps(struct rte_cryptodev_capabilities *caps,
 						cap->sym.auth.algo)
 					continue;
 
-				cap->sym.auth.digest_size.min =
-					s_cap->sym.auth.digest_size.min <
-					cap->sym.auth.digest_size.min ?
-					s_cap->sym.auth.digest_size.min :
-					cap->sym.auth.digest_size.min;
-				cap->sym.auth.digest_size.max =
-					s_cap->sym.auth.digest_size.max <
-					cap->sym.auth.digest_size.max ?
-					s_cap->sym.auth.digest_size.max :
-					cap->sym.auth.digest_size.max;
+				cap->sym.auth.digest_size.minimum =
+					s_cap->sym.auth.digest_size.minimum <
+					cap->sym.auth.digest_size.minimum ?
+					s_cap->sym.auth.digest_size.minimum :
+					cap->sym.auth.digest_size.minimum;
+				cap->sym.auth.digest_size.maximum =
+					s_cap->sym.auth.digest_size.maximum <
+					cap->sym.auth.digest_size.maximum ?
+					s_cap->sym.auth.digest_size.maximum :
+					cap->sym.auth.digest_size.maximum;
 
 			}
 
diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
index 906a0fe60b..6aea6d701f 100644
--- a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
@@ -19,18 +19,18 @@  static const struct rte_cryptodev_capabilities snow3g_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -44,13 +44,13 @@  static const struct rte_cryptodev_capabilities snow3g_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
diff --git a/drivers/crypto/virtio/virtio_crypto_capabilities.h b/drivers/crypto/virtio/virtio_crypto_capabilities.h
index 03c30deefd..3624a28ce5 100644
--- a/drivers/crypto/virtio/virtio_crypto_capabilities.h
+++ b/drivers/crypto/virtio/virtio_crypto_capabilities.h
@@ -14,13 +14,13 @@ 
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,	\
 				.block_size = 64,			\
 				.key_size = {				\
-					.min = 1,			\
-					.max = 64,			\
+					.minimum = 1,			\
+					.maximum = 64,			\
 					.increment = 1			\
 				},					\
 				.digest_size = {			\
-					.min = 1,			\
-					.max = 20,			\
+					.minimum = 1,			\
+					.maximum = 20,			\
 					.increment = 1			\
 				},					\
 				.iv_size = { 0 }			\
@@ -35,13 +35,13 @@ 
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,	\
 				.block_size = 16,			\
 				.key_size = {				\
-					.min = 16,			\
-					.max = 32,			\
+					.minimum = 16,			\
+					.maximum = 32,			\
 					.increment = 8			\
 				},					\
 				.iv_size = {				\
-					.min = 16,			\
-					.max = 16,			\
+					.minimum = 16,			\
+					.maximum = 16,			\
 					.increment = 0			\
 				}					\
 			}, }						\
diff --git a/drivers/crypto/zuc/rte_zuc_pmd_ops.c b/drivers/crypto/zuc/rte_zuc_pmd_ops.c
index dc9dc25ef8..cb33795462 100644
--- a/drivers/crypto/zuc/rte_zuc_pmd_ops.c
+++ b/drivers/crypto/zuc/rte_zuc_pmd_ops.c
@@ -19,18 +19,18 @@  static const struct rte_cryptodev_capabilities zuc_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.digest_size = {
-					.min = 4,
-					.max = 4,
+					.minimum = 4,
+					.maximum = 4,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -44,13 +44,13 @@  static const struct rte_cryptodev_capabilities zuc_pmd_capabilities[] = {
 				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 			}, }
diff --git a/drivers/net/ixgbe/ixgbe_ipsec.c b/drivers/net/ixgbe/ixgbe_ipsec.c
index e45c5501e6..8022e9f460 100644
--- a/drivers/net/ixgbe/ixgbe_ipsec.c
+++ b/drivers/net/ixgbe/ixgbe_ipsec.c
@@ -507,18 +507,18 @@  ixgbe_crypto_capabilities_get(void *device __rte_unused)
 					.algo = RTE_CRYPTO_AUTH_AES_GMAC,
 					.block_size = 16,
 					.key_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					},
 					.digest_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					},
 					.iv_size = {
-						.min = 12,
-						.max = 12,
+						.minimum = 12,
+						.maximum = 12,
 						.increment = 0
 					}
 				}, }
@@ -532,23 +532,23 @@  ixgbe_crypto_capabilities_get(void *device __rte_unused)
 					.algo = RTE_CRYPTO_AEAD_AES_GCM,
 					.block_size = 16,
 					.key_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					},
 					.digest_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					},
 					.aad_size = {
-						.min = 0,
-						.max = 65535,
+						.minimum = 0,
+						.maximum = 65535,
 						.increment = 1
 					},
 					.iv_size = {
-						.min = 12,
-						.max = 12,
+						.minimum = 12,
+						.maximum = 12,
 						.increment = 0
 					}
 				}, }
diff --git a/drivers/net/octeontx2/otx2_ethdev_sec.c b/drivers/net/octeontx2/otx2_ethdev_sec.c
index c2a36883cb..0cb6b88641 100644
--- a/drivers/net/octeontx2/otx2_ethdev_sec.c
+++ b/drivers/net/octeontx2/otx2_ethdev_sec.c
@@ -45,23 +45,23 @@  static struct rte_cryptodev_capabilities otx2_eth_sec_crypto_caps[] = {
 				.algo = RTE_CRYPTO_AEAD_AES_GCM,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.digest_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				},
 				.aad_size = {
-					.min = 8,
-					.max = 12,
+					.minimum = 8,
+					.maximum = 12,
 					.increment = 4
 				},
 				.iv_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				}
 			}, }
@@ -75,13 +75,13 @@  static struct rte_cryptodev_capabilities otx2_eth_sec_crypto_caps[] = {
 				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
 				.block_size = 16,
 				.key_size = {
-					.min = 16,
-					.max = 32,
+					.minimum = 16,
+					.maximum = 32,
 					.increment = 8
 				},
 				.iv_size = {
-					.min = 16,
-					.max = 16,
+					.minimum = 16,
+					.maximum = 16,
 					.increment = 0
 				}
 			}, }
@@ -95,13 +95,13 @@  static struct rte_cryptodev_capabilities otx2_eth_sec_crypto_caps[] = {
 				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
 				.block_size = 64,
 				.key_size = {
-					.min = 20,
-					.max = 64,
+					.minimum = 20,
+					.maximum = 64,
 					.increment = 1
 				},
 				.digest_size = {
-					.min = 12,
-					.max = 12,
+					.minimum = 12,
+					.maximum = 12,
 					.increment = 0
 				},
 			}, }
diff --git a/drivers/net/txgbe/txgbe_ipsec.c b/drivers/net/txgbe/txgbe_ipsec.c
index ccd747973b..a82b4ce2d1 100644
--- a/drivers/net/txgbe/txgbe_ipsec.c
+++ b/drivers/net/txgbe/txgbe_ipsec.c
@@ -486,18 +486,18 @@  txgbe_crypto_capabilities_get(void *device __rte_unused)
 					.algo = RTE_CRYPTO_AUTH_AES_GMAC,
 					.block_size = 16,
 					.key_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					},
 					.digest_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					},
 					.iv_size = {
-						.min = 12,
-						.max = 12,
+						.minimum = 12,
+						.maximum = 12,
 						.increment = 0
 					}
 				}, }
@@ -511,23 +511,23 @@  txgbe_crypto_capabilities_get(void *device __rte_unused)
 					.algo = RTE_CRYPTO_AEAD_AES_GCM,
 					.block_size = 16,
 					.key_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					},
 					.digest_size = {
-						.min = 16,
-						.max = 16,
+						.minimum = 16,
+						.maximum = 16,
 						.increment = 0
 					},
 					.aad_size = {
-						.min = 0,
-						.max = 65535,
+						.minimum = 0,
+						.maximum = 65535,
 						.increment = 1
 					},
 					.iv_size = {
-						.min = 12,
-						.max = 12,
+						.minimum = 12,
+						.maximum = 12,
 						.increment = 0
 					}
 				}, }
diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 5f539c458c..b6bc371bd2 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -1996,8 +1996,8 @@  check_iv_param(const struct rte_crypto_param_range *iv_range_size,
 	 */
 	if (iv_param) {
 		if (check_supported_size(iv_length,
-				iv_range_size->min,
-				iv_range_size->max,
+				iv_range_size->minimum,
+				iv_range_size->maximum,
 				iv_range_size->increment)
 					!= 0)
 			return -1;
@@ -2007,8 +2007,8 @@  check_iv_param(const struct rte_crypto_param_range *iv_range_size,
 	 */
 	} else if (iv_random_size != -1) {
 		if (check_supported_size(iv_random_size,
-				iv_range_size->min,
-				iv_range_size->max,
+				iv_range_size->minimum,
+				iv_range_size->maximum,
 				iv_range_size->increment)
 					!= 0)
 			return -1;
@@ -2050,8 +2050,8 @@  check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id)
 		if (options->aead_key_param) {
 			if (check_supported_size(
 					options->aead_xform.aead.key.length,
-					cap->sym.aead.key_size.min,
-					cap->sym.aead.key_size.max,
+					cap->sym.aead.key_size.minimum,
+					cap->sym.aead.key_size.maximum,
 					cap->sym.aead.key_size.increment)
 						!= 0) {
 				RTE_LOG(DEBUG, USER1,
@@ -2066,8 +2066,8 @@  check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id)
 		 */
 		} else if (options->aead_key_random_size != -1) {
 			if (check_supported_size(options->aead_key_random_size,
-					cap->sym.aead.key_size.min,
-					cap->sym.aead.key_size.max,
+					cap->sym.aead.key_size.minimum,
+					cap->sym.aead.key_size.maximum,
 					cap->sym.aead.key_size.increment)
 						!= 0) {
 				RTE_LOG(DEBUG, USER1,
@@ -2085,8 +2085,8 @@  check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id)
 		 */
 		if (options->aad_param) {
 			if (check_supported_size(options->aad.length,
-					cap->sym.aead.aad_size.min,
-					cap->sym.aead.aad_size.max,
+					cap->sym.aead.aad_size.minimum,
+					cap->sym.aead.aad_size.maximum,
 					cap->sym.aead.aad_size.increment)
 						!= 0) {
 				RTE_LOG(DEBUG, USER1,
@@ -2101,8 +2101,8 @@  check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id)
 		 */
 		} else if (options->aad_random_size != -1) {
 			if (check_supported_size(options->aad_random_size,
-					cap->sym.aead.aad_size.min,
-					cap->sym.aead.aad_size.max,
+					cap->sym.aead.aad_size.minimum,
+					cap->sym.aead.aad_size.maximum,
 					cap->sym.aead.aad_size.increment)
 						!= 0) {
 				RTE_LOG(DEBUG, USER1,
@@ -2116,8 +2116,8 @@  check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id)
 		/* Check if digest size is supported by the algorithm. */
 		if (options->digest_size != -1) {
 			if (check_supported_size(options->digest_size,
-					cap->sym.aead.digest_size.min,
-					cap->sym.aead.digest_size.max,
+					cap->sym.aead.digest_size.minimum,
+					cap->sym.aead.digest_size.maximum,
 					cap->sym.aead.digest_size.increment)
 						!= 0) {
 				RTE_LOG(DEBUG, USER1,
@@ -2160,8 +2160,8 @@  check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id)
 		if (options->ckey_param) {
 			if (check_supported_size(
 					options->cipher_xform.cipher.key.length,
-					cap->sym.cipher.key_size.min,
-					cap->sym.cipher.key_size.max,
+					cap->sym.cipher.key_size.minimum,
+					cap->sym.cipher.key_size.maximum,
 					cap->sym.cipher.key_size.increment)
 						!= 0) {
 				if (dev_info.feature_flags &
@@ -2185,8 +2185,8 @@  check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id)
 		 */
 		} else if (options->ckey_random_size != -1) {
 			if (check_supported_size(options->ckey_random_size,
-					cap->sym.cipher.key_size.min,
-					cap->sym.cipher.key_size.max,
+					cap->sym.cipher.key_size.minimum,
+					cap->sym.cipher.key_size.maximum,
 					cap->sym.cipher.key_size.increment)
 						!= 0) {
 				RTE_LOG(DEBUG, USER1,
@@ -2262,8 +2262,8 @@  check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id)
 		if (options->akey_param) {
 			if (check_supported_size(
 					options->auth_xform.auth.key.length,
-					cap->sym.auth.key_size.min,
-					cap->sym.auth.key_size.max,
+					cap->sym.auth.key_size.minimum,
+					cap->sym.auth.key_size.maximum,
 					cap->sym.auth.key_size.increment)
 						!= 0) {
 				RTE_LOG(DEBUG, USER1,
@@ -2278,8 +2278,8 @@  check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id)
 		 */
 		} else if (options->akey_random_size != -1) {
 			if (check_supported_size(options->akey_random_size,
-					cap->sym.auth.key_size.min,
-					cap->sym.auth.key_size.max,
+					cap->sym.auth.key_size.minimum,
+					cap->sym.auth.key_size.maximum,
 					cap->sym.auth.key_size.increment)
 						!= 0) {
 				RTE_LOG(DEBUG, USER1,
@@ -2293,8 +2293,8 @@  check_capabilities(struct l2fwd_crypto_options *options, uint8_t cdev_id)
 		/* Check if digest size is supported by the algorithm. */
 		if (options->digest_size != -1) {
 			if (check_supported_size(options->digest_size,
-					cap->sym.auth.digest_size.min,
-					cap->sym.auth.digest_size.max,
+					cap->sym.auth.digest_size.minimum,
+					cap->sym.auth.digest_size.maximum,
 					cap->sym.auth.digest_size.increment)
 						!= 0) {
 				RTE_LOG(DEBUG, USER1,
@@ -2448,7 +2448,7 @@  initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
 				/* No size provided, use minimum size. */
 				else
 					options->aead_iv.length =
-						cap->sym.aead.iv_size.min;
+						cap->sym.aead.iv_size.minimum;
 			}
 
 			/* Set key if not provided from command line */
@@ -2459,7 +2459,7 @@  initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
 				/* No size provided, use minimum size. */
 				else
 					options->aead_xform.aead.key.length =
-						cap->sym.aead.key_size.min;
+						cap->sym.aead.key_size.minimum;
 
 				generate_random_key(options->aead_key,
 					options->aead_xform.aead.key.length);
@@ -2473,7 +2473,7 @@  initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
 				/* No size provided, use minimum size. */
 				else
 					options->aad.length =
-						cap->sym.auth.aad_size.min;
+						cap->sym.auth.aad_size.minimum;
 			}
 
 			options->aead_xform.aead.aad_length =
@@ -2486,7 +2486,7 @@  initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
 				/* No size provided, use minimum size. */
 			else
 				options->aead_xform.aead.digest_length =
-						cap->sym.aead.digest_size.min;
+					cap->sym.aead.digest_size.minimum;
 		}
 
 		/* Set cipher parameters */
@@ -2505,7 +2505,7 @@  initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
 				/* No size provided, use minimum size. */
 				else
 					options->cipher_iv.length =
-						cap->sym.cipher.iv_size.min;
+						cap->sym.cipher.iv_size.minimum;
 			}
 
 			/* Set key if not provided from command line */
@@ -2516,7 +2516,7 @@  initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
 				/* No size provided, use minimum size. */
 				else
 					options->cipher_xform.cipher.key.length =
-						cap->sym.cipher.key_size.min;
+						cap->sym.cipher.key_size.minimum;
 
 				generate_random_key(options->cipher_key,
 					options->cipher_xform.cipher.key.length);
@@ -2538,7 +2538,7 @@  initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
 				/* No size provided, use minimum size. */
 				else
 					options->auth_iv.length =
-						cap->sym.auth.iv_size.min;
+						cap->sym.auth.iv_size.minimum;
 			}
 
 			/* Set key if not provided from command line */
@@ -2549,7 +2549,7 @@  initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
 				/* No size provided, use minimum size. */
 				else
 					options->auth_xform.auth.key.length =
-						cap->sym.auth.key_size.min;
+						cap->sym.auth.key_size.minimum;
 
 				generate_random_key(options->auth_key,
 					options->auth_xform.auth.key.length);
@@ -2562,7 +2562,7 @@  initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,
 				/* No size provided, use minimum size. */
 			else
 				options->auth_xform.auth.digest_length =
-						cap->sym.auth.digest_size.min;
+						cap->sym.auth.digest_size.minimum;
 		}
 
 		retval = rte_cryptodev_configure(cdev_id, &conf);
diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index 447aa9d519..9db1b86426 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -320,10 +320,10 @@  param_range_check(uint16_t size, const struct rte_crypto_param_range *range)
 	unsigned int next_size;
 
 	/* Check lower/upper bounds */
-	if (size < range->min)
+	if (size < range->minimum)
 		return -1;
 
-	if (size > range->max)
+	if (size > range->maximum)
 		return -1;
 
 	/* If range is actually only one value, size is correct */
@@ -331,7 +331,7 @@  param_range_check(uint16_t size, const struct rte_crypto_param_range *range)
 		return 0;
 
 	/* Check if value is one of the supported sizes */
-	for (next_size = range->min; next_size <= range->max;
+	for (next_size = range->minimum; next_size <= range->maximum;
 			next_size += range->increment)
 		if (size == next_size)
 			return 0;
@@ -429,13 +429,13 @@  rte_cryptodev_asym_xform_capability_check_modlen(
 	uint16_t modlen)
 {
 	/* no need to check for limits, if min or max = 0 */
-	if (capability->modlen.min != 0) {
-		if (modlen < capability->modlen.min)
+	if (capability->modlen.minimum != 0) {
+		if (modlen < capability->modlen.minimum)
 			return -1;
 	}
 
-	if (capability->modlen.max != 0) {
-		if (modlen > capability->modlen.max)
+	if (capability->modlen.maximum != 0) {
+		if (modlen > capability->modlen.maximum)
 			return -1;
 	}
 
diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
index 11f4e6fdbf..63ce4d0530 100644
--- a/lib/cryptodev/rte_cryptodev.h
+++ b/lib/cryptodev/rte_cryptodev.h
@@ -85,8 +85,8 @@  extern const char **rte_cyptodev_names;
  * Crypto parameters range description
  */
 struct rte_crypto_param_range {
-	uint16_t min;	/**< minimum size */
-	uint16_t max;	/**< maximum size */
+	uint16_t minimum;	/**< minimum size */
+	uint16_t maximum;	/**< maximum size */
 	uint16_t increment;
 	/**< if a range of sizes are supported,
 	 * this parameter is used to indicate