support SSL/TLS way of cipher-auth operations
v2 cover support SSL/TLS way of cipher-auth operations
This series adds SSL/TLS way of cipher-auth operations support i.e. auth generation followed by encryption and decryption followed by auth verify in OCTEON TX, OCTEON TX2 PMDs and sample unit test application.
It also adds feature flag for SSL/TLS order in cryptodev library so that SSL test cases are skipped if the device doesn't support the feature.
v2:
* Added feature flag for SSL/TLS order in cryptodev library
* Moved SSL/TLS test cases to proper test sub-suite
Tejasree Kondoj (3):
cryptodev: add feature flag for SSL/TLS order common/cpt: add support for SSL/TLS way of cipher-auth operations test/crypto: add support for SSL/TLS way of cipher-auth operations
app/test/test_cryptodev_aes_test_vectors.h | 589 ++++++++++++++++++ app/test/test_cryptodev_blockcipher.c | 107 +++- app/test/test_cryptodev_blockcipher.h | 10 + doc/guides/cryptodevs/features/default.ini | 1 + doc/guides/cryptodevs/features/octeontx.ini | 1 + doc/guides/cryptodevs/features/octeontx2.ini | 1 + doc/guides/rel_notes/release_21_02.rst | 18 + drivers/common/cpt/cpt_mcode_defines.h | 7 +- drivers/common/cpt/cpt_ucode.h | 42 +- drivers/crypto/octeontx/otx_cryptodev_ops.c | 11 +- drivers/crypto/octeontx2/otx2_cryptodev.c | 3 +- drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 8 +- lib/librte_cryptodev/rte_cryptodev.h | 2 + 13 files changed, 774 insertions(+), 26 deletions(-)
Signature · 1 line
2.27.0
PATCH v2 1/3 cryptodev: add feature flag for SSL/TLS order
Added device feature flag for SSL/TLS way of cipher-auth operations support i.e. auth generation followed by encryption and decryption followed by auth verify so that SSL/TLS tests are skipped if the device doesn't support the feature.
--- doc/guides/cryptodevs/features/default.ini | 1 + doc/guides/rel_notes/release_21_02.rst | 7 +++++++ lib/librte_cryptodev/rte_cryptodev.h | 2 ++ 3 files changed, 10 insertions(+)
doc/guides/cryptodevs/features/default.ini +1 -0
@@ -31,6 +31,7 @@ CPU crypto = Symmetric sessionless = Non-Byte aligned data = Sym raw data path API = +SSL way of chaining = ; ; Supported crypto algorithms of a default crypto driver.
doc/guides/rel_notes/release_21_02.rst +7 -0
@@ -82,6 +82,13 @@ New Features enable applications to add/remove user callbacks which gets called for every enqueue/dequeue operation. +* **Added feature flag in cryptodev library.** + + Added device feature flag for SSL/TLS way of cipher-auth operations support + i.e. auth generation followed by encryption and decryption followed by + auth verify in cryptodev library so that SSL/TLS tests are skipped if the + device doesn't support the feature. + * **Updated the OCTEON TX2 crypto PMD.** * Updated the OCTEON TX2 crypto PMD lookaside protocol offload for IPsec with
lib/librte_cryptodev/rte_cryptodev.h +2 -0
@@ -461,6 +461,8 @@ rte_cryptodev_asym_get_xform_enum(enum rte_crypto_asym_xform_type *xform_enum,/**< Support operations on data which is not byte aligned */ #define RTE_CRYPTODEV_FF_SYM_RAW_DP (1ULL << 24)/**< Support accelerator specific symmetric raw data-path APIs */ +#define RTE_CRYPTODEV_FF_SSL_ORDER (1ULL << 25) +/**< Support SSL order of cipher-auth xforms chaining */ /** * Get the name of a crypto device feature flag
Signature · 1 line
2.27.0
Re: [dpdk-dev] [PATCH v2 1/3] cryptodev: add feature flag for SSL/TLS order
Hi Tejasree,
Quoted 9 lines
Subject: [PATCH v2 1/3] cryptodev: add feature flag for SSL/TLS order
Added device feature flag for SSL/TLS way of cipher-auth operations support i.e. auth generation followed by encryption and decryption followed by auth verify so that SSL/TLS tests are skipped if the device doesn't support the feature.
Signed-off-by Tejasree Kondoj <[email protected]>---
Is it something different than
#define RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED (1ULL << 19)
/**< Support encrypted-digest operations where digest is appended to data */
@Fan: could you review this patchset.
Quoted 55 lines
doc/guides/cryptodevs/features/default.ini | 1 + doc/guides/rel_notes/release_21_02.rst | 7 +++++++ lib/librte_cryptodev/rte_cryptodev.h | 2 ++ 3 files changed, 10 insertions(+)doc/guides/cryptodevs/features/default.ini +1
-0@@ -31,6 +31,7 @@ CPU crypto = Symmetric sessionless = Non-Byte aligned data = Sym raw data path API = +SSL way of chaining = ; ; Supported crypto algorithms of a default crypto driver.doc/guides/rel_notes/release_21_02.rst +7
-0@@ -82,6 +82,13 @@ New Features enable applications to add/remove user callbacks which gets called for every enqueue/dequeue operation. +* **Added feature flag in cryptodev library.** + + Added device feature flag for SSL/TLS way of cipher-auth operations support + i.e. auth generation followed by encryption and decryption followed by + auth verify in cryptodev library so that SSL/TLS tests are skipped if the + device doesn't support the feature. + * **Updated the OCTEON TX2 crypto PMD.** * Updated the OCTEON TX2 crypto PMD lookaside protocol offload for IPsecwith
lib/librte_cryptodev/rte_cryptodev.h +2
-0@@ -461,6 +461,8 @@ rte_cryptodev_asym_get_xform_enum(enum rte_crypto_asym_xform_type *xform_enum,/**< Support operations on data which is not byte aligned */ #define RTE_CRYPTODEV_FF_SYM_RAW_DP (1ULL << 24)/**< Support accelerator specific symmetric raw data-path APIs */ +#define RTE_CRYPTODEV_FF_SSL_ORDER (1ULL << 25) +/**< Support SSL order of cipher-auth xforms chaining */ /** * Get the name of a crypto device feature flag
--
2.27.0
Re: [dpdk-dev] [PATCH v2 1/3] cryptodev: add feature flag for SSL/TLS order
Hi Akhil,
It is same as DIGEST_ENCRYPTED. Will remove SSL_ORDER and use this flag in v3.
Thanks
Tejasree
Quoted 86 lines
-----Original Message-----
From: Akhil Goyal <[email protected]>
Sent: Monday, January 25, 2021 10:07 PM
To: Tejasree Kondoj <[email protected]>; Radu Nicolau <[email protected]>; Fan Zhang <[email protected]>
Cc: Anoob Joseph <[email protected]>; Ankur Dwivedi <[email protected]>; [email protected]
Subject: [EXT] RE: [PATCH v2 1/3] cryptodev: add feature flag for SSL/TLS orderExternal Email
----------------------------------------------------------------------
Hi Tejasree,Quoted 9 lines
Subject: [PATCH v2 1/3] cryptodev: add feature flag for SSL/TLS order
Added device feature flag for SSL/TLS way of cipher-auth operations support i.e. auth generation followed by encryption and decryption followed by auth verify so that SSL/TLS tests are skipped if the device doesn't support the feature.
Signed-off-by Tejasree Kondoj <[email protected]>---
Is it something different than
#defineRTE_CRYPTODEV_FF_DIGEST_ENCRYPTED(1ULL << 19)
/**< Support encrypted-digest operations where digest is appended to data */@Fan: could you review this patchset.
Quoted 54 lines
doc/guides/cryptodevs/features/default.ini | 1 + doc/guides/rel_notes/release_21_02.rst | 7 +++++++ lib/librte_cryptodev/rte_cryptodev.h | 2 ++ 3 files changed, 10 insertions(+)doc/guides/cryptodevs/features/default.ini +1
-0@@ -31,6 +31,7 @@ CPU crypto = Symmetric sessionless = Non-Byte aligned data = Sym raw data path API = +SSL way of chaining = ; ; Supported crypto algorithms of a default crypto driver.doc/guides/rel_notes/release_21_02.rst +7
-0@@ -82,6 +82,13 @@ New Features enable applications to add/remove user callbacks which gets called for every enqueue/dequeue operation. +* **Added feature flag in cryptodev library.** + + Added device feature flag for SSL/TLS way of cipher-auth operations + support i.e. auth generation followed by encryption and decryption + followed by auth verify in cryptodev library so that SSL/TLS tests + are skipped if the device doesn't support the feature. + * **Updated the OCTEON TX2 crypto PMD.** * Updated the OCTEON TX2 crypto PMD lookaside protocol offload forIPsec with diff --git
a/lib/librte_cryptodev/rte_cryptodev.hb/lib/librte_cryptodev/rte_cryptodev.h
indexae34f33f69..6ee3f33c06100644lib/librte_cryptodev/rte_cryptodev.h +0
-0@@ -461,6 +461,8 @@ rte_cryptodev_asym_get_xform_enum(enum
rte_crypto_asym_xform_type*xform_enum, /**< Support operations on data which is not byte aligned */
#defineRTE_CRYPTODEV_FF_SYM_RAW_DP(1ULL << 24)
/**< Support accelerator specific symmetric raw data-path APIs */lib/librte_cryptodev/rte_cryptodev.h +2
-1+#define RTE_CRYPTODEV_FF_SSL_ORDER (1ULL << 25) +/**< Support SSL order of cipher-auth xforms chaining */ /** * Get the name of a crypto device feature flag -- 2.27.0
PATCH v2 2/3 common/cpt: add support for SSL/TLS way of cipher-auth operations
In reply to Tejasree KondojAdding support for SSL/TLS way of cipher-auth operations order
- auth generation followed by encryption
- decryption followed by auth verify
--- doc/guides/cryptodevs/features/octeontx.ini | 1 + doc/guides/cryptodevs/features/octeontx2.ini | 1 + doc/guides/rel_notes/release_21_02.rst | 5 +++ drivers/common/cpt/cpt_mcode_defines.h | 7 +++- drivers/common/cpt/cpt_ucode.h | 42 +++++++++++++++---- drivers/crypto/octeontx/otx_cryptodev_ops.c | 11 +++-- drivers/crypto/octeontx2/otx2_cryptodev.c | 3 +- drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 8 +++- 8 files changed, 64 insertions(+), 14 deletions(-)
doc/guides/cryptodevs/features/octeontx.ini +1 -0
@@ -14,6 +14,7 @@ OOP SGL In SGL Out = Y OOP LB In LB Out = Y RSA PRIV OP KEY QT = Y Symmetric sessionless = Y +SSL way of chaining = Y ; ; Supported crypto algorithms of 'octeontx' crypto driver.
doc/guides/cryptodevs/features/octeontx2.ini +1 -0
@@ -15,6 +15,7 @@ OOP SGL In SGL Out = Y OOP LB In LB Out = Y RSA PRIV OP KEY QT = Y Symmetric sessionless = Y +SSL way of chaining = Y ; ; Supported crypto algorithms of 'octeontx2' crypto driver.
doc/guides/rel_notes/release_21_02.rst +5 -0
@@ -98,6 +98,11 @@ New Features PMD lookaside protocol offload for IPsec. * Added support for aes-cbc sha256-128-hmac cipher combination in OCTEON TX2 crypto PMD lookaside protocol offload for IPsec. + * Added SSL/TLS way of cipher-auth operations support in OCTEON TX2 crypto PMD. + +* **Updated the OCTEON TX crypto PMD.** + + * Added SSL/TLS way of cipher-auth operations support in OCTEON TX crypto PMD. Removed Items
drivers/common/cpt/cpt_mcode_defines.h +6 -1
@@ -20,6 +20,9 @@#define CPT_MAJOR_OP_ZUC_SNOW3G 0x37#define CPT_MAJOR_OP_KASUMI 0x38#define CPT_MAJOR_OP_MISC 0x01 +#define CPT_HMAC_FIRST_BIT_POS 0x4 +#define CPT_FC_MINOR_OP_ENCRYPT 0x0 +#define CPT_FC_MINOR_OP_DECRYPT 0x1/* AE opcodes */ #define CPT_MAJOR_OP_MODEX 0x03
@@ -314,8 +317,10 @@ struct cpt_ctx { uint64_t hmac :1; uint64_t zsk_flags :3; uint64_t k_ecb :1; + uint64_t auth_enc :1; + uint64_t dec_auth :1; uint64_t snow3g :2; - uint64_t rsvd :21; + uint64_t rsvd :19;/* Below fields are accessed by hardware */ union {mc_fc_context_t fctx;
drivers/common/cpt/cpt_ucode.h +35 -7
108 lines not on this page · raw message
drivers/crypto/octeontx/otx_cryptodev_ops.c +8 -3
@@ -205,12 +205,16 @@ sym_xform_verify(struct rte_crypto_sym_xform *xform)if (xform->next) {if (xform->type ==RTE_CRYPTO_SYM_XFORM_AUTH && xform->next->type ==RTE_CRYPTO_SYM_XFORM_CIPHER && - xform->next->cipher.op ==RTE_CRYPTO_CIPHER_OP_ENCRYPT ) + xform->next->cipher.op ==RTE_CRYPTO_CIPHER_OP_ENCRYPT && + (xform->auth.algo !=RTE_CRYPTO_AUTH_SHA1_HMAC || + xform->next->cipher.algo !=RTE_CRYPTO_CIPHER_AES_CBC ))return -ENOTSUP ;if (xform->type ==RTE_CRYPTO_SYM_XFORM_CIPHER && xform->cipher.op ==RTE_CRYPTO_CIPHER_OP_DECRYPT && - xform->next->type ==RTE_CRYPTO_SYM_XFORM_AUTH ) + xform->next->type ==RTE_CRYPTO_SYM_XFORM_AUTH && + (xform->cipher.algo !=RTE_CRYPTO_CIPHER_AES_CBC || + xform->next->auth.algo !=RTE_CRYPTO_AUTH_SHA1_HMAC ))return -ENOTSUP ; if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
@@ -1004,7 +1008,8 @@ otx_cpt_dev_create(struct rte_cryptodev *c_dev)RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT | -RTE_CRYPTODEV_FF_SYM_SESSIONLESS ; +RTE_CRYPTODEV_FF_SYM_SESSIONLESS | +RTE_CRYPTODEV_FF_SSL_ORDER ;break ;default :/* Feature not supported. Abort */
drivers/crypto/octeontx2/otx2_cryptodev.c +2 -1
@@ -123,7 +123,8 @@ otx2_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO |RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT |RTE_CRYPTODEV_FF_SYM_SESSIONLESS | -RTE_CRYPTODEV_FF_SECURITY ; +RTE_CRYPTODEV_FF_SECURITY | +RTE_CRYPTODEV_FF_SSL_ORDER ;if (rte_eal_process_type () ==RTE_PROC_SECONDARY )otx2_cpt_set_enqdeq_fns (dev);
drivers/crypto/octeontx2/otx2_cryptodev_ops.c +6 -2
@@ -322,12 +322,16 @@ sym_xform_verify(struct rte_crypto_sym_xform *xform)if (xform->next) {if (xform->type ==RTE_CRYPTO_SYM_XFORM_AUTH && xform->next->type ==RTE_CRYPTO_SYM_XFORM_CIPHER && - xform->next->cipher.op ==RTE_CRYPTO_CIPHER_OP_ENCRYPT ) + xform->next->cipher.op ==RTE_CRYPTO_CIPHER_OP_ENCRYPT && + (xform->auth.algo !=RTE_CRYPTO_AUTH_SHA1_HMAC || + xform->next->cipher.algo !=RTE_CRYPTO_CIPHER_AES_CBC ))return -ENOTSUP ;if (xform->type ==RTE_CRYPTO_SYM_XFORM_CIPHER && xform->cipher.op ==RTE_CRYPTO_CIPHER_OP_DECRYPT && - xform->next->type ==RTE_CRYPTO_SYM_XFORM_AUTH ) + xform->next->type ==RTE_CRYPTO_SYM_XFORM_AUTH && + (xform->cipher.algo !=RTE_CRYPTO_CIPHER_AES_CBC || + xform->next->auth.algo !=RTE_CRYPTO_AUTH_SHA1_HMAC ))return -ENOTSUP ; if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
Signature · 1 line
2.27.0
PATCH v2 3/3 test/crypto: add support for SSL/TLS way of cipher-auth operations
In reply to Tejasree KondojAdding support for SSL/TLS way of cipher-auth operations order
- auth generation followed by encryption
- decryption followed by auth verify
--- app/test/test_cryptodev_aes_test_vectors.h | 589 +++++++++++++++++++++ app/test/test_cryptodev_blockcipher.c | 107 +++- app/test/test_cryptodev_blockcipher.h | 10 + doc/guides/rel_notes/release_21_02.rst | 6 + 4 files changed, 700 insertions(+), 12 deletions(-)
app/test/test_cryptodev_aes_test_vectors.h +589 -0
@@ -1093,6 +1093,172 @@ static const uint8_t ciphertext512_aes128cbc_aad[] = {0x73 ,0x65 ,0x72 ,0x73 ,0x2C ,0x20 ,0x73 ,0x75 }; +static const uint8_t plaintext_aes_common_ssl[] = { +0x57 ,0x68 ,0x61 ,0x74 ,0x20 ,0x61 ,0x20 ,0x6C , +0x6F ,0x75 ,0x73 ,0x79 ,0x20 ,0x65 ,0x61 ,0x72 , +0x74 ,0x68 ,0x21 ,0x20 ,0x48 ,0x65 ,0x20 ,0x77 , +0x6F ,0x6E ,0x64 ,0x65 ,0x72 ,0x65 ,0x64 ,0x20 , +0x68 ,0x6F ,0x77 ,0x20 ,0x6D ,0x61 ,0x6E ,0x79 , +0x20 ,0x70 ,0x65 ,0x6F ,0x70 ,0x6C ,0x65 ,0x20 , +0x77 ,0x65 ,0x72 ,0x65 ,0x20 ,0x64 ,0x65 ,0x73 , +0x74 ,0x69 ,0x74 ,0x75 ,0x74 ,0x65 ,0x20 ,0x74 , +0x68 ,0x61 ,0x74 ,0x20 ,0x73 ,0x61 ,0x6D ,0x65 , +0x20 ,0x6E ,0x69 ,0x67 ,0x68 ,0x74 ,0x20 ,0x65 , +0x76 ,0x65 ,0x6E ,0x20 ,0x69 ,0x6E ,0x20 ,0x68 , +0x69 ,0x73 ,0x20 ,0x6F ,0x77 ,0x6E ,0x20 ,0x70 , +0x72 ,0x6F ,0x73 ,0x70 ,0x65 ,0x72 ,0x6F ,0x75 , +0x73 ,0x20 ,0x63 ,0x6F ,0x75 ,0x6E ,0x74 ,0x72 , +0x79 ,0x2C ,0x20 ,0x68 ,0x6F ,0x77 ,0x20 ,0x6D , +0x61 ,0x6E ,0x79 ,0x20 ,0x68 ,0x6F ,0x6D ,0x65 , +0x73 ,0x20 ,0x77 ,0x65 ,0x72 ,0x65 ,0x20 ,0x73 , +0x68 ,0x61 ,0x6E ,0x74 ,0x69 ,0x65 ,0x73 ,0x2C , +0x20 ,0x68 ,0x6F ,0x77 ,0x20 ,0x6D ,0x61 ,0x6E , +0x79 ,0x20 ,0x68 ,0x75 ,0x73 ,0x62 ,0x61 ,0x6E , +0x64 ,0x73 ,0x20 ,0x77 ,0x65 ,0x72 ,0x65 ,0x20 , +0x64 ,0x72 ,0x75 ,0x6E ,0x6B ,0x20 ,0x61 ,0x6E , +0x64 ,0x20 ,0x77 ,0x69 ,0x76 ,0x65 ,0x73 ,0x20 , +0x73 ,0x6F ,0x63 ,0x6B ,0x65 ,0x64 ,0x2C ,0x20 , +0x61 ,0x6E ,0x64 ,0x20 ,0x68 ,0x6F ,0x77 ,0x20 , +0x6D ,0x61 ,0x6E ,0x79 ,0x20 ,0x63 ,0x68 ,0x69 , +0x6C ,0x64 ,0x72 ,0x65 ,0x6E ,0x20 ,0x77 ,0x65 , +0x72 ,0x65 ,0x20 ,0x62 ,0x75 ,0x6C ,0x6C ,0x69 , +0x65 ,0x64 ,0x2C ,0x20 ,0x61 ,0x62 ,0x75 ,0x73 , +0x65 ,0x64 ,0x2C ,0x20 ,0x6F ,0x72 ,0x20 ,0x61 , +0x62 ,0x61 ,0x6E ,0x64 ,0x6F ,0x6E ,0x65 ,0x64 , +0x2E ,0x20 ,0x48 ,0x6F ,0x77 ,0x20 ,0x6D ,0x61 , +0x6E ,0x79 ,0x20 ,0x66 ,0x61 ,0x6D ,0x69 ,0x6C , +0x69 ,0x65 ,0x73 ,0x20 ,0x68 ,0x75 ,0x6E ,0x67 , +0x65 ,0x72 ,0x65 ,0x64 ,0x20 ,0x66 ,0x6F ,0x72 , +0x20 ,0x66 ,0x6F ,0x6F ,0x64 ,0x20 ,0x74 ,0x68 , +0x65 ,0x79 ,0x20 ,0x63 ,0x6F ,0x75 ,0x6C ,0x64 , +0x20 ,0x6E ,0x6F ,0x74 ,0x20 ,0x61 ,0x66 ,0x66 , +0x6F ,0x72 ,0x64 ,0x20 ,0x74 ,0x6F ,0x20 ,0x62 , +0x75 ,0x79 ,0x3F ,0x20 ,0x48 ,0x6F ,0x77 ,0x20 , +0x6D ,0x61 ,0x6E ,0x79 ,0x20 ,0x68 ,0x65 ,0x61 , +0x72 ,0x74 ,0x73 ,0x20 ,0x77 ,0x65 ,0x72 ,0x65 , +0x20 ,0x62 ,0x72 ,0x6F ,0x6B ,0x65 ,0x6E ,0x3F , +0x20 ,0x48 ,0x6F ,0x77 ,0x20 ,0x6D ,0x61 ,0x6E , +0x79 ,0x20 ,0x73 ,0x75 ,0x69 ,0x63 ,0x69 ,0x64 , +0x65 ,0x73 ,0x20 ,0x77 ,0x6F ,0x75 ,0x6C ,0x64 , +0x20 ,0x74 ,0x61 ,0x6B ,0x65 ,0x20 ,0x70 ,0x6C , +0x61 ,0x63 ,0x65 ,0x20 ,0x74 ,0x68 ,0x61 ,0x74 , +0x20 ,0x73 ,0x61 ,0x6D ,0x65 ,0x20 ,0x6E ,0x69 , +0x67 ,0x68 ,0x74 ,0x2C ,0x20 ,0x68 ,0x6F ,0x77 , +0x20 ,0x6D ,0x61 ,0x6E ,0x79 ,0x20 ,0x70 ,0x65 , +0x6F ,0x70 ,0x6C ,0x65 ,0x20 ,0x77 ,0x6F ,0x75 , +0x6C ,0x64 ,0x20 ,0x67 ,0x6F ,0x20 ,0x69 ,0x6E , +0x73 ,0x61 ,0x6E ,0x65 ,0x3F ,0x20 ,0x48 ,0x6F , +0x77 ,0x20 ,0x6D ,0x61 ,0x6E ,0x79 ,0x20 ,0x63 , +0x6F ,0x63 ,0x6B ,0x72 ,0x6F ,0x61 ,0x63 ,0x68 , +0x65 ,0x73 ,0x20 ,0x61 ,0x6E ,0x64 ,0x20 ,0x6C , +0x61 ,0x6E ,0x64 ,0x6C ,0x6F ,0x72 ,0x64 ,0x73 , +0x20 ,0x77 ,0x6F ,0x75 ,0x6C ,0x64 ,0x20 ,0x74 , +0x72 ,0x69 ,0x75 ,0x6D ,0x70 ,0x68 ,0x3F ,0x20 , +0x48 ,0x6F ,0x77 ,0x20 ,0x6D ,0x61 ,0x6E ,0x79 , +0x20 ,0x77 ,0x69 ,0x6E ,0x6E ,0x65 ,0x72 ,0x73 , +0x20 ,0x77 ,0x65 ,0x72 ,0x65 ,0x20 ,0x6c ,0x6f , +0x73 ,0x65 ,0x72 ,0x73 ,0x2c ,0x20 ,0x73 ,0x75 , +/* mac */ +0xC4 ,0xB7 ,0x0E ,0x6B ,0xDE ,0xD1 ,0xE7 ,0x77 , +0x7E ,0x2E ,0x8F ,0xFC ,0x48 ,0x39 ,0x46 ,0x17 , +0x3F ,0x91 ,0x64 ,0x59 +}; + +static const uint8_t ciphertext512_aes128cbc_ssl[] = { +0x8B ,0x4D ,0xDA ,0x1B ,0xCF ,0x04 ,0xA0 ,0x31 , +0xB4 ,0xBF ,0xBD ,0x68 ,0x43 ,0x20 ,0x7E ,0x76 , +0xB1 ,0x96 ,0x8B ,0xA2 ,0x7C ,0xA2 ,0x83 ,0x9E , +0x39 ,0x5A ,0x2F ,0x7E ,0x92 ,0xB4 ,0x48 ,0x1A , +0x3F ,0x6B ,0x5D ,0xDF ,0x52 ,0x85 ,0x5F ,0x8E , +0x42 ,0x3C ,0xFB ,0xE9 ,0x1A ,0x24 ,0xD6 ,0x08 , +0xDD ,0xFD ,0x16 ,0xFB ,0xE9 ,0x55 ,0xEF ,0xF0 , +0xA0 ,0x8D ,0x13 ,0xAB ,0x81 ,0xC6 ,0x90 ,0x01 , +0xB5 ,0x18 ,0x84 ,0xB3 ,0xF6 ,0xE6 ,0x11 ,0x57 , +0xD6 ,0x71 ,0xC6 ,0x3C ,0x3F ,0x2F ,0x33 ,0xEE , +0x24 ,0x42 ,0x6E ,0xAC ,0x0B ,0xCA ,0xEC ,0xF9 , +0x84 ,0xF8 ,0x22 ,0xAA ,0x60 ,0xF0 ,0x32 ,0xA9 , +0x75 ,0x75 ,0x3B ,0xCB ,0x70 ,0x21 ,0x0A ,0x8D , +0x0F ,0xE0 ,0xC4 ,0x78 ,0x2B ,0xF8 ,0x97 ,0xE3 , +0xE4 ,0x26 ,0x4B ,0x29 ,0xDA ,0x88 ,0xCD ,0x46 , +0xEC ,0xAA ,0xF9 ,0x7F ,0xF1 ,0x15 ,0xEA ,0xC3 , +0x87 ,0xE6 ,0x31 ,0xF2 ,0xCF ,0xDE ,0x4D ,0x80 , +0x70 ,0x91 ,0x7E ,0x0C ,0xF7 ,0x26 ,0x3A ,0x92 , +0x4F ,0x18 ,0x83 ,0xC0 ,0x8F ,0x59 ,0x01 ,0xA5 , +0x88 ,0xD1 ,0xDB ,0x26 ,0x71 ,0x27 ,0x16 ,0xF5 , +0xEE ,0x10 ,0x82 ,0xAC ,0x68 ,0x26 ,0x9B ,0xE2 , +0x6D ,0xD8 ,0x9A ,0x80 ,0xDF ,0x04 ,0x31 ,0xD5 , +0xF1 ,0x35 ,0x5C ,0x3B ,0xDD ,0x9A ,0x65 ,0xBA , +0x58 ,0x34 ,0x85 ,0x61 ,0x1C ,0x42 ,0x10 ,0x76 , +0x73 ,0x02 ,0x42 ,0xC9 ,0x23 ,0x18 ,0x8E ,0xB4 , +0x6F ,0xB4 ,0xA3 ,0x54 ,0x6E ,0x88 ,0x3B ,0x62 , +0x7C ,0x02 ,0x8D ,0x4C ,0x9F ,0xC8 ,0x45 ,0xF4 , +0xC9 ,0xDE ,0x4F ,0xEB ,0x22 ,0x83 ,0x1B ,0xE4 , +0x49 ,0x37 ,0xE4 ,0xAD ,0xE7 ,0xCD ,0x21 ,0x54 , +0xBC ,0x1C ,0xC2 ,0x04 ,0x97 ,0xB4 ,0x10 ,0x61 , +0xF0 ,0xE4 ,0xEF ,0x27 ,0x63 ,0x3A ,0xDA ,0x91 , +0x41 ,0x25 ,0x62 ,0x1C ,0x5C ,0xB6 ,0x38 ,0x4A , +0x88 ,0x71 ,0x59 ,0x5A ,0x8D ,0xA0 ,0x09 ,0xAF , +0x72 ,0x94 ,0xD7 ,0x79 ,0x5C ,0x60 ,0x7C ,0x8F , +0x4C ,0xF5 ,0xD9 ,0xA1 ,0x39 ,0x6D ,0x81 ,0x28 , +0xEF ,0x13 ,0x28 ,0xDF ,0xF5 ,0x3E ,0xF7 ,0x8E , +0x09 ,0x9C ,0x78 ,0x18 ,0x79 ,0xB8 ,0x68 ,0xD7 , +0xA8 ,0x29 ,0x62 ,0xAD ,0xDE ,0xE1 ,0x61 ,0x76 , +0x1B ,0x05 ,0x16 ,0xCD ,0xBF ,0x02 ,0x8E ,0xA6 , +0x43 ,0x6E ,0x92 ,0x55 ,0x4F ,0x60 ,0x9C ,0x03 , +0xB8 ,0x4F ,0xA3 ,0x02 ,0xAC ,0xA8 ,0xA7 ,0x0C , +0x1E ,0xB5 ,0x6B ,0xF8 ,0xC8 ,0x4D ,0xDE ,0xD2 , +0xB0 ,0x29 ,0x6E ,0x40 ,0xE6 ,0xD6 ,0xC9 ,0xE6 , +0xB9 ,0x0F ,0xB6 ,0x63 ,0xF5 ,0xAA ,0x2B ,0x96 , +0xA7 ,0x16 ,0xAC ,0x4E ,0x0A ,0x33 ,0x1C ,0xA6 , +0xE6 ,0xBD ,0x8A ,0xCF ,0x40 ,0xA9 ,0xB2 ,0xFA , +0x63 ,0x27 ,0xFD ,0x9B ,0xD9 ,0xFC ,0xD5 ,0x87 , +0x8D ,0x4C ,0xB6 ,0xA4 ,0xCB ,0xE7 ,0x74 ,0x55 , +0xF4 ,0xFB ,0x41 ,0x25 ,0xB5 ,0x4B ,0x0A ,0x1B , +0xB1 ,0xD6 ,0xB7 ,0xD9 ,0x47 ,0x2A ,0xC3 ,0x98 , +0x6A ,0xC4 ,0x03 ,0x73 ,0x1F ,0x93 ,0x6E ,0x53 , +0x19 ,0x25 ,0x64 ,0x15 ,0x83 ,0xF9 ,0x73 ,0x2A , +0x74 ,0xB4 ,0x93 ,0x69 ,0xC4 ,0x72 ,0xFC ,0x26 , +0xA2 ,0x9F ,0x43 ,0x45 ,0xDD ,0xB9 ,0xEF ,0x36 , +0xC8 ,0x3A ,0xCD ,0x99 ,0x9B ,0x54 ,0x1A ,0x36 , +0xC1 ,0x59 ,0xF8 ,0x98 ,0xA8 ,0xCC ,0x28 ,0x0D , +0x73 ,0x4C ,0xEE ,0x98 ,0xCB ,0x7C ,0x58 ,0x7E , +0x20 ,0x75 ,0x1E ,0xB7 ,0xC9 ,0xF8 ,0xF2 ,0x0E , +0x63 ,0x9E ,0x05 ,0x78 ,0x1A ,0xB6 ,0xA8 ,0x7A , +0xF9 ,0x98 ,0x6A ,0xA6 ,0x46 ,0x84 ,0x2E ,0xF6 , +0x4B ,0xDC ,0x9B ,0x8F ,0x9B ,0x8F ,0xEE ,0xB4 , +0xAA ,0x3F ,0xEE ,0xC0 ,0x37 ,0x27 ,0x76 ,0xC7 , +0x95 ,0xBB ,0x26 ,0x74 ,0x69 ,0x12 ,0x7F ,0xF1 , +0xBB ,0xFF ,0xAE ,0xB5 ,0x99 ,0x6E ,0xCB ,0x0C , +/* encrypted mac */ +0x39 ,0x34 ,0x16 ,0x84 ,0xE7 ,0x90 ,0x02 ,0xB1 , +0x3E ,0x92 ,0xCB ,0x58 ,0x98 ,0xBA ,0x7C ,0x98 , +0x8B ,0x90 ,0xFB ,0x5E ,0x9D ,0x74 ,0xCC ,0x56 , +0xE3 ,0x55 ,0xB1 ,0xC8 ,0xC8 ,0x7C ,0xB2 ,0xE7 +}; + +static const uint8_t plaintext_aes_common_short_ssl[] = { +0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD , +0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD , +0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD , +0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD , +0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD , +0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD ,0xDD , +0xDD ,0xDD +}; + +static const uint8_t ciphertext512_aes128cbc_short_ssl[] = { +0x6D ,0xB1 ,0x23 ,0x86 ,0x58 ,0x54 ,0x83 ,0xE7 , +0x3B ,0x27 ,0x85 ,0xA7 ,0x06 ,0xBC ,0x4A ,0xFB , +0x16 ,0xD8 ,0x56 ,0x7C ,0x39 ,0xC6 ,0xE7 ,0x1A , +0x67 ,0xA8 ,0x48 ,0x22 ,0xD6 ,0xFF ,0x96 ,0xB3 , +0xA1 ,0x52 ,0x52 ,0x83 ,0xE6 ,0x2E ,0x6A ,0xC9 , +0x57 ,0x8E ,0x34 ,0x6F ,0xEE ,0x41 ,0xF5 ,0xBD , +0x6B ,0x89 ,0x31 ,0x64 ,0x89 ,0xAB ,0xDE ,0xA7 , +0xBD ,0xFD ,0x46 ,0x40 ,0xE7 ,0x13 ,0x23 ,0x84 , +0xDD ,0xCB ,0x35 ,0x87 ,0x4E ,0x57 ,0xB7 ,0x97 , +0x9E ,0xAB ,0xFB ,0xE7 ,0x18 ,0x82 ,0x05 ,0xDF +}; +/* AES128-CTR-SHA1 test vector */ static const struct blockcipher_test_data aes_test_data_1 = { .crypto_algo = RTE_CRYPTO_CIPHER_AES_CTR,
@@ -1409,6 +1575,50 @@ static const struct blockcipher_test_data aes_test_data_4 = { } }; +/** AES-128-CBC SHA1 test vector (SSL/TLS order) */ +static const struct blockcipher_test_data aes_test_data_4_ssl = { + .crypto_algo =RTE_CRYPTO_CIPHER_AES_CBC , + .cipher_key = { + .data = { +0xE4 ,0x23 ,0x33 ,0x8A ,0x35 ,0x64 ,0x61 ,0xE2 , +0x49 ,0x03 ,0xDD ,0xC6 ,0xB8 ,0xCA ,0x55 ,0x7A + }, + .len =16 + }, + .iv = { + .data = { +0x00 ,0x01 ,0x02 ,0x03 ,0x04 ,0x05 ,0x06 ,0x07 , +0x08 ,0x09 ,0x0A ,0x0B ,0x0C ,0x0D ,0x0E ,0x0F + }, + .len =16 + }, + .plaintext = { + .data = plaintext_aes_common_ssl, + .len =512 + }, + .ciphertext = { + .data = ciphertext512_aes128cbc_ssl, + .len =512 + }, + .auth_algo =RTE_CRYPTO_AUTH_SHA1_HMAC , + .auth_key = { + .data = { +0xF8 ,0x2A ,0xC7 ,0x54 ,0xDB ,0x96 ,0x18 ,0xAA , +0xC3 ,0xA1 ,0x53 ,0xF6 ,0x1F ,0x17 ,0x60 ,0xBD , +0xDE ,0xF4 ,0xDE ,0xAD + }, + .len =20 + }, + .digest = { + .data = { +0x9A ,0x4F ,0x88 ,0x1B ,0xB6 ,0x8F ,0xD8 ,0x60 , +0x42 ,0x1A ,0x7D ,0x3D ,0xF5 ,0x82 ,0x80 ,0xF1 , +0x18 ,0x8C ,0x1D ,0x32 + }, + .len =20 , + } +}; +/** AES-128-CBC SHA256 test vector */ static const struct blockcipher_test_data aes_test_data_5 = { .crypto_algo =RTE_CRYPTO_CIPHER_AES_CBC ,
@@ -1733,6 +1943,77 @@ static const uint8_t ciphertext512_aes192cbc[] = {0x4F ,0x2F ,0x50 ,0xE2 ,0x77 ,0x62 ,0xD9 ,0xCC }; +static const uint8_t ciphertext512_aes192cbc_ssl[] = { +0x45 ,0xee ,0x9a ,0xEA ,0x3C ,0x03 ,0xFC ,0x4C , +0x84 ,0x36 ,0xB0 ,0xDA ,0xB0 ,0xDC ,0xF3 ,0x5B , +0x75 ,0xA7 ,0xBE ,0x0E ,0xC0 ,0x8D ,0x6C ,0xF8 , +0xC1 ,0x0F ,0xD0 ,0x35 ,0x1D ,0x82 ,0xAE ,0x7C , +0x57 ,0xC5 ,0x7A ,0x55 ,0x87 ,0x1B ,0xD4 ,0x03 , +0x0A ,0x64 ,0xC9 ,0xE0 ,0xF4 ,0xC7 ,0x6F ,0x57 , +0x52 ,0xC6 ,0x73 ,0xBA ,0x84 ,0x0B ,0x5B ,0x89 , +0x21 ,0xD2 ,0x9B ,0x88 ,0x68 ,0xF5 ,0xA9 ,0x7F , +0x3F ,0x49 ,0xEB ,0xF4 ,0xD4 ,0x52 ,0xD2 ,0x64 , +0x80 ,0xB2 ,0x53 ,0xDA ,0x19 ,0xF6 ,0x10 ,0x24 , +0x23 ,0x26 ,0x7A ,0x7C ,0x07 ,0x57 ,0x4B ,0x0E , +0x58 ,0x49 ,0x61 ,0xD1 ,0xDC ,0x9A ,0x32 ,0x6B , +0x0F ,0x43 ,0x9E ,0x4D ,0xB4 ,0x07 ,0x4E ,0xB3 , +0x51 ,0x74 ,0xDE ,0x29 ,0xBC ,0x98 ,0xF9 ,0xDF , +0x78 ,0x9A ,0x18 ,0x9C ,0xD6 ,0x7A ,0x55 ,0x7C , +0xE6 ,0x1D ,0x5C ,0x1A ,0x99 ,0xD2 ,0xC3 ,0x7B , +0x9F ,0x96 ,0x74 ,0x2D ,0xE0 ,0xEF ,0xD1 ,0xE3 , +0x08 ,0x9F ,0xAF ,0xE6 ,0xED ,0xCA ,0xE1 ,0xEA , +0x23 ,0x6F ,0x7C ,0x81 ,0xA8 ,0xC0 ,0x5B ,0x8B , +0x53 ,0x90 ,0x51 ,0x2D ,0x0F ,0xF6 ,0x7D ,0xA7 , +0x1C ,0xBD ,0x83 ,0x84 ,0x54 ,0xA4 ,0x15 ,0xFB , +0x3E ,0x25 ,0xA7 ,0x3A ,0x0A ,0x73 ,0xD9 ,0x88 , +0x6F ,0x80 ,0x78 ,0x95 ,0x7F ,0x60 ,0xAA ,0x86 , +0x8A ,0xFC ,0xDF ,0xC1 ,0xCB ,0xDE ,0xBB ,0x25 , +0x52 ,0x20 ,0xC6 ,0x79 ,0xD4 ,0x0F ,0x25 ,0xE7 , +0xDB ,0xB2 ,0x17 ,0xA4 ,0x6F ,0x3C ,0x6F ,0x91 , +0xF6 ,0x44 ,0x1E ,0xB6 ,0x85 ,0xBC ,0x7A ,0x14 , +0x10 ,0x72 ,0xBD ,0x16 ,0x63 ,0x39 ,0x9E ,0x7B , +0x84 ,0x5B ,0x17 ,0x61 ,0xB1 ,0x5D ,0x82 ,0x0B , +0x6D ,0x37 ,0xD7 ,0x79 ,0xB8 ,0x24 ,0x91 ,0x30 , +0x82 ,0x91 ,0x02 ,0xB1 ,0x18 ,0x4B ,0xE0 ,0xF4 , +0x13 ,0x1B ,0xB2 ,0x4C ,0xDA ,0xB8 ,0x99 ,0x96 , +0x83 ,0x2F ,0xBE ,0x53 ,0x8D ,0xDE ,0xFA ,0xAD , +0xF6 ,0x5C ,0xDB ,0xE5 ,0x66 ,0x26 ,0x8F ,0x13 , +0x2B ,0x76 ,0x47 ,0x73 ,0xDE ,0x1A ,0x74 ,0xA6 , +0x30 ,0xAF ,0x42 ,0xA0 ,0xE5 ,0xD2 ,0x8F ,0xC2 , +0xED ,0x3E ,0x9E ,0x29 ,0x54 ,0x3C ,0xDE ,0x9F , +0x5D ,0x30 ,0x2B ,0x63 ,0xFB ,0xE3 ,0xB1 ,0x07 , +0xEE ,0x74 ,0x4A ,0xAF ,0xB1 ,0x20 ,0x8D ,0xEC , +0xE6 ,0x78 ,0x16 ,0x8D ,0xA4 ,0x6E ,0x34 ,0x7D , +0x47 ,0xFB ,0x0B ,0xC1 ,0x32 ,0xD7 ,0x0D ,0x6C , +0x6F ,0x93 ,0x9C ,0x5E ,0xEF ,0x1F ,0x9C ,0x45 , +0x80 ,0x6B ,0x74 ,0xA6 ,0x81 ,0xF2 ,0xF6 ,0xFA , +0xAA ,0x9D ,0x4F ,0xCA ,0xB5 ,0x90 ,0x59 ,0xB0 , +0x3B ,0xF2 ,0xF0 ,0x75 ,0xFD ,0x8A ,0xD8 ,0x97 , +0x65 ,0x88 ,0x56 ,0x4C ,0x44 ,0xDF ,0x73 ,0xF7 , +0x56 ,0x9C ,0x48 ,0x7E ,0xB0 ,0x1F ,0x1D ,0x7D , +0x6A ,0x11 ,0xF5 ,0xC2 ,0xF4 ,0x17 ,0xEF ,0x58 , +0xD8 ,0x2A ,0xAF ,0x56 ,0x2F ,0xCF ,0xEC ,0xA4 , +0x58 ,0x8B ,0x60 ,0xCE ,0xD4 ,0x0F ,0x9C ,0x21 , +0xEC ,0x3E ,0x74 ,0x7B ,0x81 ,0x3D ,0x69 ,0xC6 , +0x5E ,0x12 ,0x83 ,0xE9 ,0xEF ,0x81 ,0x58 ,0x36 , +0x6A ,0x60 ,0x0F ,0x54 ,0x28 ,0x11 ,0xF9 ,0x64 , +0x36 ,0xAD ,0x79 ,0xF5 ,0x1C ,0x74 ,0xD0 ,0xC3 , +0x7B ,0x61 ,0xE1 ,0x92 ,0xB0 ,0x13 ,0x91 ,0x87 , +0x32 ,0x1F ,0xF2 ,0x5A ,0xDA ,0x25 ,0x69 ,0xEB , +0xD7 ,0x32 ,0x7F ,0xF5 ,0x23 ,0x21 ,0x54 ,0x47 , +0x7B ,0x1B ,0x33 ,0xB0 ,0x3D ,0xF6 ,0xE2 ,0x7E , +0x3E ,0xA2 ,0x9E ,0xCA ,0x48 ,0x0B ,0x4A ,0x29 , +0x81 ,0xD4 ,0x4E ,0xD5 ,0x69 ,0xFB ,0xCD ,0x37 , +0x8A ,0xC1 ,0x5B ,0x50 ,0xFF ,0xB5 ,0x7D ,0x43 , +0x0F ,0xAE ,0xA6 ,0xC2 ,0xE5 ,0x8F ,0x45 ,0xB2 , +0x85 ,0x99 ,0x02 ,0xA2 ,0x9B ,0xBE ,0x90 ,0x43 , +0x4F ,0x2F ,0x50 ,0xE2 ,0x77 ,0x62 ,0xD9 ,0xCC , +0x5D ,0x93 ,0x6A ,0x97 ,0xFB ,0x1D ,0x01 ,0x17 , +0x90 ,0x61 ,0x41 ,0xD5 ,0x5C ,0x43 ,0x60 ,0xBC , +0x21 ,0x04 ,0x5B ,0xB9 ,0xFF ,0x75 ,0xF8 ,0x1F , +0x5C ,0x85 ,0x91 ,0x08 ,0x02 ,0xA2 ,0xFD ,0x88 , +}; +/** AES-192-CBC test vector */ static const struct blockcipher_test_data aes_test_data_10 = { .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
@@ -1761,6 +2042,51 @@ static const struct blockcipher_test_data aes_test_data_10 = { } }; +/** AES-192-CBC SHA1 test vector (SSL/TLS order) */ +static const struct blockcipher_test_data aes_test_data_10_ssl = { + .crypto_algo =RTE_CRYPTO_CIPHER_AES_CBC , + .cipher_key = { + .data = { +0xE4 ,0x23 ,0x33 ,0x8A ,0x35 ,0x64 ,0x61 ,0xE2 , +0x49 ,0x03 ,0xDD ,0xC6 ,0xB8 ,0xCA ,0x55 ,0x7A , +0xD4 ,0xC3 ,0xA3 ,0xAA ,0x33 ,0x62 ,0x61 ,0xE0 + }, + .len =24 + }, + .iv = { + .data = { +0x00 ,0x01 ,0x02 ,0x03 ,0x04 ,0x05 ,0x06 ,0x07 , +0x08 ,0x09 ,0x0A ,0x0B ,0x0C ,0x0D ,0x0E ,0x0F + }, + .len =16 + }, + .plaintext = { + .data = plaintext_aes_common_ssl, + .len =512 + }, + .ciphertext = { + .data = ciphertext512_aes192cbc_ssl, + .len =512 + }, + .auth_algo =RTE_CRYPTO_AUTH_SHA1_HMAC , + .auth_key = { + .data = { +0xF8 ,0x2A ,0xC7 ,0x54 ,0xDB ,0x96 ,0x18 ,0xAA , +0xC3 ,0xA1 ,0x53 ,0xF6 ,0x1F ,0x17 ,0x60 ,0xBD , +0xDE ,0xF4 ,0xDE ,0xAD + }, + .len =20 + }, + .digest = { + .data = { +0x9A ,0x4F ,0x88 ,0x1B ,0xB6 ,0x8F ,0xD8 ,0x60 , +0x42 ,0x1A ,0x7D ,0x3D ,0xF5 ,0x82 ,0x80 ,0xF1 , +0x18 ,0x8C ,0x1D ,0x32 + }, + .len =20 , + } +}; +static const uint8_t ciphertext512_aes256cbc[] = {0xF3 ,0xDD ,0xF0 ,0x0B ,0xFF ,0xA2 ,0x6A ,0x04 ,0xBE ,0xDA ,0x52 ,0xA6 ,0xFE ,0x6B ,0xA6 ,0xA7 ,
@@ -1828,6 +2154,77 @@ static const uint8_t ciphertext512_aes256cbc[] = {0xB7 ,0x1C ,0x6D ,0xF2 ,0xAE ,0x79 ,0xA4 ,0x7C }; +static const uint8_t ciphertext512_aes256cbc_ssl[] = { +0xF3 ,0xDD ,0xF0 ,0x0B ,0xFF ,0xA2 ,0x6A ,0x04 , +0xBE ,0xDA ,0x52 ,0xA6 ,0xFE ,0x6B ,0xA6 ,0xA7 , +0x48 ,0x1D ,0x7D ,0x98 ,0x65 ,0xDB ,0xEF ,0x06 , +0x26 ,0xB5 ,0x8E ,0xEB ,0x05 ,0x0E ,0x77 ,0x98 , +0x17 ,0x8E ,0xD0 ,0xD4 ,0x7B ,0x92 ,0x8F ,0x5C , +0xD0 ,0x74 ,0x5C ,0xA8 ,0x4B ,0x54 ,0xB6 ,0x2F , +0x83 ,0x72 ,0x2C ,0xFF ,0x72 ,0xE9 ,0xE4 ,0x15 , +0x4C ,0x32 ,0xAF ,0xC8 ,0xC9 ,0x89 ,0x3C ,0x6E , +0x31 ,0xD5 ,0xC0 ,0x16 ,0xC0 ,0x31 ,0x7D ,0x11 , +0xAB ,0xCB ,0xDE ,0xD2 ,0xD6 ,0xAA ,0x76 ,0x5E , +0xBA ,0xF6 ,0xE2 ,0x92 ,0xCB ,0x86 ,0x07 ,0xFA , +0xD4 ,0x9E ,0x83 ,0xED ,0xFD ,0xB8 ,0x70 ,0x54 , +0x6B ,0xBE ,0xEC ,0x72 ,0xDD ,0x28 ,0x5E ,0x95 , +0x78 ,0xA5 ,0x28 ,0x43 ,0x3D ,0x6D ,0xB1 ,0xD9 , +0x69 ,0x1F ,0xC9 ,0x66 ,0x0E ,0x32 ,0x44 ,0x08 , +0xD2 ,0xAE ,0x2C ,0x43 ,0xF2 ,0xD0 ,0x7D ,0x26 , +0x70 ,0xE5 ,0xA1 ,0xCA ,0x37 ,0xE9 ,0x7D ,0xC7 , +0xA3 ,0xFA ,0x81 ,0x91 ,0x64 ,0xAA ,0x64 ,0x91 , +0x9A ,0x95 ,0x2D ,0xC9 ,0xF9 ,0xCE ,0xFE ,0x9F , +0xC4 ,0xD8 ,0x81 ,0xBE ,0x57 ,0x84 ,0xC5 ,0x02 , +0xDB ,0x30 ,0xC1 ,0xD9 ,0x0E ,0xA0 ,0xA6 ,0x00 , +0xD6 ,0xF3 ,0x52 ,0x7E ,0x0D ,0x23 ,0x6B ,0x2B , +0x34 ,0x99 ,0x1F ,0x70 ,0x27 ,0x6D ,0x58 ,0x84 , +0x93 ,0x77 ,0xB8 ,0x3E ,0xF1 ,0x71 ,0x58 ,0x42 , +0x8B ,0x2B ,0xC8 ,0x6D ,0x05 ,0x84 ,0xFF ,0x4E , +0x85 ,0xEF ,0x4A ,0x9D ,0x91 ,0x6A ,0xD5 ,0xE1 , +0xAF ,0x01 ,0xEB ,0x83 ,0x8F ,0x23 ,0x7C ,0x7F , +0x12 ,0x91 ,0x05 ,0xF0 ,0x4E ,0xD9 ,0x17 ,0x62 , +0x75 ,0xBB ,0xAC ,0x97 ,0xEE ,0x3B ,0x4E ,0xC7 , +0xE5 ,0x92 ,0xF8 ,0x9D ,0x4C ,0xF9 ,0xEE ,0x55 , +0x18 ,0xBB ,0xCC ,0xB4 ,0xF2 ,0x59 ,0xB9 ,0xFC , +0x7A ,0x0F ,0x98 ,0xD4 ,0x8B ,0xFE ,0xF7 ,0x83 , +0x46 ,0xE2 ,0x83 ,0x33 ,0x3E ,0x95 ,0x8D ,0x17 , +0x1E ,0x85 ,0xF8 ,0x8C ,0x51 ,0xB0 ,0x6C ,0xB5 , +0x5E ,0x95 ,0xBA ,0x4B ,0x69 ,0x1B ,0x48 ,0x69 , +0x0B ,0x8F ,0xA5 ,0x18 ,0x13 ,0xB9 ,0x77 ,0xD1 , +0x80 ,0x32 ,0x32 ,0x6D ,0x53 ,0xA1 ,0x95 ,0x40 , +0x96 ,0x8A ,0xCC ,0xA3 ,0x69 ,0xF8 ,0x9F ,0xB5 , +0x8E ,0xD2 ,0x68 ,0x07 ,0x4F ,0xA7 ,0xEC ,0xF8 , +0x20 ,0x21 ,0x58 ,0xF8 ,0xD8 ,0x9E ,0x5F ,0x40 , +0xBA ,0xB9 ,0x76 ,0x57 ,0x3B ,0x17 ,0xAD ,0xEE , +0xCB ,0xDF ,0x07 ,0xC1 ,0xDF ,0x66 ,0xA8 ,0x0D , +0xC2 ,0xCE ,0x8F ,0x79 ,0xC3 ,0x32 ,0xE0 ,0x8C , +0xFE ,0x5A ,0xF3 ,0x55 ,0x27 ,0x73 ,0x6F ,0xA1 , +0x54 ,0xC6 ,0xFC ,0x28 ,0x9D ,0xBE ,0x97 ,0xB9 , +0x54 ,0x97 ,0x72 ,0x3A ,0x61 ,0xAF ,0x6F ,0xDE , +0xF8 ,0x0E ,0xBB ,0x6B ,0x96 ,0x84 ,0xDD ,0x9B , +0x62 ,0xBA ,0x47 ,0xB5 ,0xC9 ,0x3B ,0x4E ,0x8C , +0x78 ,0x2A ,0xCC ,0x0A ,0x69 ,0x54 ,0x25 ,0x5E , +0x8B ,0xAC ,0x56 ,0xD9 ,0xFE ,0x48 ,0xBA ,0xCE , +0xA9 ,0xCE ,0xA6 ,0x1D ,0xBF ,0x3E ,0x3C ,0x66 , +0x40 ,0x71 ,0x79 ,0xAD ,0x5B ,0x26 ,0xAD ,0xBE , +0x58 ,0x13 ,0x64 ,0x60 ,0x7C ,0x05 ,0xFC ,0xE3 , +0x51 ,0x7A ,0xF2 ,0xCC ,0x54 ,0x16 ,0x2C ,0xA4 , +0xCE ,0x5F ,0x59 ,0x12 ,0x77 ,0xEB ,0xD9 ,0x23 , +0xE3 ,0x86 ,0xFB ,0xD7 ,0x48 ,0x76 ,0x9D ,0xE3 , +0x89 ,0x87 ,0x39 ,0xFA ,0x7B ,0x21 ,0x0B ,0x76 , +0xB2 ,0xED ,0x1C ,0x27 ,0x4B ,0xD5 ,0x27 ,0x05 , +0x8C ,0x7D ,0x58 ,0x6C ,0xCA ,0xA5 ,0x54 ,0x9A , +0x0F ,0xCB ,0xE9 ,0x88 ,0x31 ,0xAD ,0x49 ,0xEE , +0x38 ,0xFB ,0xC9 ,0xFB ,0xB4 ,0x7A ,0x00 ,0x58 , +0x20 ,0x32 ,0xD3 ,0x53 ,0x5A ,0xDD ,0x74 ,0x95 , +0x60 ,0x59 ,0x09 ,0xAE ,0x7E ,0xEC ,0x74 ,0xA3 , +0xB7 ,0x1C ,0x6D ,0xF2 ,0xAE ,0x79 ,0xA4 ,0x7C , +0x50 ,0xB1 ,0x8D ,0x56 ,0x22 ,0x75 ,0xD6 ,0x8F , +0x93 ,0xB5 ,0xED ,0xE8 ,0x3D ,0x20 ,0x4F ,0x9F , +0x80 ,0x2F ,0x56 ,0x95 ,0xA0 ,0x80 ,0xC6 ,0xC2 , +0xA8 ,0x27 ,0xFB ,0x48 ,0x96 ,0x58 ,0xA1 ,0x93 , +}; +/** AES-256-CBC test vector */ static const struct blockcipher_test_data aes_test_data_11 = { .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
@@ -1857,6 +2254,52 @@ static const struct blockcipher_test_data aes_test_data_11 = { } }; +/** AES-256-CBC SHA1 test vector (SSL/TLS order) */ +static const struct blockcipher_test_data aes_test_data_11_ssl = { + .crypto_algo =RTE_CRYPTO_CIPHER_AES_CBC , + .cipher_key = { + .data = { +0xE4 ,0x23 ,0x33 ,0x8A ,0x35 ,0x64 ,0x61 ,0xE2 , +0x49 ,0x03 ,0xDD ,0xC6 ,0xB8 ,0xCA ,0x55 ,0x7A , +0xD4 ,0xC3 ,0xA3 ,0xAA ,0x33 ,0x62 ,0x61 ,0xE0 , +0x37 ,0x07 ,0xB8 ,0x23 ,0xA2 ,0xA3 ,0xB5 ,0x8D + }, + .len =32 + }, + .iv = { + .data = { +0x00 ,0x01 ,0x02 ,0x03 ,0x04 ,0x05 ,0x06 ,0x07 , +0x08 ,0x09 ,0x0A ,0x0B ,0x0C ,0x0D ,0x0E ,0x0F + }, + .len =16 + }, + .plaintext = { + .data = plaintext_aes_common_ssl, + .len =512 + }, + .ciphertext = { + .data = ciphertext512_aes256cbc_ssl, + .len =512 + }, + .auth_algo =RTE_CRYPTO_AUTH_SHA1_HMAC , + .auth_key = { + .data = { +0xF8 ,0x2A ,0xC7 ,0x54 ,0xDB ,0x96 ,0x18 ,0xAA , +0xC3 ,0xA1 ,0x53 ,0xF6 ,0x1F ,0x17 ,0x60 ,0xBD , +0xDE ,0xF4 ,0xDE ,0xAD + }, + .len =20 + }, + .digest = { + .data = { +0x9A ,0x4F ,0x88 ,0x1B ,0xB6 ,0x8F ,0xD8 ,0x60 , +0x42 ,0x1A ,0x7D ,0x3D ,0xF5 ,0x82 ,0x80 ,0xF1 , +0x18 ,0x8C ,0x1D ,0x32 + }, + .len =20 , + } +}; +/** AES-128-CBC SHA256 HMAC test vector (160 bytes) */ static const struct blockcipher_test_data aes_test_data_12 = { .crypto_algo =RTE_CRYPTO_CIPHER_AES_CBC ,
@@ -1949,6 +2392,50 @@ static const struct blockcipher_test_data aes_test_data_13 = { } }; +/** AES-128-CBC SHA1 test vector (SSL/TLS order) */ +static const struct blockcipher_test_data aes_test_data_13_ssl = { + .crypto_algo =RTE_CRYPTO_CIPHER_AES_CBC , + .cipher_key = { + .data = { +0xE4 ,0x23 ,0x33 ,0x8A ,0x35 ,0x64 ,0x61 ,0xE2 , +0x49 ,0x03 ,0xDD ,0xC6 ,0xB8 ,0xCA ,0x55 ,0x7A + }, + .len =16 + }, + .iv = { + .data = { +0x00 ,0x01 ,0x02 ,0x03 ,0x04 ,0x05 ,0x06 ,0x07 , +0x08 ,0x09 ,0x0A ,0x0B ,0x0C ,0x0D ,0x0E ,0x0F + }, + .len =16 + }, + .plaintext = { + .data = plaintext_aes_common_short_ssl, + .len =50 + }, + .ciphertext = { + .data = ciphertext512_aes128cbc_short_ssl, + .len =50 + }, + .auth_algo =RTE_CRYPTO_AUTH_SHA1_HMAC , + .auth_key = { + .data = { +0xAA ,0xAA ,0xAA ,0xAA ,0xAA ,0xAA ,0xAA ,0xAA , +0xAA ,0xAA ,0xAA ,0xAA ,0xAA ,0xAA ,0xAA ,0xAA , +0xAA ,0xAA ,0xAA ,0xAA + }, + .len =20 + }, + .digest = { + .data = { +0x12 ,0x5D ,0x73 ,0x42 ,0xB9 ,0xAC ,0x11 ,0xCD , +0x91 ,0xA3 ,0x9A ,0xF4 ,0x8A ,0xA1 ,0x7B ,0x4F , +0x63 ,0xF1 ,0x75 ,0xD3 + }, + .len =20 , + } +}; +/** XTS-AES-128 test vector (2 keys * 128 bit) */ static const uint8_t plaintext_aes128xts_16bytes[] = {0xEB ,0xAB ,0xCE ,0x95 ,0xB1 ,0x4D ,0x3C ,0x8D ,
@@ -2565,6 +3052,108 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = { .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC, .feature_mask = BLOCKCIPHER_TEST_FEATURE_SESSIONLESS, }, + { + .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest" + "(SSL/TLS order)", + .test_data = &aes_test_data_4_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN_ENC, + .feature_mask = BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest " + "Scatter Gather (SSL/TLS order)", + .test_data = &aes_test_data_4_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN_ENC, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_SG | + BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-128-CBC HMAC-SHA1 Encryption Digest " + "(short buffers) (SSL/TLS order)", + .test_data = &aes_test_data_13_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN_ENC, + .feature_mask = BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-128-CBC HMAC-SHA1 Encryption Digest " + "Scatter Gather (SSL/TLS order)", + .test_data = &aes_test_data_4_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN_ENC, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_SG | + BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-192-CBC HMAC-SHA1 Encryption Digest " + "Sessionless (SSL/TLS order)", + .test_data = &aes_test_data_10_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN_ENC, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_SESSIONLESS | + BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-256-CBC HMAC-SHA1 Encryption Digest " + "Scatter Gather Sessionless (SSL/TLS order)", + .test_data = &aes_test_data_11_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_AUTH_GEN_ENC, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_SG | +BLOCKCIPHER_TEST_FEATURE_SESSIONLESS | + BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-128-CBC HMAC-SHA1 Decryption Digest " + "Verify (SSL/TLS order)", + .test_data = &aes_test_data_4_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_DEC_AUTH_VERIFY, + .feature_mask = BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-128-CBC HMAC-SHA1 Decryption Digest " + "Verify Scatter Gather (SSL/TLS order)", + .test_data = &aes_test_data_4_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_DEC_AUTH_VERIFY, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_SG | + BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-128-CBC HMAC-SHA1 Decryption Digest " + "Verify (short buffers) (SSL/TLS order)", + .test_data = &aes_test_data_13_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_DEC_AUTH_VERIFY, + .feature_mask = BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-128-CBC HMAC-SHA1 Decryption Digest " + "Verify Scatter Gather (SSL/TLS order)", + .test_data = &aes_test_data_4_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_DEC_AUTH_VERIFY, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_SG | + BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-256-CBC HMAC-SHA1 Decryption Digest " + "Verify Sessionless (SSL/TLS order)", + .test_data = &aes_test_data_11_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_DEC_AUTH_VERIFY, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_SESSIONLESS | + BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-192-CBC HMAC-SHA1 Decryption Digest " + "Verify Scatter Gather Sessionless (SSL/TLS order)", + .test_data = &aes_test_data_10_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_DEC_AUTH_VERIFY, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_SESSIONLESS | +BLOCKCIPHER_TEST_FEATURE_SG | + BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, + { + .test_descr ="AES-128-CBC HMAC-SHA1 Decryption Digest " + "Verify Sessionless (SSL/TLS order)", + .test_data = &aes_test_data_4_ssl, + .op_mask = BLOCKCIPHER_TEST_OP_DEC_AUTH_VERIFY, + .feature_mask =BLOCKCIPHER_TEST_FEATURE_SESSIONLESS | + BLOCKCIPHER_TEST_FEATURE_SSL_ORDER, + }, { .test_descr = "NULL-CIPHER-NULL-AUTH encrypt & gen x8byte", .test_data = &null_test_data_chain_x8_multiple,
app/test/test_cryptodev_blockcipher.c +95 -12
177 lines not on this page · raw message
app/test/test_cryptodev_blockcipher.h +10 -0
@@ -13,11 +13,13 @@#define BLOCKCIPHER_TEST_OP_DECRYPT 0x02#define BLOCKCIPHER_TEST_OP_AUTH_GEN 0x04#define BLOCKCIPHER_TEST_OP_AUTH_VERIFY 0x08 +#define BLOCKCIPHER_TEST_OP_SSL_ORDER 0x10#define BLOCKCIPHER_TEST_FEATURE_OOP 0x01#define BLOCKCIPHER_TEST_FEATURE_SESSIONLESS 0x02#define BLOCKCIPHER_TEST_FEATURE_STOPPER 0x04/* stop upon failing */ #define BLOCKCIPHER_TEST_FEATURE_SG 0x08/* Scatter Gather */ +#define BLOCKCIPHER_TEST_FEATURE_SSL_ORDER 0x10/* SSL order */ #define BLOCKCIPHER_TEST_OP_CIPHER (BLOCKCIPHER_TEST_OP_ENCRYPT | \ BLOCKCIPHER_TEST_OP_DECRYPT)
@@ -31,6 +33,14 @@#define BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC (BLOCKCIPHER_TEST_OP_DECRYPT | \ BLOCKCIPHER_TEST_OP_AUTH_VERIFY) +#define BLOCKCIPHER_TEST_OP_AUTH_GEN_ENC (BLOCKCIPHER_TEST_OP_ENCRYPT | \ + BLOCKCIPHER_TEST_OP_AUTH_GEN | \ + BLOCKCIPHER_TEST_OP_SSL_ORDER) + +#define BLOCKCIPHER_TEST_OP_DEC_AUTH_VERIFY (BLOCKCIPHER_TEST_OP_DECRYPT | \ + BLOCKCIPHER_TEST_OP_AUTH_VERIFY | \ + BLOCKCIPHER_TEST_OP_SSL_ORDER) +enum blockcipher_test_type {BLKCIPHER_AES_CHAIN_TYPE ,/* use aes_chain_test_cases[] */ BLKCIPHER_AES_CIPHERONLY_TYPE ,/* use aes_cipheronly_test_cases[] */
doc/guides/rel_notes/release_21_02.rst +6 -0
@@ -104,6 +104,12 @@ New Features * Added SSL/TLS way of cipher-auth operations support in OCTEON TX crypto PMD. +* **Updated unit test sample application.** + + * Added SSL/TLS way of cipher-auth operations support i.e. auth generation + followed by encryption and decryption followed by auth verify in sample + unit test application. + Removed Items -------------
Signature · 1 line
2.27.0