summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/openssl/openssl-qoriq/qoriq
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/qoriq')
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch21
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch26
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0003-cryptodev-fix-algorithm-registration.patch12
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0004-ECC-Support-header-for-Cryptodev-Engine.patch4
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0005-Initial-support-for-PKC-in-cryptodev-engine.patch48
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0006-Added-hwrng-dev-file-as-source-of-RNG.patch4
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0007-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch38
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0008-Add-RSA-keygen-operation-and-support-gendsa-command-.patch10
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0009-RSA-Keygen-Fix.patch14
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0010-Removed-local-copy-of-curve_t-type.patch32
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0011-Modulus-parameter-is-not-populated-by-dhparams.patch10
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0012-SW-Backoff-mechanism-for-dsa-keygen.patch10
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0013-Fixed-DH-keygen-pair-generator.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0014-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch20
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0015-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch22
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0016-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch26
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0017-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch22
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch18
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0019-cryptodev-do-not-zero-the-buffer-before-use.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0020-cryptodev-clean-up-code-layout.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0021-cryptodev-do-not-cache-file-descriptor-in-open.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0022-cryptodev-put_dev_crypto-should-be-an-int.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0023-cryptodev-simplify-cryptodev-pkc-support-code.patch16
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0024-cryptodev-clarify-code-remove-assignments-from-condi.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0025-cryptodev-clean-up-context-state-before-anything-els.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0026-cryptodev-remove-code-duplication-in-digest-operatio.patch16
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch14
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0028-cryptodev-fix-debug-print-messages.patch18
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0029-cryptodev-use-CIOCHASH-ioctl-for-digest-operations.patch14
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0030-cryptodev-reduce-duplicated-efforts-for-searching-in.patch14
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0031-cryptodev-remove-not-used-local-variables.patch12
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0032-cryptodev-hide-not-used-variable-behind-ifndef.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0033-cryptodev-fix-function-declaration-typo.patch4
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0034-cryptodev-fix-incorrect-function-signature.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0035-cryptodev-fix-warnings-on-excess-elements-in-struct-.patch12
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0036-cryptodev-fix-free-on-error-path.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0037-cryptodev-fix-return-value-on-error.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0038-cryptodev-match-types-with-cryptodev.h.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0039-cryptodev-explicitly-discard-const-qualifier.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0040-cryptodev-replace-caddr_t-with-void.patch18
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0041-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0042-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0043-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch10
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0044-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch10
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0045-cryptodev-change-signature-for-conversion-functions.patch10
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0046-cryptodev-add-explicit-cast-for-known-BIGNUM-values.patch8
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0047-cryptodev-treat-all-build-warnings-as-errors.patch4
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0048-fix-maclen-is-used-uninitialized-warning-on-some-com.patch8
48 files changed, 315 insertions, 330 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch
index 5e99d912..67314cd2 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch
@@ -1,4 +1,4 @@
1From 45e4b0835ad965cf9cc813a31df354f1e6d14513 Mon Sep 17 00:00:00 2001 1From 90d5822f09f0b6a0f1d8d2e7189e702a18686ab7 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Tue, 10 Sep 2013 12:46:46 +0300 3Date: Tue, 10 Sep 2013 12:46:46 +0300
4Subject: [PATCH 01/48] remove double initialization of cryptodev engine 4Subject: [PATCH 01/48] remove double initialization of cryptodev engine
@@ -13,9 +13,8 @@ Reviewed-on: http://git.am.freescale.net:8181/17222
13--- 13---
14 crypto/engine/eng_all.c | 12 ------------ 14 crypto/engine/eng_all.c | 12 ------------
15 crypto/engine/engine.h | 4 ---- 15 crypto/engine/engine.h | 4 ----
16 crypto/evp/c_all.c | 5 -----
17 util/libeay.num | 2 +- 16 util/libeay.num | 2 +-
18 4 files changed, 1 insertion(+), 22 deletions(-) 17 3 files changed, 1 insertion(+), 17 deletions(-)
19 18
20diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c 19diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
21index 48ad0d2..a198c5f 100644 20index 48ad0d2..a198c5f 100644
@@ -52,20 +51,6 @@ index bd7b591..020d912 100644
52 /* BEGIN ERROR CODES */ 51 /* BEGIN ERROR CODES */
53 /* 52 /*
54 * The following lines are auto generated by the script mkerr.pl. Any changes 53 * The following lines are auto generated by the script mkerr.pl. Any changes
55diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
56index a3ed00d..719e34d 100644
57--- a/crypto/evp/c_all.c
58+++ b/crypto/evp/c_all.c
59@@ -82,9 +82,4 @@ void OPENSSL_add_all_algorithms_noconf(void)
60 OPENSSL_cpuid_setup();
61 OpenSSL_add_all_ciphers();
62 OpenSSL_add_all_digests();
63-#ifndef OPENSSL_NO_ENGINE
64-# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
65- ENGINE_setup_bsd_cryptodev();
66-# endif
67-#endif
68 }
69diff --git a/util/libeay.num b/util/libeay.num 54diff --git a/util/libeay.num b/util/libeay.num
70index 2094ab3..2742cf5 100755 55index 2094ab3..2742cf5 100755
71--- a/util/libeay.num 56--- a/util/libeay.num
@@ -80,5 +65,5 @@ index 2094ab3..2742cf5 100755
80 EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES 65 EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES
81 FIPS_corrupt_rsa 3249 NOEXIST::FUNCTION: 66 FIPS_corrupt_rsa 3249 NOEXIST::FUNCTION:
82-- 67--
832.7.0 682.7.3
84 69
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch
index d5907892..a5c0f6db 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch
@@ -1,4 +1,4 @@
1From e7c630f8417b6f4e1bf2466e545ffe04af2eff00 Mon Sep 17 00:00:00 2001 1From 305ab3fd8a8620fd11f7aef7e42170ba205040a9 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Thu, 29 Aug 2013 16:51:18 +0300 3Date: Thu, 29 Aug 2013 16:51:18 +0300
4Subject: [PATCH 02/48] eng_cryptodev: add support for TLS algorithms offload 4Subject: [PATCH 02/48] eng_cryptodev: add support for TLS algorithms offload
@@ -15,10 +15,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
15 1 file changed, 215 insertions(+), 11 deletions(-) 15 1 file changed, 215 insertions(+), 11 deletions(-)
16 16
17diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 17diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
18index 8fb9c33..4d783d4 100644 18index 2a2b95c..d4da7fb 100644
19--- a/crypto/engine/eng_cryptodev.c 19--- a/crypto/engine/eng_cryptodev.c
20+++ b/crypto/engine/eng_cryptodev.c 20+++ b/crypto/engine/eng_cryptodev.c
21@@ -71,6 +71,9 @@ void ENGINE_load_cryptodev(void) 21@@ -72,6 +72,9 @@ void ENGINE_load_cryptodev(void)
22 struct dev_crypto_state { 22 struct dev_crypto_state {
23 struct session_op d_sess; 23 struct session_op d_sess;
24 int d_fd; 24 int d_fd;
@@ -28,7 +28,7 @@ index 8fb9c33..4d783d4 100644
28 # ifdef USE_CRYPTODEV_DIGESTS 28 # ifdef USE_CRYPTODEV_DIGESTS
29 char dummy_mac_key[HASH_MAX_LEN]; 29 char dummy_mac_key[HASH_MAX_LEN];
30 unsigned char digest_res[HASH_MAX_LEN]; 30 unsigned char digest_res[HASH_MAX_LEN];
31@@ -141,24 +144,25 @@ static struct { 31@@ -142,24 +145,25 @@ static struct {
32 int nid; 32 int nid;
33 int ivmax; 33 int ivmax;
34 int keylen; 34 int keylen;
@@ -60,7 +60,7 @@ index 8fb9c33..4d783d4 100644
60 }, 60 },
61 # ifdef CRYPTO_AES_CTR 61 # ifdef CRYPTO_AES_CTR
62 { 62 {
63@@ -172,16 +176,22 @@ static struct { 63@@ -173,16 +177,22 @@ static struct {
64 }, 64 },
65 # endif 65 # endif
66 { 66 {
@@ -87,7 +87,7 @@ index 8fb9c33..4d783d4 100644
87 }, 87 },
88 }; 88 };
89 89
90@@ -295,13 +305,15 @@ static int get_cryptodev_ciphers(const int **cnids) 90@@ -296,13 +306,15 @@ static int get_cryptodev_ciphers(const int **cnids)
91 } 91 }
92 memset(&sess, 0, sizeof(sess)); 92 memset(&sess, 0, sizeof(sess));
93 sess.key = (caddr_t) "123456789abcdefghijklmno"; 93 sess.key = (caddr_t) "123456789abcdefghijklmno";
@@ -104,7 +104,7 @@ index 8fb9c33..4d783d4 100644
104 if (ioctl(fd, CIOCGSESSION, &sess) != -1 && 104 if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
105 ioctl(fd, CIOCFSESSION, &sess.ses) != -1) 105 ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
106 nids[count++] = ciphers[i].nid; 106 nids[count++] = ciphers[i].nid;
107@@ -457,6 +469,66 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 107@@ -458,6 +470,66 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
108 return (1); 108 return (1);
109 } 109 }
110 110
@@ -171,7 +171,7 @@ index 8fb9c33..4d783d4 100644
171 static int 171 static int
172 cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 172 cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
173 const unsigned char *iv, int enc) 173 const unsigned char *iv, int enc)
174@@ -496,6 +568,45 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 174@@ -497,6 +569,45 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
175 } 175 }
176 176
177 /* 177 /*
@@ -217,7 +217,7 @@ index 8fb9c33..4d783d4 100644
217 * free anything we allocated earlier when initting a 217 * free anything we allocated earlier when initting a
218 * session, and close the session. 218 * session, and close the session.
219 */ 219 */
220@@ -529,6 +640,63 @@ static int cryptodev_cleanup(EVP_CIPHER_CTX *ctx) 220@@ -530,6 +641,63 @@ static int cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
221 return (ret); 221 return (ret);
222 } 222 }
223 223
@@ -281,7 +281,7 @@ index 8fb9c33..4d783d4 100644
281 /* 281 /*
282 * libcrypto EVP stuff - this is how we get wired to EVP so the engine 282 * libcrypto EVP stuff - this is how we get wired to EVP so the engine
283 * gets called when libcrypto requests a cipher NID. 283 * gets called when libcrypto requests a cipher NID.
284@@ -641,6 +809,34 @@ const EVP_CIPHER cryptodev_aes_256_cbc = { 284@@ -642,6 +810,34 @@ const EVP_CIPHER cryptodev_aes_256_cbc = {
285 NULL 285 NULL
286 }; 286 };
287 287
@@ -316,7 +316,7 @@ index 8fb9c33..4d783d4 100644
316 # ifdef CRYPTO_AES_CTR 316 # ifdef CRYPTO_AES_CTR
317 const EVP_CIPHER cryptodev_aes_ctr = { 317 const EVP_CIPHER cryptodev_aes_ctr = {
318 NID_aes_128_ctr, 318 NID_aes_128_ctr,
319@@ -729,6 +925,12 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, 319@@ -730,6 +926,12 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
320 *cipher = &cryptodev_aes_ctr_256; 320 *cipher = &cryptodev_aes_ctr_256;
321 break; 321 break;
322 # endif 322 # endif
@@ -329,7 +329,7 @@ index 8fb9c33..4d783d4 100644
329 default: 329 default:
330 *cipher = NULL; 330 *cipher = NULL;
331 break; 331 break;
332@@ -1472,6 +1674,8 @@ void ENGINE_load_cryptodev(void) 332@@ -1485,6 +1687,8 @@ void ENGINE_load_cryptodev(void)
333 } 333 }
334 put_dev_crypto(fd); 334 put_dev_crypto(fd);
335 335
@@ -339,5 +339,5 @@ index 8fb9c33..4d783d4 100644
339 !ENGINE_set_name(engine, "BSD cryptodev engine") || 339 !ENGINE_set_name(engine, "BSD cryptodev engine") ||
340 !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) || 340 !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
341-- 341--
3422.7.0 3422.7.3
343 343
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0003-cryptodev-fix-algorithm-registration.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0003-cryptodev-fix-algorithm-registration.patch
index 9d30cc32..c53ffc91 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0003-cryptodev-fix-algorithm-registration.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0003-cryptodev-fix-algorithm-registration.patch
@@ -1,4 +1,4 @@
1From 36bb0879b498f8e87798848dafa058476f723165 Mon Sep 17 00:00:00 2001 1From ce6fa215fa58e7ca7a81c70ce8c91f871a20a9dd Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Thu, 31 Jul 2014 14:06:19 +0300 3Date: Thu, 31 Jul 2014 14:06:19 +0300
4Subject: [PATCH 03/48] cryptodev: fix algorithm registration 4Subject: [PATCH 03/48] cryptodev: fix algorithm registration
@@ -12,10 +12,10 @@ Reviewed-by: Horia Ioan Geanta Neag <horia.geanta@freescale.com>
12 1 file changed, 17 insertions(+), 3 deletions(-) 12 1 file changed, 17 insertions(+), 3 deletions(-)
13 13
14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
15index 4d783d4..3b6515e 100644 15index d4da7fb..49ed638 100644
16--- a/crypto/engine/eng_cryptodev.c 16--- a/crypto/engine/eng_cryptodev.c
17+++ b/crypto/engine/eng_cryptodev.c 17+++ b/crypto/engine/eng_cryptodev.c
18@@ -134,6 +134,8 @@ static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, 18@@ -135,6 +135,8 @@ static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key,
19 static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, 19 static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p,
20 void (*f) (void)); 20 void (*f) (void));
21 void ENGINE_load_cryptodev(void); 21 void ENGINE_load_cryptodev(void);
@@ -24,7 +24,7 @@ index 4d783d4..3b6515e 100644
24 24
25 static const ENGINE_CMD_DEFN cryptodev_defns[] = { 25 static const ENGINE_CMD_DEFN cryptodev_defns[] = {
26 {0, NULL, NULL, 0} 26 {0, NULL, NULL, 0}
27@@ -389,7 +391,21 @@ static int get_cryptodev_digests(const int **cnids) 27@@ -390,7 +392,21 @@ static int get_cryptodev_digests(const int **cnids)
28 */ 28 */
29 static int cryptodev_usable_ciphers(const int **nids) 29 static int cryptodev_usable_ciphers(const int **nids)
30 { 30 {
@@ -47,7 +47,7 @@ index 4d783d4..3b6515e 100644
47 } 47 }
48 48
49 static int cryptodev_usable_digests(const int **nids) 49 static int cryptodev_usable_digests(const int **nids)
50@@ -1674,8 +1690,6 @@ void ENGINE_load_cryptodev(void) 50@@ -1687,8 +1703,6 @@ void ENGINE_load_cryptodev(void)
51 } 51 }
52 put_dev_crypto(fd); 52 put_dev_crypto(fd);
53 53
@@ -57,5 +57,5 @@ index 4d783d4..3b6515e 100644
57 !ENGINE_set_name(engine, "BSD cryptodev engine") || 57 !ENGINE_set_name(engine, "BSD cryptodev engine") ||
58 !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) || 58 !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
59-- 59--
602.7.0 602.7.3
61 61
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0004-ECC-Support-header-for-Cryptodev-Engine.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0004-ECC-Support-header-for-Cryptodev-Engine.patch
index 64a5c704..5b6fda10 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0004-ECC-Support-header-for-Cryptodev-Engine.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0004-ECC-Support-header-for-Cryptodev-Engine.patch
@@ -1,4 +1,4 @@
1From 0a9f99574266225c6fa1a10d91eb3fdc755140b8 Mon Sep 17 00:00:00 2001 1From 63ed25dadde23d01eaac6f4c4dae463ba4d7c368 Mon Sep 17 00:00:00 2001
2From: Yashpal Dutta <yashpal.dutta@freescale.com> 2From: Yashpal Dutta <yashpal.dutta@freescale.com>
3Date: Tue, 11 Mar 2014 05:56:54 +0545 3Date: Tue, 11 Mar 2014 05:56:54 +0545
4Subject: [PATCH 04/48] ECC Support header for Cryptodev Engine 4Subject: [PATCH 04/48] ECC Support header for Cryptodev Engine
@@ -315,5 +315,5 @@ index 0000000..af54c51
315+}; 315+};
316+#endif 316+#endif
317-- 317--
3182.7.0 3182.7.3
319 319
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0005-Initial-support-for-PKC-in-cryptodev-engine.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0005-Initial-support-for-PKC-in-cryptodev-engine.patch
index ad253064..156b7434 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0005-Initial-support-for-PKC-in-cryptodev-engine.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0005-Initial-support-for-PKC-in-cryptodev-engine.patch
@@ -1,4 +1,4 @@
1From e28df2a5c63dc6195a6065bfd7de9fc860129f56 Mon Sep 17 00:00:00 2001 1From aff25bbf6b5b833931a5281d30a6f26fda9f0a52 Mon Sep 17 00:00:00 2001
2From: Yashpal Dutta <yashpal.dutta@freescale.com> 2From: Yashpal Dutta <yashpal.dutta@freescale.com>
3Date: Tue, 11 Mar 2014 06:29:52 +0545 3Date: Tue, 11 Mar 2014 06:29:52 +0545
4Subject: [PATCH 05/48] Initial support for PKC in cryptodev engine 4Subject: [PATCH 05/48] Initial support for PKC in cryptodev engine
@@ -11,10 +11,10 @@ Signed-off-by: Yashpal Dutta <yashpal.dutta@freescale.com>
11 1 file changed, 1202 insertions(+), 163 deletions(-) 11 1 file changed, 1202 insertions(+), 163 deletions(-)
12 12
13diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 13diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
14index 3b6515e..0b41bb2 100644 14index 49ed638..cc9b63b 100644
15--- a/crypto/engine/eng_cryptodev.c 15--- a/crypto/engine/eng_cryptodev.c
16+++ b/crypto/engine/eng_cryptodev.c 16+++ b/crypto/engine/eng_cryptodev.c
17@@ -58,6 +58,10 @@ void ENGINE_load_cryptodev(void) 17@@ -59,6 +59,10 @@ void ENGINE_load_cryptodev(void)
18 # include <openssl/dsa.h> 18 # include <openssl/dsa.h>
19 # include <openssl/err.h> 19 # include <openssl/err.h>
20 # include <openssl/rsa.h> 20 # include <openssl/rsa.h>
@@ -25,7 +25,7 @@ index 3b6515e..0b41bb2 100644
25 # include <sys/ioctl.h> 25 # include <sys/ioctl.h>
26 # include <errno.h> 26 # include <errno.h>
27 # include <stdio.h> 27 # include <stdio.h>
28@@ -67,6 +71,7 @@ void ENGINE_load_cryptodev(void) 28@@ -68,6 +72,7 @@ void ENGINE_load_cryptodev(void)
29 # include <syslog.h> 29 # include <syslog.h>
30 # include <errno.h> 30 # include <errno.h>
31 # include <string.h> 31 # include <string.h>
@@ -33,7 +33,7 @@ index 3b6515e..0b41bb2 100644
33 33
34 struct dev_crypto_state { 34 struct dev_crypto_state {
35 struct session_op d_sess; 35 struct session_op d_sess;
36@@ -115,20 +120,10 @@ static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, 36@@ -116,20 +121,10 @@ static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
37 BN_CTX *ctx); 37 BN_CTX *ctx);
38 static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, 38 static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
39 BN_CTX *ctx); 39 BN_CTX *ctx);
@@ -54,7 +54,7 @@ index 3b6515e..0b41bb2 100644
54 static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, 54 static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key,
55 DH *dh); 55 DH *dh);
56 static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, 56 static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p,
57@@ -137,6 +132,105 @@ void ENGINE_load_cryptodev(void); 57@@ -138,6 +133,105 @@ void ENGINE_load_cryptodev(void);
58 const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1; 58 const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1;
59 const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1; 59 const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1;
60 60
@@ -160,7 +160,7 @@ index 3b6515e..0b41bb2 100644
160 static const ENGINE_CMD_DEFN cryptodev_defns[] = { 160 static const ENGINE_CMD_DEFN cryptodev_defns[] = {
161 {0, NULL, NULL, 0} 161 {0, NULL, NULL, 0}
162 }; 162 };
163@@ -1225,7 +1319,6 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest, 163@@ -1230,7 +1324,6 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
164 */ 164 */
165 static int bn2crparam(const BIGNUM *a, struct crparam *crp) 165 static int bn2crparam(const BIGNUM *a, struct crparam *crp)
166 { 166 {
@@ -168,7 +168,7 @@ index 3b6515e..0b41bb2 100644
168 ssize_t bytes, bits; 168 ssize_t bytes, bits;
169 u_char *b; 169 u_char *b;
170 170
171@@ -1243,36 +1336,21 @@ static int bn2crparam(const BIGNUM *a, struct crparam *crp) 171@@ -1248,36 +1341,21 @@ static int bn2crparam(const BIGNUM *a, struct crparam *crp)
172 crp->crp_p = (caddr_t) b; 172 crp->crp_p = (caddr_t) b;
173 crp->crp_nbits = bits; 173 crp->crp_nbits = bits;
174 174
@@ -208,8 +208,8 @@ index 3b6515e..0b41bb2 100644
208 208
209 return (0); 209 return (0);
210 } 210 }
211@@ -1321,6 +1399,32 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen, 211@@ -1334,6 +1412,32 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
212 return (ret); 212 return ret;
213 } 213 }
214 214
215+/* Close an opened instance of cryptodev engine */ 215+/* Close an opened instance of cryptodev engine */
@@ -241,7 +241,7 @@ index 3b6515e..0b41bb2 100644
241 static int 241 static int
242 cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 242 cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
243 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont) 243 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
244@@ -1337,8 +1441,9 @@ cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 244@@ -1350,8 +1454,9 @@ cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
245 return (ret); 245 return (ret);
246 } 246 }
247 247
@@ -252,7 +252,7 @@ index 3b6515e..0b41bb2 100644
252 252
253 /* inputs: a^p % m */ 253 /* inputs: a^p % m */
254 if (bn2crparam(a, &kop.crk_param[0])) 254 if (bn2crparam(a, &kop.crk_param[0]))
255@@ -1381,28 +1486,39 @@ static int 255@@ -1394,28 +1499,39 @@ static int
256 cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) 256 cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
257 { 257 {
258 struct crypt_kop kop; 258 struct crypt_kop kop;
@@ -306,7 +306,7 @@ index 3b6515e..0b41bb2 100644
306 kop.crk_iparams = 6; 306 kop.crk_iparams = 6;
307 307
308 if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL)) { 308 if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL)) {
309@@ -1438,93 +1554,120 @@ static RSA_METHOD cryptodev_rsa = { 309@@ -1451,93 +1567,120 @@ static RSA_METHOD cryptodev_rsa = {
310 NULL /* rsa_verify */ 310 NULL /* rsa_verify */
311 }; 311 };
312 312
@@ -491,7 +491,7 @@ index 3b6515e..0b41bb2 100644
491 } 491 }
492 492
493 static int 493 static int
494@@ -1532,43 +1675,175 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen, 494@@ -1545,43 +1688,175 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
495 DSA_SIG *sig, DSA *dsa) 495 DSA_SIG *sig, DSA *dsa)
496 { 496 {
497 struct crypt_kop kop; 497 struct crypt_kop kop;
@@ -516,7 +516,8 @@ index 3b6515e..0b41bb2 100644
516+ /* Get Order of field of private keys */ 516+ /* Get Order of field of private keys */
517+ if (spcf_bn2bin(dsa->q, &r, &r_len)) { 517+ if (spcf_bn2bin(dsa->q, &r, &r_len)) {
518+ DSAerr(DSA_F_DSA_DO_VERIFY, ERR_R_MALLOC_FAILURE); 518+ DSAerr(DSA_F_DSA_DO_VERIFY, ERR_R_MALLOC_FAILURE);
519+ goto err; 519 goto err;
520- if (bn2crparam(dsa->q, &kop.crk_param[2]))
520+ } 521+ }
521+ 522+
522+ g_len = q_len; 523+ g_len = q_len;
@@ -526,8 +527,7 @@ index 3b6515e..0b41bb2 100644
526+ */ 527+ */
527+ if (spcf_bn2bin_ex(dsa->g, &g, &g_len)) { 528+ if (spcf_bn2bin_ex(dsa->g, &g, &g_len)) {
528+ DSAerr(DSA_F_DSA_DO_VERIFY, ERR_R_MALLOC_FAILURE); 529+ DSAerr(DSA_F_DSA_DO_VERIFY, ERR_R_MALLOC_FAILURE);
529 goto err; 530+ goto err;
530- if (bn2crparam(dsa->q, &kop.crk_param[2]))
531+ } 531+ }
532+ w_len = q_len; 532+ w_len = q_len;
533+ /** 533+ /**
@@ -688,7 +688,7 @@ index 3b6515e..0b41bb2 100644
688 } 688 }
689 689
690 static DSA_METHOD cryptodev_dsa = { 690 static DSA_METHOD cryptodev_dsa = {
691@@ -1584,12 +1859,558 @@ static DSA_METHOD cryptodev_dsa = { 691@@ -1597,12 +1872,558 @@ static DSA_METHOD cryptodev_dsa = {
692 NULL /* app_data */ 692 NULL /* app_data */
693 }; 693 };
694 694
@@ -1252,7 +1252,7 @@ index 3b6515e..0b41bb2 100644
1252 } 1252 }
1253 1253
1254 static int 1254 static int
1255@@ -1597,41 +2418,236 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) 1255@@ -1610,41 +2431,236 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
1256 { 1256 {
1257 struct crypt_kop kop; 1257 struct crypt_kop kop;
1258 int dhret = 1; 1258 int dhret = 1;
@@ -1416,7 +1416,7 @@ index 3b6515e..0b41bb2 100644
1416+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_EC_LIB); 1416+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_EC_LIB);
1417+ goto err; 1417+ goto err;
1418+ } 1418+ }
1419+ } 1419 }
1420+ 1420+
1421+ /* irreducible polynomial that creates the field */ 1421+ /* irreducible polynomial that creates the field */
1422+ if (spcf_bn2bin((BIGNUM *)&group->order, &r, &r_len)) { 1422+ if (spcf_bn2bin((BIGNUM *)&group->order, &r, &r_len)) {
@@ -1477,7 +1477,7 @@ index 3b6515e..0b41bb2 100644
1477+ if (len > buflen || q_len < buflen) { 1477+ if (len > buflen || q_len < buflen) {
1478+ ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_INTERNAL_ERROR); 1478+ ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_INTERNAL_ERROR);
1479+ goto err; 1479+ goto err;
1480 } 1480+ }
1481+ 1481+
1482+ kop.crk_op = CRK_DH_COMPUTE_KEY; 1482+ kop.crk_op = CRK_DH_COMPUTE_KEY;
1483+ kop.crk_param[0].crp_p = (void *)s; 1483+ kop.crk_param[0].crp_p = (void *)s;
@@ -1507,7 +1507,7 @@ index 3b6515e..0b41bb2 100644
1507 } 1507 }
1508 1508
1509 static DH_METHOD cryptodev_dh = { 1509 static DH_METHOD cryptodev_dh = {
1510@@ -1645,6 +2661,14 @@ static DH_METHOD cryptodev_dh = { 1510@@ -1658,6 +2674,14 @@ static DH_METHOD cryptodev_dh = {
1511 NULL /* app_data */ 1511 NULL /* app_data */
1512 }; 1512 };
1513 1513
@@ -1522,7 +1522,7 @@ index 3b6515e..0b41bb2 100644
1522 /* 1522 /*
1523 * ctrl right now is just a wrapper that doesn't do much 1523 * ctrl right now is just a wrapper that doesn't do much
1524 * but I expect we'll want some options soon. 1524 * but I expect we'll want some options soon.
1525@@ -1724,24 +2748,39 @@ void ENGINE_load_cryptodev(void) 1525@@ -1737,24 +2761,39 @@ void ENGINE_load_cryptodev(void)
1526 memcpy(&cryptodev_dsa, meth, sizeof(DSA_METHOD)); 1526 memcpy(&cryptodev_dsa, meth, sizeof(DSA_METHOD));
1527 if (cryptodev_asymfeat & CRF_DSA_SIGN) 1527 if (cryptodev_asymfeat & CRF_DSA_SIGN)
1528 cryptodev_dsa.dsa_do_sign = cryptodev_dsa_do_sign; 1528 cryptodev_dsa.dsa_do_sign = cryptodev_dsa_do_sign;
@@ -1574,5 +1574,5 @@ index 3b6515e..0b41bb2 100644
1574 } 1574 }
1575 1575
1576-- 1576--
15772.7.0 15772.7.3
1578 1578
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0006-Added-hwrng-dev-file-as-source-of-RNG.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0006-Added-hwrng-dev-file-as-source-of-RNG.patch
index 61469dcf..049f963a 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0006-Added-hwrng-dev-file-as-source-of-RNG.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0006-Added-hwrng-dev-file-as-source-of-RNG.patch
@@ -1,4 +1,4 @@
1From c3b1f595607fe4e431dab12b7d8ceda6742547d5 Mon Sep 17 00:00:00 2001 1From e9981377fe8e2081fcd5b4e43a5ef4d8f1cc1e67 Mon Sep 17 00:00:00 2001
2From: Yashpal Dutta <yashpal.dutta@freescale.com> 2From: Yashpal Dutta <yashpal.dutta@freescale.com>
3Date: Tue, 11 Mar 2014 06:42:59 +0545 3Date: Tue, 11 Mar 2014 06:42:59 +0545
4Subject: [PATCH 06/48] Added hwrng dev file as source of RNG 4Subject: [PATCH 06/48] Added hwrng dev file as source of RNG
@@ -24,5 +24,5 @@ index 1fa36c1..6c0917b 100644
24 # ifndef DEVRANDOM_EGD 24 # ifndef DEVRANDOM_EGD
25 /* 25 /*
26-- 26--
272.7.0 272.7.3
28 28
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0007-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0007-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch
index 192cd184..154ae802 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0007-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0007-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch
@@ -1,4 +1,4 @@
1From 45cfc01ade9eeb43fdb5950d3db152cae1b41059 Mon Sep 17 00:00:00 2001 1From ea28474ed5e1e21a6efba7570bf0d27d02923bce Mon Sep 17 00:00:00 2001
2From: Yashpal Dutta <yashpal.dutta@freescale.com> 2From: Yashpal Dutta <yashpal.dutta@freescale.com>
3Date: Tue, 11 Mar 2014 07:14:30 +0545 3Date: Tue, 11 Mar 2014 07:14:30 +0545
4Subject: [PATCH 07/48] Asynchronous interface added for PKC cryptodev 4Subject: [PATCH 07/48] Asynchronous interface added for PKC cryptodev
@@ -116,10 +116,10 @@ index d3a5efc..9b28c04 100644
116 int (*init) (EC_KEY *eckey); 116 int (*init) (EC_KEY *eckey);
117 int (*finish) (EC_KEY *eckey); 117 int (*finish) (EC_KEY *eckey);
118diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 118diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
119index 0b41bb2..8303630 100644 119index cc9b63b..90fe9b8 100644
120--- a/crypto/engine/eng_cryptodev.c 120--- a/crypto/engine/eng_cryptodev.c
121+++ b/crypto/engine/eng_cryptodev.c 121+++ b/crypto/engine/eng_cryptodev.c
122@@ -1367,6 +1367,60 @@ static void zapparams(struct crypt_kop *kop) 122@@ -1371,6 +1371,60 @@ static void zapparams(struct crypt_kop *kop)
123 } 123 }
124 } 124 }
125 125
@@ -180,7 +180,7 @@ index 0b41bb2..8303630 100644
180 static int 180 static int
181 cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen, 181 cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
182 BIGNUM *s) 182 BIGNUM *s)
183@@ -1425,6 +1479,44 @@ void *cryptodev_init_instance(void) 183@@ -1438,6 +1492,44 @@ void *cryptodev_init_instance(void)
184 return fd; 184 return fd;
185 } 185 }
186 186
@@ -225,7 +225,7 @@ index 0b41bb2..8303630 100644
225 static int 225 static int
226 cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 226 cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
227 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont) 227 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
228@@ -1472,6 +1564,66 @@ cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 228@@ -1485,6 +1577,66 @@ cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
229 } 229 }
230 230
231 static int 231 static int
@@ -292,7 +292,7 @@ index 0b41bb2..8303630 100644
292 cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, 292 cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
293 BN_CTX *ctx) 293 BN_CTX *ctx)
294 { 294 {
295@@ -1538,6 +1690,63 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) 295@@ -1551,6 +1703,63 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
296 return (ret); 296 return (ret);
297 } 297 }
298 298
@@ -356,7 +356,7 @@ index 0b41bb2..8303630 100644
356 static RSA_METHOD cryptodev_rsa = { 356 static RSA_METHOD cryptodev_rsa = {
357 "cryptodev RSA method", 357 "cryptodev RSA method",
358 NULL, /* rsa_pub_enc */ 358 NULL, /* rsa_pub_enc */
359@@ -1546,6 +1755,12 @@ static RSA_METHOD cryptodev_rsa = { 359@@ -1559,6 +1768,12 @@ static RSA_METHOD cryptodev_rsa = {
360 NULL, /* rsa_priv_dec */ 360 NULL, /* rsa_priv_dec */
361 NULL, 361 NULL,
362 NULL, 362 NULL,
@@ -369,7 +369,7 @@ index 0b41bb2..8303630 100644
369 NULL, /* init */ 369 NULL, /* init */
370 NULL, /* finish */ 370 NULL, /* finish */
371 0, /* flags */ 371 0, /* flags */
372@@ -1846,128 +2061,428 @@ static int cryptodev_dsa_keygen(DSA *dsa) 372@@ -1859,128 +2074,428 @@ static int cryptodev_dsa_keygen(DSA *dsa)
373 return ret; 373 return ret;
374 } 374 }
375 375
@@ -892,7 +892,7 @@ index 0b41bb2..8303630 100644
892 goto err; 892 goto err;
893 } 893 }
894 } else if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == 894 } else if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
895@@ -2312,54 +2827,588 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len, 895@@ -2325,54 +2840,588 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
896 goto err; 896 goto err;
897 } 897 }
898 898
@@ -1523,7 +1523,7 @@ index 0b41bb2..8303630 100644
1523 return ret; 1523 return ret;
1524 } 1524 }
1525 1525
1526@@ -2468,6 +3517,54 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) 1526@@ -2481,6 +3530,54 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
1527 return (dhret); 1527 return (dhret);
1528 } 1528 }
1529 1529
@@ -1578,7 +1578,7 @@ index 0b41bb2..8303630 100644
1578 int cryptodev_ecdh_compute_key(void *out, size_t outlen, 1578 int cryptodev_ecdh_compute_key(void *out, size_t outlen,
1579 const EC_POINT *pub_key, EC_KEY *ecdh, 1579 const EC_POINT *pub_key, EC_KEY *ecdh,
1580 void *(*KDF) (const void *in, size_t inlen, 1580 void *(*KDF) (const void *in, size_t inlen,
1581@@ -2650,6 +3747,197 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen, 1581@@ -2663,6 +3760,197 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen,
1582 return ret; 1582 return ret;
1583 } 1583 }
1584 1584
@@ -1776,7 +1776,7 @@ index 0b41bb2..8303630 100644
1776 static DH_METHOD cryptodev_dh = { 1776 static DH_METHOD cryptodev_dh = {
1777 "cryptodev DH method", 1777 "cryptodev DH method",
1778 NULL, /* cryptodev_dh_generate_key */ 1778 NULL, /* cryptodev_dh_generate_key */
1779@@ -2657,6 +3945,8 @@ static DH_METHOD cryptodev_dh = { 1779@@ -2670,6 +3958,8 @@ static DH_METHOD cryptodev_dh = {
1780 NULL, 1780 NULL,
1781 NULL, 1781 NULL,
1782 NULL, 1782 NULL,
@@ -1785,7 +1785,7 @@ index 0b41bb2..8303630 100644
1785 0, /* flags */ 1785 0, /* flags */
1786 NULL /* app_data */ 1786 NULL /* app_data */
1787 }; 1787 };
1788@@ -2665,6 +3955,7 @@ static ECDH_METHOD cryptodev_ecdh = { 1788@@ -2678,6 +3968,7 @@ static ECDH_METHOD cryptodev_ecdh = {
1789 "cryptodev ECDH method", 1789 "cryptodev ECDH method",
1790 NULL, /* cryptodev_ecdh_compute_key */ 1790 NULL, /* cryptodev_ecdh_compute_key */
1791 NULL, 1791 NULL,
@@ -1793,7 +1793,7 @@ index 0b41bb2..8303630 100644
1793 0, /* flags */ 1793 0, /* flags */
1794 NULL /* app_data */ 1794 NULL /* app_data */
1795 }; 1795 };
1796@@ -2735,10 +4026,15 @@ void ENGINE_load_cryptodev(void) 1796@@ -2748,10 +4039,15 @@ void ENGINE_load_cryptodev(void)
1797 cryptodev_rsa.rsa_priv_dec = rsa_meth->rsa_priv_dec; 1797 cryptodev_rsa.rsa_priv_dec = rsa_meth->rsa_priv_dec;
1798 if (cryptodev_asymfeat & CRF_MOD_EXP) { 1798 if (cryptodev_asymfeat & CRF_MOD_EXP) {
1799 cryptodev_rsa.bn_mod_exp = cryptodev_bn_mod_exp; 1799 cryptodev_rsa.bn_mod_exp = cryptodev_bn_mod_exp;
@@ -1811,7 +1811,7 @@ index 0b41bb2..8303630 100644
1811 } 1811 }
1812 } 1812 }
1813 1813
1814@@ -2746,12 +4042,18 @@ void ENGINE_load_cryptodev(void) 1814@@ -2759,12 +4055,18 @@ void ENGINE_load_cryptodev(void)
1815 const DSA_METHOD *meth = DSA_OpenSSL(); 1815 const DSA_METHOD *meth = DSA_OpenSSL();
1816 1816
1817 memcpy(&cryptodev_dsa, meth, sizeof(DSA_METHOD)); 1817 memcpy(&cryptodev_dsa, meth, sizeof(DSA_METHOD));
@@ -1833,7 +1833,7 @@ index 0b41bb2..8303630 100644
1833 } 1833 }
1834 1834
1835 if (ENGINE_set_DH(engine, &cryptodev_dh)) { 1835 if (ENGINE_set_DH(engine, &cryptodev_dh)) {
1836@@ -2759,9 +4061,12 @@ void ENGINE_load_cryptodev(void) 1836@@ -2772,9 +4074,12 @@ void ENGINE_load_cryptodev(void)
1837 memcpy(&cryptodev_dh, dh_meth, sizeof(DH_METHOD)); 1837 memcpy(&cryptodev_dh, dh_meth, sizeof(DH_METHOD));
1838 if (cryptodev_asymfeat & CRF_DH_COMPUTE_KEY) { 1838 if (cryptodev_asymfeat & CRF_DH_COMPUTE_KEY) {
1839 cryptodev_dh.compute_key = cryptodev_dh_compute_key; 1839 cryptodev_dh.compute_key = cryptodev_dh_compute_key;
@@ -1846,7 +1846,7 @@ index 0b41bb2..8303630 100644
1846 } 1846 }
1847 } 1847 }
1848 1848
1849@@ -2770,9 +4075,13 @@ void ENGINE_load_cryptodev(void) 1849@@ -2783,9 +4088,13 @@ void ENGINE_load_cryptodev(void)
1850 memcpy(&cryptodev_ecdsa, meth, sizeof(ECDSA_METHOD)); 1850 memcpy(&cryptodev_ecdsa, meth, sizeof(ECDSA_METHOD));
1851 if (cryptodev_asymfeat & CRF_DSA_SIGN) { 1851 if (cryptodev_asymfeat & CRF_DSA_SIGN) {
1852 cryptodev_ecdsa.ecdsa_do_sign = cryptodev_ecdsa_do_sign; 1852 cryptodev_ecdsa.ecdsa_do_sign = cryptodev_ecdsa_do_sign;
@@ -1860,7 +1860,7 @@ index 0b41bb2..8303630 100644
1860 } 1860 }
1861 } 1861 }
1862 1862
1863@@ -2781,9 +4090,16 @@ void ENGINE_load_cryptodev(void) 1863@@ -2794,9 +4103,16 @@ void ENGINE_load_cryptodev(void)
1864 memcpy(&cryptodev_ecdh, ecdh_meth, sizeof(ECDH_METHOD)); 1864 memcpy(&cryptodev_ecdh, ecdh_meth, sizeof(ECDH_METHOD));
1865 if (cryptodev_asymfeat & CRF_DH_COMPUTE_KEY) { 1865 if (cryptodev_asymfeat & CRF_DH_COMPUTE_KEY) {
1866 cryptodev_ecdh.compute_key = cryptodev_ecdh_compute_key; 1866 cryptodev_ecdh.compute_key = cryptodev_ecdh_compute_key;
@@ -2046,5 +2046,5 @@ index d2ee374..7c539fc 100644
2046 int (*init) (RSA *rsa); 2046 int (*init) (RSA *rsa);
2047 /* called at free */ 2047 /* called at free */
2048-- 2048--
20492.7.0 20492.7.3
2050 2050
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0008-Add-RSA-keygen-operation-and-support-gendsa-command-.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0008-Add-RSA-keygen-operation-and-support-gendsa-command-.patch
index ccd24e31..070b93a0 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0008-Add-RSA-keygen-operation-and-support-gendsa-command-.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0008-Add-RSA-keygen-operation-and-support-gendsa-command-.patch
@@ -1,4 +1,4 @@
1From 94a3fc9f437c20726209cea19256c419837055a2 Mon Sep 17 00:00:00 2001 1From 73629969c6fe54529441530674b061ce31a41d93 Mon Sep 17 00:00:00 2001
2From: Hou Zhiqiang <B48286@freescale.com> 2From: Hou Zhiqiang <B48286@freescale.com>
3Date: Wed, 2 Apr 2014 16:10:43 +0800 3Date: Wed, 2 Apr 2014 16:10:43 +0800
4Subject: [PATCH 08/48] Add RSA keygen operation and support gendsa command 4Subject: [PATCH 08/48] Add RSA keygen operation and support gendsa command
@@ -13,10 +13,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
13 1 file changed, 120 insertions(+) 13 1 file changed, 120 insertions(+)
14 14
15diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 15diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
16index 8303630..44017a3 100644 16index 90fe9b8..8c9ad5c 100644
17--- a/crypto/engine/eng_cryptodev.c 17--- a/crypto/engine/eng_cryptodev.c
18+++ b/crypto/engine/eng_cryptodev.c 18+++ b/crypto/engine/eng_cryptodev.c
19@@ -2009,6 +2009,124 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen, 19@@ -2022,6 +2022,124 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
20 } 20 }
21 } 21 }
22 22
@@ -141,7 +141,7 @@ index 8303630..44017a3 100644
141 /* Cryptodev DSA Key Gen routine */ 141 /* Cryptodev DSA Key Gen routine */
142 static int cryptodev_dsa_keygen(DSA *dsa) 142 static int cryptodev_dsa_keygen(DSA *dsa)
143 { 143 {
144@@ -4035,6 +4153,8 @@ void ENGINE_load_cryptodev(void) 144@@ -4048,6 +4166,8 @@ void ENGINE_load_cryptodev(void)
145 cryptodev_rsa.rsa_mod_exp_async = 145 cryptodev_rsa.rsa_mod_exp_async =
146 cryptodev_rsa_nocrt_mod_exp_async; 146 cryptodev_rsa_nocrt_mod_exp_async;
147 } 147 }
@@ -151,5 +151,5 @@ index 8303630..44017a3 100644
151 } 151 }
152 152
153-- 153--
1542.7.0 1542.7.3
155 155
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0009-RSA-Keygen-Fix.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0009-RSA-Keygen-Fix.patch
index d4cd02fd..faa1690b 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0009-RSA-Keygen-Fix.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0009-RSA-Keygen-Fix.patch
@@ -1,4 +1,4 @@
1From ca7adb9cf57497d27136a599531ea5b9671876c7 Mon Sep 17 00:00:00 2001 1From b3726ca2b823fe2a4c675b750e6f96d4a03ce93c Mon Sep 17 00:00:00 2001
2From: Yashpal Dutta <yashpal.dutta@freescale.com> 2From: Yashpal Dutta <yashpal.dutta@freescale.com>
3Date: Wed, 16 Apr 2014 22:53:04 +0545 3Date: Wed, 16 Apr 2014 22:53:04 +0545
4Subject: [PATCH 09/48] RSA Keygen Fix 4Subject: [PATCH 09/48] RSA Keygen Fix
@@ -16,10 +16,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
16 1 file changed, 7 insertions(+), 5 deletions(-) 16 1 file changed, 7 insertions(+), 5 deletions(-)
17 17
18diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 18diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
19index 44017a3..eac5fb6 100644 19index 8c9ad5c..3686c23 100644
20--- a/crypto/engine/eng_cryptodev.c 20--- a/crypto/engine/eng_cryptodev.c
21+++ b/crypto/engine/eng_cryptodev.c 21+++ b/crypto/engine/eng_cryptodev.c
22@@ -2018,7 +2018,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) 22@@ -2031,7 +2031,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
23 int i; 23 int i;
24 24
25 if ((fd = get_asym_dev_crypto()) < 0) 25 if ((fd = get_asym_dev_crypto()) < 0)
@@ -28,7 +28,7 @@ index 44017a3..eac5fb6 100644
28 28
29 if (!rsa->n && ((rsa->n = BN_new()) == NULL)) 29 if (!rsa->n && ((rsa->n = BN_new()) == NULL))
30 goto err; 30 goto err;
31@@ -2047,7 +2047,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) 31@@ -2060,7 +2060,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
32 /* p length */ 32 /* p length */
33 kop.crk_param[kop.crk_iparams].crp_p = calloc(p_len + 1, sizeof(char)); 33 kop.crk_param[kop.crk_iparams].crp_p = calloc(p_len + 1, sizeof(char));
34 if (!kop.crk_param[kop.crk_iparams].crp_p) 34 if (!kop.crk_param[kop.crk_iparams].crp_p)
@@ -37,7 +37,7 @@ index 44017a3..eac5fb6 100644
37 kop.crk_param[kop.crk_iparams].crp_nbits = p_len * 8; 37 kop.crk_param[kop.crk_iparams].crp_nbits = p_len * 8;
38 memset(kop.crk_param[kop.crk_iparams].crp_p, 0xff, p_len + 1); 38 memset(kop.crk_param[kop.crk_iparams].crp_p, 0xff, p_len + 1);
39 kop.crk_iparams++; 39 kop.crk_iparams++;
40@@ -2055,7 +2055,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) 40@@ -2068,7 +2068,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
41 /* q length */ 41 /* q length */
42 kop.crk_param[kop.crk_iparams].crp_p = calloc(q_len + 1, sizeof(char)); 42 kop.crk_param[kop.crk_iparams].crp_p = calloc(q_len + 1, sizeof(char));
43 if (!kop.crk_param[kop.crk_iparams].crp_p) 43 if (!kop.crk_param[kop.crk_iparams].crp_p)
@@ -46,7 +46,7 @@ index 44017a3..eac5fb6 100644
46 kop.crk_param[kop.crk_iparams].crp_nbits = q_len * 8; 46 kop.crk_param[kop.crk_iparams].crp_nbits = q_len * 8;
47 memset(kop.crk_param[kop.crk_iparams].crp_p, 0xff, q_len + 1); 47 memset(kop.crk_param[kop.crk_iparams].crp_p, 0xff, q_len + 1);
48 kop.crk_iparams++; 48 kop.crk_iparams++;
49@@ -2115,8 +2115,10 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) 49@@ -2128,8 +2128,10 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
50 } 50 }
51 sw_try: 51 sw_try:
52 { 52 {
@@ -60,5 +60,5 @@ index 44017a3..eac5fb6 100644
60 return ret; 60 return ret;
61 61
62-- 62--
632.7.0 632.7.3
64 64
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0010-Removed-local-copy-of-curve_t-type.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0010-Removed-local-copy-of-curve_t-type.patch
index 8908d548..22258b4d 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0010-Removed-local-copy-of-curve_t-type.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0010-Removed-local-copy-of-curve_t-type.patch
@@ -1,4 +1,4 @@
1From cd80be25a3da28d23dfcb2762252b413879eaa74 Mon Sep 17 00:00:00 2001 1From 1a7d37d609b5ce61d0c1454292dd4500859ed65c Mon Sep 17 00:00:00 2001
2From: Yashpal Dutta <yashpal.dutta@freescale.com> 2From: Yashpal Dutta <yashpal.dutta@freescale.com>
3Date: Thu, 17 Apr 2014 06:57:59 +0545 3Date: Thu, 17 Apr 2014 06:57:59 +0545
4Subject: [PATCH 10/48] Removed local copy of curve_t type 4Subject: [PATCH 10/48] Removed local copy of curve_t type
@@ -13,10 +13,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
13 2 files changed, 14 insertions(+), 26 deletions(-) 13 2 files changed, 14 insertions(+), 26 deletions(-)
14 14
15diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 15diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
16index eac5fb6..151774c 100644 16index 3686c23..afcf72b 100644
17--- a/crypto/engine/eng_cryptodev.c 17--- a/crypto/engine/eng_cryptodev.c
18+++ b/crypto/engine/eng_cryptodev.c 18+++ b/crypto/engine/eng_cryptodev.c
19@@ -2504,11 +2504,6 @@ static ECDSA_METHOD cryptodev_ecdsa = { 19@@ -2517,11 +2517,6 @@ static ECDSA_METHOD cryptodev_ecdsa = {
20 NULL /* app_data */ 20 NULL /* app_data */
21 }; 21 };
22 22
@@ -28,7 +28,7 @@ index eac5fb6..151774c 100644
28 /* ENGINE handler for ECDSA Sign */ 28 /* ENGINE handler for ECDSA Sign */
29 static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst, 29 static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
30 int dgst_len, const BIGNUM *in_kinv, 30 int dgst_len, const BIGNUM *in_kinv,
31@@ -2527,7 +2522,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst, 31@@ -2540,7 +2535,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
32 const BIGNUM *order = NULL, *priv_key = NULL; 32 const BIGNUM *order = NULL, *priv_key = NULL;
33 const EC_GROUP *group = NULL; 33 const EC_GROUP *group = NULL;
34 struct crypt_kop kop; 34 struct crypt_kop kop;
@@ -37,7 +37,7 @@ index eac5fb6..151774c 100644
37 37
38 memset(&kop, 0, sizeof(kop)); 38 memset(&kop, 0, sizeof(kop));
39 ecdsa = ecdsa_check(eckey); 39 ecdsa = ecdsa_check(eckey);
40@@ -2665,7 +2660,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst, 40@@ -2678,7 +2673,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
41 else 41 else
42 goto err; 42 goto err;
43 } 43 }
@@ -46,7 +46,7 @@ index eac5fb6..151774c 100644
46 } 46 }
47 47
48 /* Calculation of Generator point */ 48 /* Calculation of Generator point */
49@@ -2760,7 +2755,7 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len, 49@@ -2773,7 +2768,7 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
50 const EC_POINT *pub_key = NULL; 50 const EC_POINT *pub_key = NULL;
51 const BIGNUM *order = NULL; 51 const BIGNUM *order = NULL;
52 const EC_GROUP *group = NULL; 52 const EC_GROUP *group = NULL;
@@ -55,7 +55,7 @@ index eac5fb6..151774c 100644
55 struct crypt_kop kop; 55 struct crypt_kop kop;
56 56
57 memset(&kop, 0, sizeof kop); 57 memset(&kop, 0, sizeof kop);
58@@ -2911,7 +2906,7 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len, 58@@ -2924,7 +2919,7 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
59 else 59 else
60 goto err; 60 goto err;
61 } 61 }
@@ -64,7 +64,7 @@ index eac5fb6..151774c 100644
64 } 64 }
65 65
66 /* Calculation of Generator point */ 66 /* Calculation of Generator point */
67@@ -3016,7 +3011,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst, 67@@ -3029,7 +3024,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst,
68 const BIGNUM *order = NULL, *priv_key = NULL; 68 const BIGNUM *order = NULL, *priv_key = NULL;
69 const EC_GROUP *group = NULL; 69 const EC_GROUP *group = NULL;
70 struct crypt_kop *kop = malloc(sizeof(struct crypt_kop)); 70 struct crypt_kop *kop = malloc(sizeof(struct crypt_kop));
@@ -73,7 +73,7 @@ index eac5fb6..151774c 100644
73 73
74 if (!(sig->r = BN_new()) || !kop) 74 if (!(sig->r = BN_new()) || !kop)
75 goto err; 75 goto err;
76@@ -3157,7 +3152,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst, 76@@ -3170,7 +3165,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst,
77 else 77 else
78 goto err; 78 goto err;
79 } 79 }
@@ -82,7 +82,7 @@ index eac5fb6..151774c 100644
82 } 82 }
83 83
84 /* Calculation of Generator point */ 84 /* Calculation of Generator point */
85@@ -3237,7 +3232,7 @@ static int cryptodev_ecdsa_verify_async(const unsigned char *dgst, 85@@ -3250,7 +3245,7 @@ static int cryptodev_ecdsa_verify_async(const unsigned char *dgst,
86 const EC_POINT *pub_key = NULL; 86 const EC_POINT *pub_key = NULL;
87 const BIGNUM *order = NULL; 87 const BIGNUM *order = NULL;
88 const EC_GROUP *group = NULL; 88 const EC_GROUP *group = NULL;
@@ -91,7 +91,7 @@ index eac5fb6..151774c 100644
91 struct crypt_kop *kop = malloc(sizeof(struct crypt_kop)); 91 struct crypt_kop *kop = malloc(sizeof(struct crypt_kop));
92 92
93 if (!kop) 93 if (!kop)
94@@ -3384,7 +3379,7 @@ static int cryptodev_ecdsa_verify_async(const unsigned char *dgst, 94@@ -3397,7 +3392,7 @@ static int cryptodev_ecdsa_verify_async(const unsigned char *dgst,
95 if (ec_crv == EC_BINARY) { 95 if (ec_crv == EC_BINARY) {
96 /* copy b' i.e c(b), instead of only b */ 96 /* copy b' i.e c(b), instead of only b */
97 eng_ec_get_cparam(EC_GROUP_get_curve_name(group), ab + q_len, q_len); 97 eng_ec_get_cparam(EC_GROUP_get_curve_name(group), ab + q_len, q_len);
@@ -100,7 +100,7 @@ index eac5fb6..151774c 100644
100 } 100 }
101 101
102 /* Calculation of Generator point */ 102 /* Calculation of Generator point */
103@@ -3690,7 +3685,7 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen, 103@@ -3703,7 +3698,7 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen,
104 void *(*KDF) (const void *in, size_t inlen, 104 void *(*KDF) (const void *in, size_t inlen,
105 void *out, size_t *outlen)) 105 void *out, size_t *outlen))
106 { 106 {
@@ -109,7 +109,7 @@ index eac5fb6..151774c 100644
109 unsigned char *q = NULL, *w_xy = NULL, *ab = NULL, *s = NULL, *r = NULL; 109 unsigned char *q = NULL, *w_xy = NULL, *ab = NULL, *s = NULL, *r = NULL;
110 BIGNUM *w_x = NULL, *w_y = NULL; 110 BIGNUM *w_x = NULL, *w_y = NULL;
111 int q_len = 0, ab_len = 0, pub_key_len = 0, r_len = 0, priv_key_len = 0; 111 int q_len = 0, ab_len = 0, pub_key_len = 0, r_len = 0, priv_key_len = 0;
112@@ -3820,9 +3815,9 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen, 112@@ -3833,9 +3828,9 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen,
113 else 113 else
114 goto err; 114 goto err;
115 } 115 }
@@ -121,7 +121,7 @@ index eac5fb6..151774c 100644
121 121
122 priv_key_len = r_len; 122 priv_key_len = r_len;
123 123
124@@ -3874,7 +3869,7 @@ int cryptodev_ecdh_compute_key_async(void *out, size_t outlen, 124@@ -3887,7 +3882,7 @@ int cryptodev_ecdh_compute_key_async(void *out, size_t outlen,
125 size_t *outlen), 125 size_t *outlen),
126 struct pkc_cookie_s *cookie) 126 struct pkc_cookie_s *cookie)
127 { 127 {
@@ -130,7 +130,7 @@ index eac5fb6..151774c 100644
130 unsigned char *q = NULL, *w_xy = NULL, *ab = NULL, *s = NULL, *r = NULL; 130 unsigned char *q = NULL, *w_xy = NULL, *ab = NULL, *s = NULL, *r = NULL;
131 BIGNUM *w_x = NULL, *w_y = NULL; 131 BIGNUM *w_x = NULL, *w_y = NULL;
132 int q_len = 0, ab_len = 0, pub_key_len = 0, r_len = 0, priv_key_len = 0; 132 int q_len = 0, ab_len = 0, pub_key_len = 0, r_len = 0, priv_key_len = 0;
133@@ -4005,9 +4000,9 @@ int cryptodev_ecdh_compute_key_async(void *out, size_t outlen, 133@@ -4018,9 +4013,9 @@ int cryptodev_ecdh_compute_key_async(void *out, size_t outlen,
134 else 134 else
135 goto err; 135 goto err;
136 } 136 }
@@ -159,5 +159,5 @@ index af54c51..41a8702 100644
159-}; 159-};
160 #endif 160 #endif
161-- 161--
1622.7.0 1622.7.3
163 163
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0011-Modulus-parameter-is-not-populated-by-dhparams.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0011-Modulus-parameter-is-not-populated-by-dhparams.patch
index 13aea015..d7fb2234 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0011-Modulus-parameter-is-not-populated-by-dhparams.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0011-Modulus-parameter-is-not-populated-by-dhparams.patch
@@ -1,4 +1,4 @@
1From f9d9da58818740334ef356d0384d4e88da865dca Mon Sep 17 00:00:00 2001 1From 82afed6364dfcced7458dbd2bda7932054078f04 Mon Sep 17 00:00:00 2001
2From: Yashpal Dutta <yashpal.dutta@freescale.com> 2From: Yashpal Dutta <yashpal.dutta@freescale.com>
3Date: Tue, 22 Apr 2014 22:58:33 +0545 3Date: Tue, 22 Apr 2014 22:58:33 +0545
4Subject: [PATCH 11/48] Modulus parameter is not populated by dhparams 4Subject: [PATCH 11/48] Modulus parameter is not populated by dhparams
@@ -17,10 +17,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
17 1 file changed, 2 insertions(+), 2 deletions(-) 17 1 file changed, 2 insertions(+), 2 deletions(-)
18 18
19diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 19diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
20index 151774c..1f1f307 100644 20index afcf72b..2013746 100644
21--- a/crypto/engine/eng_cryptodev.c 21--- a/crypto/engine/eng_cryptodev.c
22+++ b/crypto/engine/eng_cryptodev.c 22+++ b/crypto/engine/eng_cryptodev.c
23@@ -3502,7 +3502,7 @@ static int cryptodev_dh_keygen_async(DH *dh, struct pkc_cookie_s *cookie) 23@@ -3515,7 +3515,7 @@ static int cryptodev_dh_keygen_async(DH *dh, struct pkc_cookie_s *cookie)
24 kop->crk_op = CRK_DH_GENERATE_KEY; 24 kop->crk_op = CRK_DH_GENERATE_KEY;
25 if (bn2crparam(dh->p, &kop->crk_param[0])) 25 if (bn2crparam(dh->p, &kop->crk_param[0]))
26 goto sw_try; 26 goto sw_try;
@@ -29,7 +29,7 @@ index 151774c..1f1f307 100644
29 goto sw_try; 29 goto sw_try;
30 kop->crk_param[2].crp_p = g; 30 kop->crk_param[2].crp_p = g;
31 kop->crk_param[2].crp_nbits = g_len * 8; 31 kop->crk_param[2].crp_nbits = g_len * 8;
32@@ -3557,7 +3557,7 @@ static int cryptodev_dh_keygen(DH *dh) 32@@ -3570,7 +3570,7 @@ static int cryptodev_dh_keygen(DH *dh)
33 kop.crk_op = CRK_DH_GENERATE_KEY; 33 kop.crk_op = CRK_DH_GENERATE_KEY;
34 if (bn2crparam(dh->p, &kop.crk_param[0])) 34 if (bn2crparam(dh->p, &kop.crk_param[0]))
35 goto sw_try; 35 goto sw_try;
@@ -39,5 +39,5 @@ index 151774c..1f1f307 100644
39 kop.crk_param[2].crp_p = g; 39 kop.crk_param[2].crp_p = g;
40 kop.crk_param[2].crp_nbits = g_len * 8; 40 kop.crk_param[2].crp_nbits = g_len * 8;
41-- 41--
422.7.0 422.7.3
43 43
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0012-SW-Backoff-mechanism-for-dsa-keygen.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0012-SW-Backoff-mechanism-for-dsa-keygen.patch
index bf36a322..b665f7a9 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0012-SW-Backoff-mechanism-for-dsa-keygen.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0012-SW-Backoff-mechanism-for-dsa-keygen.patch
@@ -1,4 +1,4 @@
1From 18f4dbbba2c0142792b394bec35531cefe277712 Mon Sep 17 00:00:00 2001 1From f7817245b35156ec2b15514c952db806140c6ebc Mon Sep 17 00:00:00 2001
2From: Yashpal Dutta <yashpal.dutta@freescale.com> 2From: Yashpal Dutta <yashpal.dutta@freescale.com>
3Date: Thu, 24 Apr 2014 00:35:34 +0545 3Date: Thu, 24 Apr 2014 00:35:34 +0545
4Subject: [PATCH 12/48] SW Backoff mechanism for dsa keygen 4Subject: [PATCH 12/48] SW Backoff mechanism for dsa keygen
@@ -16,10 +16,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
16 1 file changed, 8 insertions(+), 4 deletions(-) 16 1 file changed, 8 insertions(+), 4 deletions(-)
17 17
18diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 18diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
19index 1f1f307..db8e02d 100644 19index 2013746..a3a97d2 100644
20--- a/crypto/engine/eng_cryptodev.c 20--- a/crypto/engine/eng_cryptodev.c
21+++ b/crypto/engine/eng_cryptodev.c 21+++ b/crypto/engine/eng_cryptodev.c
22@@ -2175,8 +2175,10 @@ static int cryptodev_dsa_keygen(DSA *dsa) 22@@ -2188,8 +2188,10 @@ static int cryptodev_dsa_keygen(DSA *dsa)
23 return ret; 23 return ret;
24 sw_try: 24 sw_try:
25 { 25 {
@@ -32,7 +32,7 @@ index 1f1f307..db8e02d 100644
32 } 32 }
33 return ret; 33 return ret;
34 } 34 }
35@@ -2230,11 +2232,13 @@ static int cryptodev_dsa_keygen_async(DSA *dsa, struct pkc_cookie_s *cookie) 35@@ -2243,11 +2245,13 @@ static int cryptodev_dsa_keygen_async(DSA *dsa, struct pkc_cookie_s *cookie)
36 return ret; 36 return ret;
37 sw_try: 37 sw_try:
38 { 38 {
@@ -49,5 +49,5 @@ index 1f1f307..db8e02d 100644
49 } 49 }
50 return ret; 50 return ret;
51-- 51--
522.7.0 522.7.3
53 53
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0013-Fixed-DH-keygen-pair-generator.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0013-Fixed-DH-keygen-pair-generator.patch
index 12465d7e..4f8fd4de 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0013-Fixed-DH-keygen-pair-generator.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0013-Fixed-DH-keygen-pair-generator.patch
@@ -1,4 +1,4 @@
1From 4d5ffd41f423309fc9aaf3621598ca51c5838e31 Mon Sep 17 00:00:00 2001 1From 0075a1d36133523a40efc66d6491a4f11aca87fd Mon Sep 17 00:00:00 2001
2From: Yashpal Dutta <yashpal.dutta@freescale.com> 2From: Yashpal Dutta <yashpal.dutta@freescale.com>
3Date: Thu, 1 May 2014 06:35:45 +0545 3Date: Thu, 1 May 2014 06:35:45 +0545
4Subject: [PATCH 13/48] Fixed DH keygen pair generator 4Subject: [PATCH 13/48] Fixed DH keygen pair generator
@@ -14,10 +14,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
14 1 file changed, 33 insertions(+), 17 deletions(-) 14 1 file changed, 33 insertions(+), 17 deletions(-)
15 15
16diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 16diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
17index db8e02d..4929ae6 100644 17index a3a97d2..5a9f4b7 100644
18--- a/crypto/engine/eng_cryptodev.c 18--- a/crypto/engine/eng_cryptodev.c
19+++ b/crypto/engine/eng_cryptodev.c 19+++ b/crypto/engine/eng_cryptodev.c
20@@ -3534,44 +3534,60 @@ static int cryptodev_dh_keygen_async(DH *dh, struct pkc_cookie_s *cookie) 20@@ -3547,44 +3547,60 @@ static int cryptodev_dh_keygen_async(DH *dh, struct pkc_cookie_s *cookie)
21 static int cryptodev_dh_keygen(DH *dh) 21 static int cryptodev_dh_keygen(DH *dh)
22 { 22 {
23 struct crypt_kop kop; 23 struct crypt_kop kop;
@@ -96,5 +96,5 @@ index db8e02d..4929ae6 100644
96 sw_try: 96 sw_try:
97 { 97 {
98-- 98--
992.7.0 992.7.3
100 100
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0014-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0014-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch
index 5a8c2d29..898499b4 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0014-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0014-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch
@@ -1,4 +1,4 @@
1From 317e3d9870097e6b115dd8c9a13ccb5e5ca76f2e Mon Sep 17 00:00:00 2001 1From fcbd6199deb715b117153b7df00cdd4cdec44d79 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Mon, 16 Jun 2014 14:06:21 +0300 3Date: Mon, 16 Jun 2014 14:06:21 +0300
4Subject: [PATCH 14/48] cryptodev: add support for aes-gcm algorithm offloading 4Subject: [PATCH 14/48] cryptodev: add support for aes-gcm algorithm offloading
@@ -10,7 +10,7 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
10 2 files changed, 240 insertions(+), 2 deletions(-) 10 2 files changed, 240 insertions(+), 2 deletions(-)
11 11
12diff --git a/apps/speed.c b/apps/speed.c 12diff --git a/apps/speed.c b/apps/speed.c
13index 95adcc1..e5e609b 100644 13index b862868..fd2a2a5 100644
14--- a/apps/speed.c 14--- a/apps/speed.c
15+++ b/apps/speed.c 15+++ b/apps/speed.c
16@@ -226,7 +226,11 @@ 16@@ -226,7 +226,11 @@
@@ -27,7 +27,7 @@ index 95adcc1..e5e609b 100644
27 27
28 static int mr = 0; 28 static int mr = 0;
29diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 29diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
30index 4929ae6..d2cdca0 100644 30index 5a9f4b7..1754917 100644
31--- a/crypto/engine/eng_cryptodev.c 31--- a/crypto/engine/eng_cryptodev.c
32+++ b/crypto/engine/eng_cryptodev.c 32+++ b/crypto/engine/eng_cryptodev.c
33@@ -2,6 +2,7 @@ 33@@ -2,6 +2,7 @@
@@ -38,7 +38,7 @@ index 4929ae6..d2cdca0 100644
38 * All rights reserved. 38 * All rights reserved.
39 * 39 *
40 * Redistribution and use in source and binary forms, with or without 40 * Redistribution and use in source and binary forms, with or without
41@@ -77,8 +78,10 @@ struct dev_crypto_state { 41@@ -78,8 +79,10 @@ struct dev_crypto_state {
42 struct session_op d_sess; 42 struct session_op d_sess;
43 int d_fd; 43 int d_fd;
44 unsigned char *aad; 44 unsigned char *aad;
@@ -50,7 +50,7 @@ index 4929ae6..d2cdca0 100644
50 # ifdef USE_CRYPTODEV_DIGESTS 50 # ifdef USE_CRYPTODEV_DIGESTS
51 char dummy_mac_key[HASH_MAX_LEN]; 51 char dummy_mac_key[HASH_MAX_LEN];
52 unsigned char digest_res[HASH_MAX_LEN]; 52 unsigned char digest_res[HASH_MAX_LEN];
53@@ -287,6 +290,9 @@ static struct { 53@@ -288,6 +291,9 @@ static struct {
54 CRYPTO_TLS10_AES_CBC_HMAC_SHA1, NID_aes_256_cbc_hmac_sha1, 16, 32, 20 54 CRYPTO_TLS10_AES_CBC_HMAC_SHA1, NID_aes_256_cbc_hmac_sha1, 16, 32, 20
55 }, 55 },
56 { 56 {
@@ -60,7 +60,7 @@ index 4929ae6..d2cdca0 100644
60 0, NID_undef, 0, 0, 0 60 0, NID_undef, 0, 0, 0
61 }, 61 },
62 }; 62 };
63@@ -325,6 +331,22 @@ static struct { 63@@ -326,6 +332,22 @@ static struct {
64 }; 64 };
65 # endif 65 # endif
66 66
@@ -83,7 +83,7 @@ index 4929ae6..d2cdca0 100644
83 /* 83 /*
84 * Return a fd if /dev/crypto seems usable, 0 otherwise. 84 * Return a fd if /dev/crypto seems usable, 0 otherwise.
85 */ 85 */
86@@ -807,6 +829,199 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, 86@@ -808,6 +830,199 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
87 } 87 }
88 } 88 }
89 89
@@ -283,7 +283,7 @@ index 4929ae6..d2cdca0 100644
283 /* 283 /*
284 * libcrypto EVP stuff - this is how we get wired to EVP so the engine 284 * libcrypto EVP stuff - this is how we get wired to EVP so the engine
285 * gets called when libcrypto requests a cipher NID. 285 * gets called when libcrypto requests a cipher NID.
286@@ -947,6 +1162,22 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1 = { 286@@ -948,6 +1163,22 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1 = {
287 NULL 287 NULL
288 }; 288 };
289 289
@@ -306,7 +306,7 @@ index 4929ae6..d2cdca0 100644
306 # ifdef CRYPTO_AES_CTR 306 # ifdef CRYPTO_AES_CTR
307 const EVP_CIPHER cryptodev_aes_ctr = { 307 const EVP_CIPHER cryptodev_aes_ctr = {
308 NID_aes_128_ctr, 308 NID_aes_128_ctr,
309@@ -1041,6 +1272,9 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, 309@@ -1042,6 +1273,9 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
310 case NID_aes_256_cbc_hmac_sha1: 310 case NID_aes_256_cbc_hmac_sha1:
311 *cipher = &cryptodev_aes_256_cbc_hmac_sha1; 311 *cipher = &cryptodev_aes_256_cbc_hmac_sha1;
312 break; 312 break;
@@ -317,5 +317,5 @@ index 4929ae6..d2cdca0 100644
317 *cipher = NULL; 317 *cipher = NULL;
318 break; 318 break;
319-- 319--
3202.7.0 3202.7.3
321 321
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0015-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0015-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch
index 623c58b9..c1201f26 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0015-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0015-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch
@@ -1,4 +1,4 @@
1From 7dd6b35c35b027be8ef0ef2e29a949bc4ce96bbd Mon Sep 17 00:00:00 2001 1From 6094ec91a5b8dde4bc3a7928b7cb6c81cac8a169 Mon Sep 17 00:00:00 2001
2From: Tudor Ambarus <tudor.ambarus@freescale.com> 2From: Tudor Ambarus <tudor.ambarus@freescale.com>
3Date: Fri, 9 May 2014 17:54:06 +0300 3Date: Fri, 9 May 2014 17:54:06 +0300
4Subject: [PATCH 15/48] eng_cryptodev: extend TLS offload with 4Subject: [PATCH 15/48] eng_cryptodev: extend TLS offload with
@@ -23,10 +23,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
23 6 files changed, 43 insertions(+), 3 deletions(-) 23 6 files changed, 43 insertions(+), 3 deletions(-)
24 24
25diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 25diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
26index d2cdca0..8f73a18 100644 26index 1754917..ae644b9 100644
27--- a/crypto/engine/eng_cryptodev.c 27--- a/crypto/engine/eng_cryptodev.c
28+++ b/crypto/engine/eng_cryptodev.c 28+++ b/crypto/engine/eng_cryptodev.c
29@@ -132,6 +132,7 @@ static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, 29@@ -133,6 +133,7 @@ static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key,
30 static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, 30 static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p,
31 void (*f) (void)); 31 void (*f) (void));
32 void ENGINE_load_cryptodev(void); 32 void ENGINE_load_cryptodev(void);
@@ -34,7 +34,7 @@ index d2cdca0..8f73a18 100644
34 const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1; 34 const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1;
35 const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1; 35 const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1;
36 36
37@@ -284,6 +285,9 @@ static struct { 37@@ -285,6 +286,9 @@ static struct {
38 CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, 0 38 CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, 0
39 }, 39 },
40 { 40 {
@@ -44,7 +44,7 @@ index d2cdca0..8f73a18 100644
44 CRYPTO_TLS10_AES_CBC_HMAC_SHA1, NID_aes_128_cbc_hmac_sha1, 16, 16, 20 44 CRYPTO_TLS10_AES_CBC_HMAC_SHA1, NID_aes_128_cbc_hmac_sha1, 16, 16, 20
45 }, 45 },
46 { 46 {
47@@ -519,6 +523,9 @@ static int cryptodev_usable_ciphers(const int **nids) 47@@ -520,6 +524,9 @@ static int cryptodev_usable_ciphers(const int **nids)
48 case NID_aes_256_cbc_hmac_sha1: 48 case NID_aes_256_cbc_hmac_sha1:
49 EVP_add_cipher(&cryptodev_aes_256_cbc_hmac_sha1); 49 EVP_add_cipher(&cryptodev_aes_256_cbc_hmac_sha1);
50 break; 50 break;
@@ -54,7 +54,7 @@ index d2cdca0..8f73a18 100644
54 } 54 }
55 } 55 }
56 return count; 56 return count;
57@@ -623,6 +630,7 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 57@@ -624,6 +631,7 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
58 switch (ctx->cipher->nid) { 58 switch (ctx->cipher->nid) {
59 case NID_aes_128_cbc_hmac_sha1: 59 case NID_aes_128_cbc_hmac_sha1:
60 case NID_aes_256_cbc_hmac_sha1: 60 case NID_aes_256_cbc_hmac_sha1:
@@ -62,7 +62,7 @@ index d2cdca0..8f73a18 100644
62 cryp.flags = COP_FLAG_AEAD_TLS_TYPE; 62 cryp.flags = COP_FLAG_AEAD_TLS_TYPE;
63 } 63 }
64 cryp.ses = sess->ses; 64 cryp.ses = sess->ses;
65@@ -813,6 +821,7 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, 65@@ -814,6 +822,7 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
66 switch (ctx->cipher->nid) { 66 switch (ctx->cipher->nid) {
67 case NID_aes_128_cbc_hmac_sha1: 67 case NID_aes_128_cbc_hmac_sha1:
68 case NID_aes_256_cbc_hmac_sha1: 68 case NID_aes_256_cbc_hmac_sha1:
@@ -70,7 +70,7 @@ index d2cdca0..8f73a18 100644
70 maclen = SHA_DIGEST_LENGTH; 70 maclen = SHA_DIGEST_LENGTH;
71 } 71 }
72 72
73@@ -1134,6 +1143,20 @@ const EVP_CIPHER cryptodev_aes_256_cbc = { 73@@ -1135,6 +1144,20 @@ const EVP_CIPHER cryptodev_aes_256_cbc = {
74 NULL 74 NULL
75 }; 75 };
76 76
@@ -91,7 +91,7 @@ index d2cdca0..8f73a18 100644
91 const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1 = { 91 const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1 = {
92 NID_aes_128_cbc_hmac_sha1, 92 NID_aes_128_cbc_hmac_sha1,
93 16, 16, 16, 93 16, 16, 16,
94@@ -1255,6 +1278,9 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, 94@@ -1256,6 +1279,9 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
95 case NID_aes_256_cbc: 95 case NID_aes_256_cbc:
96 *cipher = &cryptodev_aes_256_cbc; 96 *cipher = &cryptodev_aes_256_cbc;
97 break; 97 break;
@@ -180,7 +180,7 @@ index b57aabb..4e1ff18 100644
180 ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH 180 ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH
181 181
182diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c 182diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
183index 302464e..a379273 100644 183index 2ad8f43..fdf6be9 100644
184--- a/ssl/ssl_ciph.c 184--- a/ssl/ssl_ciph.c
185+++ b/ssl/ssl_ciph.c 185+++ b/ssl/ssl_ciph.c
186@@ -668,6 +668,10 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, 186@@ -668,6 +668,10 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
@@ -195,5 +195,5 @@ index 302464e..a379273 100644
195 } else 195 } else
196 return (0); 196 return (0);
197-- 197--
1982.7.0 1982.7.3
199 199
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0016-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0016-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch
index c5866212..d6b72b57 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0016-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0016-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch
@@ -1,4 +1,4 @@
1From 3f34089ab0a3b31ec6b31a6cbf308ca20c6ef597 Mon Sep 17 00:00:00 2001 1From 4a229203e276283cb894b08b2607204a647d7594 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Fri, 22 Jan 2016 11:58:34 +0200 3Date: Fri, 22 Jan 2016 11:58:34 +0200
4Subject: [PATCH 16/48] eng_cryptodev: add support for TLSv1.1 record offload 4Subject: [PATCH 16/48] eng_cryptodev: add support for TLSv1.1 record offload
@@ -23,10 +23,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
23 6 files changed, 151 insertions(+), 9 deletions(-) 23 6 files changed, 151 insertions(+), 9 deletions(-)
24 24
25diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 25diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
26index 8f73a18..e37a661 100644 26index ae644b9..80b20e5 100644
27--- a/crypto/engine/eng_cryptodev.c 27--- a/crypto/engine/eng_cryptodev.c
28+++ b/crypto/engine/eng_cryptodev.c 28+++ b/crypto/engine/eng_cryptodev.c
29@@ -66,6 +66,7 @@ void ENGINE_load_cryptodev(void) 29@@ -67,6 +67,7 @@ void ENGINE_load_cryptodev(void)
30 # include <sys/ioctl.h> 30 # include <sys/ioctl.h>
31 # include <errno.h> 31 # include <errno.h>
32 # include <stdio.h> 32 # include <stdio.h>
@@ -34,7 +34,7 @@ index 8f73a18..e37a661 100644
34 # include <unistd.h> 34 # include <unistd.h>
35 # include <fcntl.h> 35 # include <fcntl.h>
36 # include <stdarg.h> 36 # include <stdarg.h>
37@@ -135,6 +136,9 @@ void ENGINE_load_cryptodev(void); 37@@ -136,6 +137,9 @@ void ENGINE_load_cryptodev(void);
38 const EVP_CIPHER cryptodev_3des_cbc_hmac_sha1; 38 const EVP_CIPHER cryptodev_3des_cbc_hmac_sha1;
39 const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1; 39 const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1;
40 const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1; 40 const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1;
@@ -44,7 +44,7 @@ index 8f73a18..e37a661 100644
44 44
45 inline int spcf_bn2bin(BIGNUM *bn, unsigned char **bin, int *bin_len) 45 inline int spcf_bn2bin(BIGNUM *bn, unsigned char **bin, int *bin_len)
46 { 46 {
47@@ -294,6 +298,18 @@ static struct { 47@@ -295,6 +299,18 @@ static struct {
48 CRYPTO_TLS10_AES_CBC_HMAC_SHA1, NID_aes_256_cbc_hmac_sha1, 16, 32, 20 48 CRYPTO_TLS10_AES_CBC_HMAC_SHA1, NID_aes_256_cbc_hmac_sha1, 16, 32, 20
49 }, 49 },
50 { 50 {
@@ -63,7 +63,7 @@ index 8f73a18..e37a661 100644
63 CRYPTO_AES_GCM, NID_aes_128_gcm, 16, 16, 0 63 CRYPTO_AES_GCM, NID_aes_128_gcm, 16, 16, 0
64 }, 64 },
65 { 65 {
66@@ -526,6 +542,15 @@ static int cryptodev_usable_ciphers(const int **nids) 66@@ -527,6 +543,15 @@ static int cryptodev_usable_ciphers(const int **nids)
67 case NID_des_ede3_cbc_hmac_sha1: 67 case NID_des_ede3_cbc_hmac_sha1:
68 EVP_add_cipher(&cryptodev_3des_cbc_hmac_sha1); 68 EVP_add_cipher(&cryptodev_3des_cbc_hmac_sha1);
69 break; 69 break;
@@ -79,7 +79,7 @@ index 8f73a18..e37a661 100644
79 } 79 }
80 } 80 }
81 return count; 81 return count;
82@@ -631,6 +656,9 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 82@@ -632,6 +657,9 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
83 case NID_aes_128_cbc_hmac_sha1: 83 case NID_aes_128_cbc_hmac_sha1:
84 case NID_aes_256_cbc_hmac_sha1: 84 case NID_aes_256_cbc_hmac_sha1:
85 case NID_des_ede3_cbc_hmac_sha1: 85 case NID_des_ede3_cbc_hmac_sha1:
@@ -89,7 +89,7 @@ index 8f73a18..e37a661 100644
89 cryp.flags = COP_FLAG_AEAD_TLS_TYPE; 89 cryp.flags = COP_FLAG_AEAD_TLS_TYPE;
90 } 90 }
91 cryp.ses = sess->ses; 91 cryp.ses = sess->ses;
92@@ -810,8 +838,9 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, 92@@ -811,8 +839,9 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
93 struct dev_crypto_state *state = ctx->cipher_data; 93 struct dev_crypto_state *state = ctx->cipher_data;
94 unsigned char *p = ptr; 94 unsigned char *p = ptr;
95 unsigned int cryptlen = p[arg - 2] << 8 | p[arg - 1]; 95 unsigned int cryptlen = p[arg - 2] << 8 | p[arg - 1];
@@ -100,7 +100,7 @@ index 8f73a18..e37a661 100644
100 100
101 state->aad = ptr; 101 state->aad = ptr;
102 state->aad_len = arg; 102 state->aad_len = arg;
103@@ -823,6 +852,20 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, 103@@ -824,6 +853,20 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
104 case NID_aes_256_cbc_hmac_sha1: 104 case NID_aes_256_cbc_hmac_sha1:
105 case NID_des_ede3_cbc_hmac_sha1: 105 case NID_des_ede3_cbc_hmac_sha1:
106 maclen = SHA_DIGEST_LENGTH; 106 maclen = SHA_DIGEST_LENGTH;
@@ -121,7 +121,7 @@ index 8f73a18..e37a661 100644
121 } 121 }
122 122
123 /* space required for encryption (not only TLS padding) */ 123 /* space required for encryption (not only TLS padding) */
124@@ -1185,6 +1228,48 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1 = { 124@@ -1186,6 +1229,48 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1 = {
125 NULL 125 NULL
126 }; 126 };
127 127
@@ -170,7 +170,7 @@ index 8f73a18..e37a661 100644
170 const EVP_CIPHER cryptodev_aes_128_gcm = { 170 const EVP_CIPHER cryptodev_aes_128_gcm = {
171 NID_aes_128_gcm, 171 NID_aes_128_gcm,
172 1, 16, 12, 172 1, 16, 12,
173@@ -1298,6 +1383,15 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, 173@@ -1299,6 +1384,15 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
174 case NID_aes_256_cbc_hmac_sha1: 174 case NID_aes_256_cbc_hmac_sha1:
175 *cipher = &cryptodev_aes_256_cbc_hmac_sha1; 175 *cipher = &cryptodev_aes_256_cbc_hmac_sha1;
176 break; 176 break;
@@ -285,7 +285,7 @@ index 4e1ff18..cda81da 100644
285 ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH 285 ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH
286 286
287diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c 287diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
288index a379273..e3d73ac 100644 288index fdf6be9..b4af7dc 100644
289--- a/ssl/ssl_ciph.c 289--- a/ssl/ssl_ciph.c
290+++ b/ssl/ssl_ciph.c 290+++ b/ssl/ssl_ciph.c
291@@ -652,11 +652,13 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, 291@@ -652,11 +652,13 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
@@ -334,5 +334,5 @@ index a379273..e3d73ac 100644
334 return (1); 334 return (1);
335 } else 335 } else
336-- 336--
3372.7.0 3372.7.3
338 338
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0017-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0017-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch
index 5e65ec6e..30348941 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0017-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0017-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch
@@ -1,4 +1,4 @@
1From 4c1531a088076118ce3c06cb0af15998f0796cb3 Mon Sep 17 00:00:00 2001 1From 0103fb8e6fc412462968224ec9315609c54eccc1 Mon Sep 17 00:00:00 2001
2From: Tudor Ambarus <tudor.ambarus@freescale.com> 2From: Tudor Ambarus <tudor.ambarus@freescale.com>
3Date: Tue, 31 Mar 2015 16:32:35 +0300 3Date: Tue, 31 Mar 2015 16:32:35 +0300
4Subject: [PATCH 17/48] eng_cryptodev: add support for TLSv1.2 record offload 4Subject: [PATCH 17/48] eng_cryptodev: add support for TLSv1.2 record offload
@@ -25,10 +25,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
25 6 files changed, 216 insertions(+), 3 deletions(-) 25 6 files changed, 216 insertions(+), 3 deletions(-)
26 26
27diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 27diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
28index e37a661..e6f9f16 100644 28index 80b20e5..455868e 100644
29--- a/crypto/engine/eng_cryptodev.c 29--- a/crypto/engine/eng_cryptodev.c
30+++ b/crypto/engine/eng_cryptodev.c 30+++ b/crypto/engine/eng_cryptodev.c
31@@ -139,6 +139,11 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1; 31@@ -140,6 +140,11 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1;
32 const EVP_CIPHER cryptodev_tls11_3des_cbc_hmac_sha1; 32 const EVP_CIPHER cryptodev_tls11_3des_cbc_hmac_sha1;
33 const EVP_CIPHER cryptodev_tls11_aes_128_cbc_hmac_sha1; 33 const EVP_CIPHER cryptodev_tls11_aes_128_cbc_hmac_sha1;
34 const EVP_CIPHER cryptodev_tls11_aes_256_cbc_hmac_sha1; 34 const EVP_CIPHER cryptodev_tls11_aes_256_cbc_hmac_sha1;
@@ -40,7 +40,7 @@ index e37a661..e6f9f16 100644
40 40
41 inline int spcf_bn2bin(BIGNUM *bn, unsigned char **bin, int *bin_len) 41 inline int spcf_bn2bin(BIGNUM *bn, unsigned char **bin, int *bin_len)
42 { 42 {
43@@ -310,6 +315,26 @@ static struct { 43@@ -311,6 +316,26 @@ static struct {
44 20 44 20
45 }, 45 },
46 { 46 {
@@ -67,7 +67,7 @@ index e37a661..e6f9f16 100644
67 CRYPTO_AES_GCM, NID_aes_128_gcm, 16, 16, 0 67 CRYPTO_AES_GCM, NID_aes_128_gcm, 16, 16, 0
68 }, 68 },
69 { 69 {
70@@ -551,6 +576,21 @@ static int cryptodev_usable_ciphers(const int **nids) 70@@ -552,6 +577,21 @@ static int cryptodev_usable_ciphers(const int **nids)
71 case NID_tls11_aes_256_cbc_hmac_sha1: 71 case NID_tls11_aes_256_cbc_hmac_sha1:
72 EVP_add_cipher(&cryptodev_tls11_aes_256_cbc_hmac_sha1); 72 EVP_add_cipher(&cryptodev_tls11_aes_256_cbc_hmac_sha1);
73 break; 73 break;
@@ -89,7 +89,7 @@ index e37a661..e6f9f16 100644
89 } 89 }
90 } 90 }
91 return count; 91 return count;
92@@ -659,6 +699,11 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 92@@ -660,6 +700,11 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
93 case NID_tls11_des_ede3_cbc_hmac_sha1: 93 case NID_tls11_des_ede3_cbc_hmac_sha1:
94 case NID_tls11_aes_128_cbc_hmac_sha1: 94 case NID_tls11_aes_128_cbc_hmac_sha1:
95 case NID_tls11_aes_256_cbc_hmac_sha1: 95 case NID_tls11_aes_256_cbc_hmac_sha1:
@@ -101,7 +101,7 @@ index e37a661..e6f9f16 100644
101 cryp.flags = COP_FLAG_AEAD_TLS_TYPE; 101 cryp.flags = COP_FLAG_AEAD_TLS_TYPE;
102 } 102 }
103 cryp.ses = sess->ses; 103 cryp.ses = sess->ses;
104@@ -856,9 +901,17 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, 104@@ -857,9 +902,17 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
105 case NID_tls11_des_ede3_cbc_hmac_sha1: 105 case NID_tls11_des_ede3_cbc_hmac_sha1:
106 case NID_tls11_aes_128_cbc_hmac_sha1: 106 case NID_tls11_aes_128_cbc_hmac_sha1:
107 case NID_tls11_aes_256_cbc_hmac_sha1: 107 case NID_tls11_aes_256_cbc_hmac_sha1:
@@ -119,7 +119,7 @@ index e37a661..e6f9f16 100644
119 } 119 }
120 120
121 /* Correct length for AAD Length field */ 121 /* Correct length for AAD Length field */
122@@ -1270,6 +1323,76 @@ const EVP_CIPHER cryptodev_tls11_aes_256_cbc_hmac_sha1 = { 122@@ -1271,6 +1324,76 @@ const EVP_CIPHER cryptodev_tls11_aes_256_cbc_hmac_sha1 = {
123 NULL 123 NULL
124 }; 124 };
125 125
@@ -196,7 +196,7 @@ index e37a661..e6f9f16 100644
196 const EVP_CIPHER cryptodev_aes_128_gcm = { 196 const EVP_CIPHER cryptodev_aes_128_gcm = {
197 NID_aes_128_gcm, 197 NID_aes_128_gcm,
198 1, 16, 12, 198 1, 16, 12,
199@@ -1395,6 +1518,21 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, 199@@ -1396,6 +1519,21 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
200 case NID_aes_128_gcm: 200 case NID_aes_128_gcm:
201 *cipher = &cryptodev_aes_128_gcm; 201 *cipher = &cryptodev_aes_128_gcm;
202 break; 202 break;
@@ -337,7 +337,7 @@ index cda81da..68a8da8 100644
337 ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH 337 ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH
338 338
339diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c 339diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
340index e3d73ac..4698528 100644 340index b4af7dc..359cb5d 100644
341--- a/ssl/ssl_ciph.c 341--- a/ssl/ssl_ciph.c
342+++ b/ssl/ssl_ciph.c 342+++ b/ssl/ssl_ciph.c
343@@ -690,6 +690,31 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, 343@@ -690,6 +690,31 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
@@ -373,5 +373,5 @@ index e3d73ac..4698528 100644
373 } else 373 } else
374 return (0); 374 return (0);
375-- 375--
3762.7.0 3762.7.3
377 377
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch
index c1f0c9db..cf6cce26 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch
@@ -1,4 +1,4 @@
1From 07d8dad75fb1e4c3487ae560ac51e2141aa0e0c1 Mon Sep 17 00:00:00 2001 1From dddb8bc7eea34dfc73c1f5c8863d19894d9a18ac Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Thu, 19 Feb 2015 16:11:53 +0200 3Date: Thu, 19 Feb 2015 16:11:53 +0200
4Subject: [PATCH 18/48] cryptodev: drop redundant function 4Subject: [PATCH 18/48] cryptodev: drop redundant function
@@ -12,10 +12,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
12 1 file changed, 3 insertions(+), 14 deletions(-) 12 1 file changed, 3 insertions(+), 14 deletions(-)
13 13
14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
15index e6f9f16..4cffaf1 100644 15index 455868e..d229f61 100644
16--- a/crypto/engine/eng_cryptodev.c 16--- a/crypto/engine/eng_cryptodev.c
17+++ b/crypto/engine/eng_cryptodev.c 17+++ b/crypto/engine/eng_cryptodev.c
18@@ -93,7 +93,6 @@ struct dev_crypto_state { 18@@ -94,7 +94,6 @@ struct dev_crypto_state {
19 19
20 static u_int32_t cryptodev_asymfeat = 0; 20 static u_int32_t cryptodev_asymfeat = 0;
21 21
@@ -23,7 +23,7 @@ index e6f9f16..4cffaf1 100644
23 static int open_dev_crypto(void); 23 static int open_dev_crypto(void);
24 static int get_dev_crypto(void); 24 static int get_dev_crypto(void);
25 static int get_cryptodev_ciphers(const int **cnids); 25 static int get_cryptodev_ciphers(const int **cnids);
26@@ -440,16 +439,6 @@ static void put_dev_crypto(int fd) 26@@ -441,16 +440,6 @@ static void put_dev_crypto(int fd)
27 # endif 27 # endif
28 } 28 }
29 29
@@ -40,16 +40,16 @@ index e6f9f16..4cffaf1 100644
40 /* 40 /*
41 * Find out what ciphers /dev/crypto will let us have a session for. 41 * Find out what ciphers /dev/crypto will let us have a session for.
42 * XXX note, that some of these openssl doesn't deal with yet! 42 * XXX note, that some of these openssl doesn't deal with yet!
43@@ -1919,7 +1908,7 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen, 43@@ -1923,7 +1912,7 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
44 { 44 {
45 int fd, ret = -1; 45 int fd, ret = -1;
46 46
47- if ((fd = get_asym_dev_crypto()) < 0) 47- if ((fd = get_asym_dev_crypto()) < 0)
48+ if ((fd = get_dev_crypto()) < 0) 48+ if ((fd = get_dev_crypto()) < 0)
49 return (ret); 49 return ret;
50 50
51 if (r) { 51 if (r) {
52@@ -2509,7 +2498,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) 52@@ -2522,7 +2511,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
53 int p_len, q_len; 53 int p_len, q_len;
54 int i; 54 int i;
55 55
@@ -58,7 +58,7 @@ index e6f9f16..4cffaf1 100644
58 goto sw_try; 58 goto sw_try;
59 59
60 if (!rsa->n && ((rsa->n = BN_new()) == NULL)) 60 if (!rsa->n && ((rsa->n = BN_new()) == NULL))
61@@ -4098,7 +4087,7 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) 61@@ -4111,7 +4100,7 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
62 BIGNUM *temp = NULL; 62 BIGNUM *temp = NULL;
63 unsigned char *padded_pub_key = NULL, *p = NULL; 63 unsigned char *padded_pub_key = NULL, *p = NULL;
64 64
@@ -68,5 +68,5 @@ index e6f9f16..4cffaf1 100644
68 68
69 memset(&kop, 0, sizeof kop); 69 memset(&kop, 0, sizeof kop);
70-- 70--
712.7.0 712.7.3
72 72
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0019-cryptodev-do-not-zero-the-buffer-before-use.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0019-cryptodev-do-not-zero-the-buffer-before-use.patch
index 248d88ec..d423dd10 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0019-cryptodev-do-not-zero-the-buffer-before-use.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0019-cryptodev-do-not-zero-the-buffer-before-use.patch
@@ -1,4 +1,4 @@
1From 1f7ef531a010a3a86c9c16f801044b5f01652eb2 Mon Sep 17 00:00:00 2001 1From 413ef57790244fc521d40ade62358abaf0a55d10 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Tue, 17 Feb 2015 13:12:53 +0200 3Date: Tue, 17 Feb 2015 13:12:53 +0200
4Subject: [PATCH 19/48] cryptodev: do not zero the buffer before use 4Subject: [PATCH 19/48] cryptodev: do not zero the buffer before use
@@ -14,10 +14,10 @@ Reviewed-on: http://git.am.freescale.net:8181/34217
14 1 file changed, 4 insertions(+), 10 deletions(-) 14 1 file changed, 4 insertions(+), 10 deletions(-)
15 15
16diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 16diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
17index 4cffaf1..bbc903b 100644 17index d229f61..4d370ad 100644
18--- a/crypto/engine/eng_cryptodev.c 18--- a/crypto/engine/eng_cryptodev.c
19+++ b/crypto/engine/eng_cryptodev.c 19+++ b/crypto/engine/eng_cryptodev.c
20@@ -1801,21 +1801,15 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest, 20@@ -1806,21 +1806,15 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
21 static int bn2crparam(const BIGNUM *a, struct crparam *crp) 21 static int bn2crparam(const BIGNUM *a, struct crparam *crp)
22 { 22 {
23 ssize_t bytes, bits; 23 ssize_t bytes, bits;
@@ -44,5 +44,5 @@ index 4cffaf1..bbc903b 100644
44 BN_bn2bin(a, crp->crp_p); 44 BN_bn2bin(a, crp->crp_p);
45 return (0); 45 return (0);
46-- 46--
472.7.0 472.7.3
48 48
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0020-cryptodev-clean-up-code-layout.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0020-cryptodev-clean-up-code-layout.patch
index c600bdab..d82dc5c3 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0020-cryptodev-clean-up-code-layout.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0020-cryptodev-clean-up-code-layout.patch
@@ -1,4 +1,4 @@
1From 453c617b10fb2c4e748b5799ab4b00c184470c60 Mon Sep 17 00:00:00 2001 1From ac3dfaf10125f08454d51e8fc4b3a77d33fd96d0 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Wed, 18 Feb 2015 10:39:46 +0200 3Date: Wed, 18 Feb 2015 10:39:46 +0200
4Subject: [PATCH 20/48] cryptodev: clean-up code layout 4Subject: [PATCH 20/48] cryptodev: clean-up code layout
@@ -11,10 +11,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
11 1 file changed, 21 insertions(+), 24 deletions(-) 11 1 file changed, 21 insertions(+), 24 deletions(-)
12 12
13diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 13diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
14index bbc903b..14dcddf 100644 14index 4d370ad..487a2c9 100644
15--- a/crypto/engine/eng_cryptodev.c 15--- a/crypto/engine/eng_cryptodev.c
16+++ b/crypto/engine/eng_cryptodev.c 16+++ b/crypto/engine/eng_cryptodev.c
17@@ -1865,32 +1865,29 @@ cryptodev_asym_async(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen, 17@@ -1869,32 +1869,29 @@ cryptodev_asym_async(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
18 fd = *(int *)cookie->eng_handle; 18 fd = *(int *)cookie->eng_handle;
19 19
20 eng_cookie = malloc(sizeof(struct cryptodev_cookie_s)); 20 eng_cookie = malloc(sizeof(struct cryptodev_cookie_s));
@@ -69,5 +69,5 @@ index bbc903b..14dcddf 100644
69 cookie->eng_cookie = eng_cookie; 69 cookie->eng_cookie = eng_cookie;
70 return ioctl(fd, CIOCASYMASYNCRYPT, kop); 70 return ioctl(fd, CIOCASYMASYNCRYPT, kop);
71-- 71--
722.7.0 722.7.3
73 73
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0021-cryptodev-do-not-cache-file-descriptor-in-open.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0021-cryptodev-do-not-cache-file-descriptor-in-open.patch
index 9c6e503b..fa825bb5 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0021-cryptodev-do-not-cache-file-descriptor-in-open.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0021-cryptodev-do-not-cache-file-descriptor-in-open.patch
@@ -1,4 +1,4 @@
1From d9395f7d876f7dfaaae25867c88d1e1f684589de Mon Sep 17 00:00:00 2001 1From b96074f4e44b2147d4d771dd086463c9cb7d42a3 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Thu, 19 Feb 2015 16:43:29 +0200 3Date: Thu, 19 Feb 2015 16:43:29 +0200
4Subject: [PATCH 21/48] cryptodev: do not cache file descriptor in 'open' 4Subject: [PATCH 21/48] cryptodev: do not cache file descriptor in 'open'
@@ -18,10 +18,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
18 1 file changed, 21 insertions(+), 22 deletions(-) 18 1 file changed, 21 insertions(+), 22 deletions(-)
19 19
20diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 20diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
21index 14dcddf..75fca7f 100644 21index 487a2c9..d7188a6 100644
22--- a/crypto/engine/eng_cryptodev.c 22--- a/crypto/engine/eng_cryptodev.c
23+++ b/crypto/engine/eng_cryptodev.c 23+++ b/crypto/engine/eng_cryptodev.c
24@@ -391,45 +391,44 @@ static void ctr64_inc(unsigned char *counter) 24@@ -392,45 +392,44 @@ static void ctr64_inc(unsigned char *counter)
25 } while (n); 25 } while (n);
26 } 26 }
27 27
@@ -89,5 +89,5 @@ index 14dcddf..75fca7f 100644
89 89
90 static void put_dev_crypto(int fd) 90 static void put_dev_crypto(int fd)
91-- 91--
922.7.0 922.7.3
93 93
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0022-cryptodev-put_dev_crypto-should-be-an-int.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0022-cryptodev-put_dev_crypto-should-be-an-int.patch
index 121123d6..eddb1f24 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0022-cryptodev-put_dev_crypto-should-be-an-int.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0022-cryptodev-put_dev_crypto-should-be-an-int.patch
@@ -1,4 +1,4 @@
1From 79d6976e2ad2e5ac31374bc24ee29ae53f55c0e1 Mon Sep 17 00:00:00 2001 1From 43710e60fd8bae1ebc4d1eef6d86cb4e82653ac4 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Thu, 19 Feb 2015 13:09:32 +0200 3Date: Thu, 19 Feb 2015 13:09:32 +0200
4Subject: [PATCH 22/48] cryptodev: put_dev_crypto should be an int 4Subject: [PATCH 22/48] cryptodev: put_dev_crypto should be an int
@@ -11,10 +11,10 @@ Reviewed-on: http://git.am.freescale.net:8181/34220
11 1 file changed, 5 insertions(+), 3 deletions(-) 11 1 file changed, 5 insertions(+), 3 deletions(-)
12 12
13diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 13diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
14index 75fca7f..b162646 100644 14index d7188a6..7b3dbd1 100644
15--- a/crypto/engine/eng_cryptodev.c 15--- a/crypto/engine/eng_cryptodev.c
16+++ b/crypto/engine/eng_cryptodev.c 16+++ b/crypto/engine/eng_cryptodev.c
17@@ -431,10 +431,12 @@ static int get_dev_crypto(void) 17@@ -432,10 +432,12 @@ static int get_dev_crypto(void)
18 # endif 18 # endif
19 } 19 }
20 20
@@ -31,5 +31,5 @@ index 75fca7f..b162646 100644
31 } 31 }
32 32
33-- 33--
342.7.0 342.7.3
35 35
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0023-cryptodev-simplify-cryptodev-pkc-support-code.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0023-cryptodev-simplify-cryptodev-pkc-support-code.patch
index 1043fbd4..4f589af7 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0023-cryptodev-simplify-cryptodev-pkc-support-code.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0023-cryptodev-simplify-cryptodev-pkc-support-code.patch
@@ -1,4 +1,4 @@
1From f99682e0ccaeadb7446d211dfad6dbf8fcd5675f Mon Sep 17 00:00:00 2001 1From b706132a33555162e6dbf26d9fde4bcb1136d553 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@freescale.com> 2From: Cristian Stoica <cristian.stoica@freescale.com>
3Date: Thu, 19 Feb 2015 13:39:52 +0200 3Date: Thu, 19 Feb 2015 13:39:52 +0200
4Subject: [PATCH 23/48] cryptodev: simplify cryptodev pkc support code 4Subject: [PATCH 23/48] cryptodev: simplify cryptodev pkc support code
@@ -29,10 +29,10 @@ index 2b4ec59..ddb9b69 100644
29 29
30 #ifdef __cplusplus 30 #ifdef __cplusplus
31diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 31diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
32index b162646..1910c89 100644 32index 7b3dbd1..34c8d18 100644
33--- a/crypto/engine/eng_cryptodev.c 33--- a/crypto/engine/eng_cryptodev.c
34+++ b/crypto/engine/eng_cryptodev.c 34+++ b/crypto/engine/eng_cryptodev.c
35@@ -433,10 +433,10 @@ static int get_dev_crypto(void) 35@@ -434,10 +434,10 @@ static int get_dev_crypto(void)
36 36
37 static int put_dev_crypto(int fd) 37 static int put_dev_crypto(int fd)
38 { 38 {
@@ -47,7 +47,7 @@ index b162646..1910c89 100644
47 # endif 47 # endif
48 } 48 }
49 49
50@@ -1863,7 +1863,7 @@ cryptodev_asym_async(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen, 50@@ -1867,7 +1867,7 @@ cryptodev_asym_async(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
51 struct pkc_cookie_s *cookie = kop->cookie; 51 struct pkc_cookie_s *cookie = kop->cookie;
52 struct cryptodev_cookie_s *eng_cookie; 52 struct cryptodev_cookie_s *eng_cookie;
53 53
@@ -56,8 +56,8 @@ index b162646..1910c89 100644
56 56
57 eng_cookie = malloc(sizeof(struct cryptodev_cookie_s)); 57 eng_cookie = malloc(sizeof(struct cryptodev_cookie_s));
58 if (!eng_cookie) 58 if (!eng_cookie)
59@@ -1926,38 +1926,11 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen, 59@@ -1939,38 +1939,11 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
60 return (ret); 60 return ret;
61 } 61 }
62 62
63-/* Close an opened instance of cryptodev engine */ 63-/* Close an opened instance of cryptodev engine */
@@ -96,7 +96,7 @@ index b162646..1910c89 100644
96 struct pkc_cookie_list_s cookie_list; 96 struct pkc_cookie_list_s cookie_list;
97 struct pkc_cookie_s *cookie; 97 struct pkc_cookie_s *cookie;
98 int i; 98 int i;
99@@ -4706,8 +4679,8 @@ void ENGINE_load_cryptodev(void) 99@@ -4719,8 +4692,8 @@ void ENGINE_load_cryptodev(void)
100 } 100 }
101 101
102 ENGINE_set_check_pkc_availability(engine, cryptodev_check_availability); 102 ENGINE_set_check_pkc_availability(engine, cryptodev_check_availability);
@@ -256,5 +256,5 @@ index 4527aa1..f83ee73 100644
256 int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth); 256 int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
257 int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth); 257 int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
258-- 258--
2592.7.0 2592.7.3
260 260
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0024-cryptodev-clarify-code-remove-assignments-from-condi.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0024-cryptodev-clarify-code-remove-assignments-from-condi.patch
index 27ccd95a..0daa2a4d 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0024-cryptodev-clarify-code-remove-assignments-from-condi.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0024-cryptodev-clarify-code-remove-assignments-from-condi.patch
@@ -1,4 +1,4 @@
1From cb6842dac159b40acdc755526b0ba0afb61d9d64 Mon Sep 17 00:00:00 2001 1From e1de7751808d5196a9a719ad49a1281d2a3c453d Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 14 Dec 2015 14:02:00 +0200 3Date: Mon, 14 Dec 2015 14:02:00 +0200
4Subject: [PATCH 24/48] cryptodev: clarify code, remove assignments from 4Subject: [PATCH 24/48] cryptodev: clarify code, remove assignments from
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
10 1 file changed, 4 insertions(+), 2 deletions(-) 10 1 file changed, 4 insertions(+), 2 deletions(-)
11 11
12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
13index 1910c89..fcfd232 100644 13index 34c8d18..31687d8 100644
14--- a/crypto/engine/eng_cryptodev.c 14--- a/crypto/engine/eng_cryptodev.c
15+++ b/crypto/engine/eng_cryptodev.c 15+++ b/crypto/engine/eng_cryptodev.c
16@@ -1559,14 +1559,16 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) 16@@ -1560,14 +1560,16 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
17 struct session_op *sess = &state->d_sess; 17 struct session_op *sess = &state->d_sess;
18 int digest; 18 int digest;
19 19
@@ -33,5 +33,5 @@ index 1910c89..fcfd232 100644
33 return (0); 33 return (0);
34 } 34 }
35-- 35--
362.7.0 362.7.3
37 37
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0025-cryptodev-clean-up-context-state-before-anything-els.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0025-cryptodev-clean-up-context-state-before-anything-els.patch
index ad5c3035..3e02c72b 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0025-cryptodev-clean-up-context-state-before-anything-els.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0025-cryptodev-clean-up-context-state-before-anything-els.patch
@@ -1,4 +1,4 @@
1From 087ae4ecbaf9cd49a2fcae9cb09c491beabc4c88 Mon Sep 17 00:00:00 2001 1From 9ffa46ff1348817f4c8d24e9d42fa0f739a652d7 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Tue, 15 Dec 2015 12:10:37 +0200 3Date: Tue, 15 Dec 2015 12:10:37 +0200
4Subject: [PATCH 25/48] cryptodev: clean-up context state before anything else 4Subject: [PATCH 25/48] cryptodev: clean-up context state before anything else
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
9 1 file changed, 2 insertions(+), 2 deletions(-) 9 1 file changed, 2 insertions(+), 2 deletions(-)
10 10
11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
12index fcfd232..16e6fd9 100644 12index 31687d8..e6616e9 100644
13--- a/crypto/engine/eng_cryptodev.c 13--- a/crypto/engine/eng_cryptodev.c
14+++ b/crypto/engine/eng_cryptodev.c 14+++ b/crypto/engine/eng_cryptodev.c
15@@ -1559,14 +1559,14 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) 15@@ -1560,14 +1560,14 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
16 struct session_op *sess = &state->d_sess; 16 struct session_op *sess = &state->d_sess;
17 int digest; 17 int digest;
18 18
@@ -30,5 +30,5 @@ index fcfd232..16e6fd9 100644
30 if (state->d_fd < 0) { 30 if (state->d_fd < 0) {
31 printf("cryptodev_digest_init: Can't get Dev \n"); 31 printf("cryptodev_digest_init: Can't get Dev \n");
32-- 32--
332.7.0 332.7.3
34 34
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0026-cryptodev-remove-code-duplication-in-digest-operatio.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0026-cryptodev-remove-code-duplication-in-digest-operatio.patch
index 936aafce..4e1ce65d 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0026-cryptodev-remove-code-duplication-in-digest-operatio.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0026-cryptodev-remove-code-duplication-in-digest-operatio.patch
@@ -1,4 +1,4 @@
1From 02dd4d275f7544a4027ca3452b60ac5bdd9376fb Mon Sep 17 00:00:00 2001 1From 7f6a709ed46d79d765ee0bb2fc16b84d0bb4c8a6 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 14 Dec 2015 17:49:08 +0200 3Date: Mon, 14 Dec 2015 17:49:08 +0200
4Subject: [PATCH 26/48] cryptodev: remove code duplication in digest operations 4Subject: [PATCH 26/48] cryptodev: remove code duplication in digest operations
@@ -17,10 +17,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
17 1 file changed, 28 insertions(+), 48 deletions(-) 17 1 file changed, 28 insertions(+), 48 deletions(-)
18 18
19diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 19diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
20index 16e6fd9..048e050 100644 20index e6616e9..a8652bf 100644
21--- a/crypto/engine/eng_cryptodev.c 21--- a/crypto/engine/eng_cryptodev.c
22+++ b/crypto/engine/eng_cryptodev.c 22+++ b/crypto/engine/eng_cryptodev.c
23@@ -1590,24 +1590,25 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) 23@@ -1591,24 +1591,25 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
24 static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, 24 static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
25 size_t count) 25 size_t count)
26 { 26 {
@@ -57,7 +57,7 @@ index 16e6fd9..048e050 100644
57 if (!state->mac_data) { 57 if (!state->mac_data) {
58 printf("cryptodev_digest_update: realloc failed\n"); 58 printf("cryptodev_digest_update: realloc failed\n");
59 return (0); 59 return (0);
60@@ -1615,23 +1616,9 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, 60@@ -1616,23 +1617,9 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
61 61
62 memcpy(state->mac_data + state->mac_len, data, count); 62 memcpy(state->mac_data + state->mac_len, data, count);
63 state->mac_len += count; 63 state->mac_len += count;
@@ -82,7 +82,7 @@ index 16e6fd9..048e050 100644
82 } 82 }
83 83
84 static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) 84 static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
85@@ -1640,33 +1627,25 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) 85@@ -1641,33 +1628,25 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
86 struct dev_crypto_state *state = ctx->md_data; 86 struct dev_crypto_state *state = ctx->md_data;
87 struct session_op *sess = &state->d_sess; 87 struct session_op *sess = &state->d_sess;
88 88
@@ -127,7 +127,7 @@ index 16e6fd9..048e050 100644
127 } 127 }
128 128
129 static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx) 129 static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
130@@ -1683,11 +1662,11 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx) 130@@ -1684,11 +1663,11 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
131 return (0); 131 return (0);
132 } 132 }
133 133
@@ -142,7 +142,7 @@ index 16e6fd9..048e050 100644
142 142
143 if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) { 143 if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) {
144 printf("cryptodev_digest_cleanup: failed to close session\n"); 144 printf("cryptodev_digest_cleanup: failed to close session\n");
145@@ -1695,6 +1674,7 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx) 145@@ -1696,6 +1675,7 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
146 } else { 146 } else {
147 ret = 1; 147 ret = 1;
148 } 148 }
@@ -151,5 +151,5 @@ index 16e6fd9..048e050 100644
151 state->d_fd = -1; 151 state->d_fd = -1;
152 152
153-- 153--
1542.7.0 1542.7.3
155 155
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch
index 46b3ced9..08108897 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch
@@ -1,4 +1,4 @@
1From 2187b18ffe4851efcb6465ca02ac036d2fe031b8 Mon Sep 17 00:00:00 2001 1From 0307a70fc4399a0ee758172e385d4daaae669ce6 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Tue, 15 Dec 2015 12:23:13 +0200 3Date: Tue, 15 Dec 2015 12:23:13 +0200
4Subject: [PATCH 27/48] cryptodev: put all digest ioctls into a single function 4Subject: [PATCH 27/48] cryptodev: put all digest ioctls into a single function
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
9 1 file changed, 19 insertions(+), 25 deletions(-) 9 1 file changed, 19 insertions(+), 25 deletions(-)
10 10
11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
12index 048e050..76faa35 100644 12index a8652bf..8b8710a 100644
13--- a/crypto/engine/eng_cryptodev.c 13--- a/crypto/engine/eng_cryptodev.c
14+++ b/crypto/engine/eng_cryptodev.c 14+++ b/crypto/engine/eng_cryptodev.c
15@@ -1577,13 +1577,6 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) 15@@ -1578,13 +1578,6 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
16 sess->mackeylen = digest_key_length(ctx->digest->type); 16 sess->mackeylen = digest_key_length(ctx->digest->type);
17 sess->mac = digest; 17 sess->mac = digest;
18 18
@@ -26,7 +26,7 @@ index 048e050..76faa35 100644
26 return (1); 26 return (1);
27 } 27 }
28 28
29@@ -1623,6 +1616,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, 29@@ -1624,6 +1617,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
30 30
31 static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) 31 static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
32 { 32 {
@@ -34,7 +34,7 @@ index 048e050..76faa35 100644
34 struct crypt_op cryp; 34 struct crypt_op cryp;
35 struct dev_crypto_state *state = ctx->md_data; 35 struct dev_crypto_state *state = ctx->md_data;
36 struct session_op *sess = &state->d_sess; 36 struct session_op *sess = &state->d_sess;
37@@ -1632,6 +1626,11 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) 37@@ -1633,6 +1627,11 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
38 return (0); 38 return (0);
39 } 39 }
40 40
@@ -46,7 +46,7 @@ index 048e050..76faa35 100644
46 memset(&cryp, 0, sizeof(cryp)); 46 memset(&cryp, 0, sizeof(cryp));
47 47
48 cryp.ses = sess->ses; 48 cryp.ses = sess->ses;
49@@ -1642,43 +1641,38 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) 49@@ -1643,43 +1642,38 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
50 50
51 if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) { 51 if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
52 printf("cryptodev_digest_final: digest failed\n"); 52 printf("cryptodev_digest_final: digest failed\n");
@@ -104,5 +104,5 @@ index 048e050..76faa35 100644
104 104
105 static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) 105 static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
106-- 106--
1072.7.0 1072.7.3
108 108
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0028-cryptodev-fix-debug-print-messages.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0028-cryptodev-fix-debug-print-messages.patch
index 03d1b96a..91bd4a45 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0028-cryptodev-fix-debug-print-messages.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0028-cryptodev-fix-debug-print-messages.patch
@@ -1,4 +1,4 @@
1From 3dd41691dc8162ec26d188269934689ad834894c Mon Sep 17 00:00:00 2001 1From 07f16d70cf7993c43e2c24a1e121c197db9ce1bc Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Tue, 15 Dec 2015 12:51:36 +0200 3Date: Tue, 15 Dec 2015 12:51:36 +0200
4Subject: [PATCH 28/48] cryptodev: fix debug print messages 4Subject: [PATCH 28/48] cryptodev: fix debug print messages
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
9 1 file changed, 9 insertions(+), 9 deletions(-) 9 1 file changed, 9 insertions(+), 9 deletions(-)
10 10
11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
12index 76faa35..1585009 100644 12index 8b8710a..b74f21c 100644
13--- a/crypto/engine/eng_cryptodev.c 13--- a/crypto/engine/eng_cryptodev.c
14+++ b/crypto/engine/eng_cryptodev.c 14+++ b/crypto/engine/eng_cryptodev.c
15@@ -1563,13 +1563,13 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) 15@@ -1564,13 +1564,13 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
16 16
17 digest = digest_nid_to_cryptodev(ctx->digest->type); 17 digest = digest_nid_to_cryptodev(ctx->digest->type);
18 if (digest == NID_undef) { 18 if (digest == NID_undef) {
@@ -28,7 +28,7 @@ index 76faa35..1585009 100644
28 return (0); 28 return (0);
29 } 29 }
30 30
31@@ -1586,7 +1586,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, 31@@ -1587,7 +1587,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
32 struct dev_crypto_state *state = ctx->md_data; 32 struct dev_crypto_state *state = ctx->md_data;
33 33
34 if (!data || !count) { 34 if (!data || !count) {
@@ -37,7 +37,7 @@ index 76faa35..1585009 100644
37 return 0; 37 return 0;
38 } 38 }
39 39
40@@ -1603,7 +1603,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, 40@@ -1604,7 +1604,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
41 state->mac_data = 41 state->mac_data =
42 OPENSSL_realloc(state->mac_data, state->mac_len + count); 42 OPENSSL_realloc(state->mac_data, state->mac_len + count);
43 if (!state->mac_data) { 43 if (!state->mac_data) {
@@ -46,7 +46,7 @@ index 76faa35..1585009 100644
46 return (0); 46 return (0);
47 } 47 }
48 48
49@@ -1622,12 +1622,12 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) 49@@ -1623,12 +1623,12 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
50 struct session_op *sess = &state->d_sess; 50 struct session_op *sess = &state->d_sess;
51 51
52 if (!md || state->d_fd < 0) { 52 if (!md || state->d_fd < 0) {
@@ -61,7 +61,7 @@ index 76faa35..1585009 100644
61 return (0); 61 return (0);
62 } 62 }
63 63
64@@ -1640,12 +1640,12 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) 64@@ -1641,12 +1641,12 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
65 cryp.mac = md; 65 cryp.mac = md;
66 66
67 if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) { 67 if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
@@ -76,7 +76,7 @@ index 76faa35..1585009 100644
76 } 76 }
77 77
78 return ret; 78 return ret;
79@@ -1700,7 +1700,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) 79@@ -1701,7 +1701,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
80 if (ioctl(dstate->d_fd, CIOCGSESSION, sess) < 0) { 80 if (ioctl(dstate->d_fd, CIOCGSESSION, sess) < 0) {
81 put_dev_crypto(dstate->d_fd); 81 put_dev_crypto(dstate->d_fd);
82 dstate->d_fd = -1; 82 dstate->d_fd = -1;
@@ -86,5 +86,5 @@ index 76faa35..1585009 100644
86 } 86 }
87 87
88-- 88--
892.7.0 892.7.3
90 90
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0029-cryptodev-use-CIOCHASH-ioctl-for-digest-operations.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0029-cryptodev-use-CIOCHASH-ioctl-for-digest-operations.patch
index 3dc2b922..abf80844 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0029-cryptodev-use-CIOCHASH-ioctl-for-digest-operations.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0029-cryptodev-use-CIOCHASH-ioctl-for-digest-operations.patch
@@ -1,4 +1,4 @@
1From 3fe44ab50a87106af3349148e81ec8a1d524de82 Mon Sep 17 00:00:00 2001 1From 64d5378080c14a9cf9fd673457af0fa80f3a94ee Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Tue, 15 Dec 2015 15:43:28 +0200 3Date: Tue, 15 Dec 2015 15:43:28 +0200
4Subject: [PATCH 29/48] cryptodev: use CIOCHASH ioctl for digest operations 4Subject: [PATCH 29/48] cryptodev: use CIOCHASH ioctl for digest operations
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
9 1 file changed, 11 insertions(+), 23 deletions(-) 9 1 file changed, 11 insertions(+), 23 deletions(-)
10 10
11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
12index 1585009..dc27b55 100644 12index b74f21c..4f375e0 100644
13--- a/crypto/engine/eng_cryptodev.c 13--- a/crypto/engine/eng_cryptodev.c
14+++ b/crypto/engine/eng_cryptodev.c 14+++ b/crypto/engine/eng_cryptodev.c
15@@ -84,6 +84,7 @@ struct dev_crypto_state { 15@@ -85,6 +85,7 @@ struct dev_crypto_state {
16 unsigned char *iv; 16 unsigned char *iv;
17 int ivlen; 17 int ivlen;
18 # ifdef USE_CRYPTODEV_DIGESTS 18 # ifdef USE_CRYPTODEV_DIGESTS
@@ -20,7 +20,7 @@ index 1585009..dc27b55 100644
20 char dummy_mac_key[HASH_MAX_LEN]; 20 char dummy_mac_key[HASH_MAX_LEN];
21 unsigned char digest_res[HASH_MAX_LEN]; 21 unsigned char digest_res[HASH_MAX_LEN];
22 char *mac_data; 22 char *mac_data;
23@@ -1556,7 +1557,7 @@ static int digest_key_length(int nid) 23@@ -1557,7 +1558,7 @@ static int digest_key_length(int nid)
24 static int cryptodev_digest_init(EVP_MD_CTX *ctx) 24 static int cryptodev_digest_init(EVP_MD_CTX *ctx)
25 { 25 {
26 struct dev_crypto_state *state = ctx->md_data; 26 struct dev_crypto_state *state = ctx->md_data;
@@ -29,7 +29,7 @@ index 1585009..dc27b55 100644
29 int digest; 29 int digest;
30 30
31 memset(state, 0, sizeof(struct dev_crypto_state)); 31 memset(state, 0, sizeof(struct dev_crypto_state));
32@@ -1573,9 +1574,9 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) 32@@ -1574,9 +1575,9 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
33 return (0); 33 return (0);
34 } 34 }
35 35
@@ -42,7 +42,7 @@ index 1585009..dc27b55 100644
42 42
43 return (1); 43 return (1);
44 } 44 }
45@@ -1617,37 +1618,24 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, 45@@ -1618,37 +1619,24 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
46 static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) 46 static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
47 { 47 {
48 int ret = 1; 48 int ret = 1;
@@ -87,5 +87,5 @@ index 1585009..dc27b55 100644
87 } 87 }
88 88
89-- 89--
902.7.0 902.7.3
91 91
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0030-cryptodev-reduce-duplicated-efforts-for-searching-in.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0030-cryptodev-reduce-duplicated-efforts-for-searching-in.patch
index 995a593f..28de5673 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0030-cryptodev-reduce-duplicated-efforts-for-searching-in.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0030-cryptodev-reduce-duplicated-efforts-for-searching-in.patch
@@ -1,4 +1,4 @@
1From 12fad710349bb72b7f95ee30b40c2e6dfbb5d373 Mon Sep 17 00:00:00 2001 1From 328b2890d5a9baf9f936bd9facaf411c01931f08 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Wed, 13 Jan 2016 15:18:20 +0200 3Date: Wed, 13 Jan 2016 15:18:20 +0200
4Subject: [PATCH 30/48] cryptodev: reduce duplicated efforts for searching 4Subject: [PATCH 30/48] cryptodev: reduce duplicated efforts for searching
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
10 1 file changed, 18 insertions(+), 26 deletions(-) 10 1 file changed, 18 insertions(+), 26 deletions(-)
11 11
12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
13index dc27b55..30713e5 100644 13index 4f375e0..163a37d 100644
14--- a/crypto/engine/eng_cryptodev.c 14--- a/crypto/engine/eng_cryptodev.c
15+++ b/crypto/engine/eng_cryptodev.c 15+++ b/crypto/engine/eng_cryptodev.c
16@@ -1533,37 +1533,31 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher, 16@@ -1534,37 +1534,31 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
17 17
18 # ifdef USE_CRYPTODEV_DIGESTS 18 # ifdef USE_CRYPTODEV_DIGESTS
19 19
@@ -64,7 +64,7 @@ index dc27b55..30713e5 100644
64 printf("%s: Can't get digest\n", __func__); 64 printf("%s: Can't get digest\n", __func__);
65 return (0); 65 return (0);
66 } 66 }
67@@ -1574,11 +1568,9 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) 67@@ -1575,11 +1569,9 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
68 return (0); 68 return (0);
69 } 69 }
70 70
@@ -77,7 +77,7 @@ index dc27b55..30713e5 100644
77 } 77 }
78 78
79 static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, 79 static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
80@@ -1668,7 +1660,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) 80@@ -1669,7 +1661,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
81 struct dev_crypto_state *fstate = from->md_data; 81 struct dev_crypto_state *fstate = from->md_data;
82 struct dev_crypto_state *dstate = to->md_data; 82 struct dev_crypto_state *dstate = to->md_data;
83 struct session_op *sess; 83 struct session_op *sess;
@@ -86,7 +86,7 @@ index dc27b55..30713e5 100644
86 86
87 if (dstate == NULL || fstate == NULL) 87 if (dstate == NULL || fstate == NULL)
88 return 1; 88 return 1;
89@@ -1677,11 +1669,11 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) 89@@ -1678,11 +1670,11 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
90 90
91 sess = &dstate->d_sess; 91 sess = &dstate->d_sess;
92 92
@@ -102,5 +102,5 @@ index dc27b55..30713e5 100644
102 dstate->d_fd = get_dev_crypto(); 102 dstate->d_fd = get_dev_crypto();
103 103
104-- 104--
1052.7.0 1052.7.3
106 106
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0031-cryptodev-remove-not-used-local-variables.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0031-cryptodev-remove-not-used-local-variables.patch
index fc23e0c1..d7af9cbd 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0031-cryptodev-remove-not-used-local-variables.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0031-cryptodev-remove-not-used-local-variables.patch
@@ -1,4 +1,4 @@
1From 8cd09ffdfd7d9c25605401f1c0947b1b4acc6e57 Mon Sep 17 00:00:00 2001 1From 9faaca759390bba5aeeb049d31f74806e78137e1 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 16:00:22 +0200 3Date: Mon, 8 Feb 2016 16:00:22 +0200
4Subject: [PATCH 31/48] cryptodev: remove not used local variables 4Subject: [PATCH 31/48] cryptodev: remove not used local variables
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
9 1 file changed, 1 insertion(+), 5 deletions(-) 9 1 file changed, 1 insertion(+), 5 deletions(-)
10 10
11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
12index 30713e5..2734500 100644 12index 163a37d..b13bf8c 100644
13--- a/crypto/engine/eng_cryptodev.c 13--- a/crypto/engine/eng_cryptodev.c
14+++ b/crypto/engine/eng_cryptodev.c 14+++ b/crypto/engine/eng_cryptodev.c
15@@ -1634,7 +1634,6 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) 15@@ -1635,7 +1635,6 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
16 static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx) 16 static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
17 { 17 {
18 struct dev_crypto_state *state = ctx->md_data; 18 struct dev_crypto_state *state = ctx->md_data;
@@ -20,7 +20,7 @@ index 30713e5..2734500 100644
20 20
21 if (state == NULL) { 21 if (state == NULL) {
22 return 0; 22 return 0;
23@@ -3939,7 +3938,6 @@ static int cryptodev_dh_keygen(DH *dh) 23@@ -3952,7 +3951,6 @@ static int cryptodev_dh_keygen(DH *dh)
24 int ret = 1, q_len = 0; 24 int ret = 1, q_len = 0;
25 unsigned char *q = NULL, *g = NULL, *s = NULL, *w = NULL; 25 unsigned char *q = NULL, *g = NULL, *s = NULL, *w = NULL;
26 BIGNUM *pub_key = NULL, *priv_key = NULL; 26 BIGNUM *pub_key = NULL, *priv_key = NULL;
@@ -28,7 +28,7 @@ index 30713e5..2734500 100644
28 28
29 if (dh->priv_key) 29 if (dh->priv_key)
30 priv_key = dh->priv_key; 30 priv_key = dh->priv_key;
31@@ -4061,11 +4059,9 @@ cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key, 31@@ -4074,11 +4072,9 @@ cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key,
32 { 32 {
33 struct crypt_kop *kop = malloc(sizeof(struct crypt_kop)); 33 struct crypt_kop *kop = malloc(sizeof(struct crypt_kop));
34 int ret = 1; 34 int ret = 1;
@@ -42,5 +42,5 @@ index 30713e5..2734500 100644
42 kop->crk_op = CRK_DH_COMPUTE_KEY; 42 kop->crk_op = CRK_DH_COMPUTE_KEY;
43 /* inputs: dh->priv_key pub_key dh->p key */ 43 /* inputs: dh->priv_key pub_key dh->p key */
44-- 44--
452.7.0 452.7.3
46 46
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0032-cryptodev-hide-not-used-variable-behind-ifndef.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0032-cryptodev-hide-not-used-variable-behind-ifndef.patch
index 9ff4d361..a53705f9 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0032-cryptodev-hide-not-used-variable-behind-ifndef.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0032-cryptodev-hide-not-used-variable-behind-ifndef.patch
@@ -1,4 +1,4 @@
1From 335c80f847eacc573e10ba925b6a645963b16197 Mon Sep 17 00:00:00 2001 1From a6dc52cbcda9b4dcb0fda3b780e7c89219388982 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 17:22:49 +0200 3Date: Mon, 8 Feb 2016 17:22:49 +0200
4Subject: [PATCH 32/48] cryptodev: hide not used variable behind #ifndef 4Subject: [PATCH 32/48] cryptodev: hide not used variable behind #ifndef
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
12index 2734500..5a68c76 100644 12index b13bf8c..cdd99b8 100644
13--- a/crypto/engine/eng_cryptodev.c 13--- a/crypto/engine/eng_cryptodev.c
14+++ b/crypto/engine/eng_cryptodev.c 14+++ b/crypto/engine/eng_cryptodev.c
15@@ -412,7 +412,9 @@ static int open_dev_crypto(void) 15@@ -413,7 +413,9 @@ static int open_dev_crypto(void)
16 static int get_dev_crypto(void) 16 static int get_dev_crypto(void)
17 { 17 {
18 static int fd = -1; 18 static int fd = -1;
@@ -23,5 +23,5 @@ index 2734500..5a68c76 100644
23 if (fd == -1) 23 if (fd == -1)
24 fd = open_dev_crypto(); 24 fd = open_dev_crypto();
25-- 25--
262.7.0 262.7.3
27 27
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0033-cryptodev-fix-function-declaration-typo.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0033-cryptodev-fix-function-declaration-typo.patch
index 82ccebad..f0863bdc 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0033-cryptodev-fix-function-declaration-typo.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0033-cryptodev-fix-function-declaration-typo.patch
@@ -1,4 +1,4 @@
1From 03bdddf1495707119e4fa0eda385ecdccf66cbd8 Mon Sep 17 00:00:00 2001 1From 6d335627ec5bdf89c89ced9d2fa7610e6dc50e31 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 16:08:25 +0200 3Date: Mon, 8 Feb 2016 16:08:25 +0200
4Subject: [PATCH 33/48] cryptodev: fix function declaration typo 4Subject: [PATCH 33/48] cryptodev: fix function declaration typo
@@ -22,5 +22,5 @@ index f83ee73..c8efbe1 100644
22 void ENGINE_set_check_pkc_availability(ENGINE *e, 22 void ENGINE_set_check_pkc_availability(ENGINE *e,
23 int (*check_pkc_availability)(int fd)); 23 int (*check_pkc_availability)(int fd));
24-- 24--
252.7.0 252.7.3
26 26
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0034-cryptodev-fix-incorrect-function-signature.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0034-cryptodev-fix-incorrect-function-signature.patch
index 84268c58..50aa45c8 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0034-cryptodev-fix-incorrect-function-signature.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0034-cryptodev-fix-incorrect-function-signature.patch
@@ -1,4 +1,4 @@
1From 7012cf33a00618749319b1903f48ee3a35f5887b Mon Sep 17 00:00:00 2001 1From fcb63347ddb004825e05250fd082fe84ff3689df Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 16:12:54 +0200 3Date: Mon, 8 Feb 2016 16:12:54 +0200
4Subject: [PATCH 34/48] cryptodev: fix incorrect function signature 4Subject: [PATCH 34/48] cryptodev: fix incorrect function signature
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
9 1 file changed, 1 insertion(+), 1 deletion(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
12index 5a68c76..cec6938 100644 12index cdd99b8..1c71bc7 100644
13--- a/crypto/engine/eng_cryptodev.c 13--- a/crypto/engine/eng_cryptodev.c
14+++ b/crypto/engine/eng_cryptodev.c 14+++ b/crypto/engine/eng_cryptodev.c
15@@ -3148,7 +3148,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst, 15@@ -3161,7 +3161,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
16 } 16 }
17 17
18 static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len, 18 static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
@@ -22,5 +22,5 @@ index 5a68c76..cec6938 100644
22 BIGNUM *m = NULL, *p = NULL, *a = NULL, *b = NULL; 22 BIGNUM *m = NULL, *p = NULL, *a = NULL, *b = NULL;
23 BIGNUM *x = NULL, *y = NULL, *w_x = NULL, *w_y = NULL; 23 BIGNUM *x = NULL, *y = NULL, *w_x = NULL, *w_y = NULL;
24-- 24--
252.7.0 252.7.3
26 26
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0035-cryptodev-fix-warnings-on-excess-elements-in-struct-.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0035-cryptodev-fix-warnings-on-excess-elements-in-struct-.patch
index 0e90d82b..e028f663 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0035-cryptodev-fix-warnings-on-excess-elements-in-struct-.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0035-cryptodev-fix-warnings-on-excess-elements-in-struct-.patch
@@ -1,4 +1,4 @@
1From 82612e3c4161ed6e10379841b953a0f56e557be4 Mon Sep 17 00:00:00 2001 1From 6ed8710043b5dc947afab8fffa80ea97f4c84ad6 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 16:21:46 +0200 3Date: Mon, 8 Feb 2016 16:21:46 +0200
4Subject: [PATCH 35/48] cryptodev: fix warnings on excess elements in struct 4Subject: [PATCH 35/48] cryptodev: fix warnings on excess elements in struct
@@ -61,10 +61,10 @@ index 8584731..ab52add 100644
61 61
62 struct dsa_st { 62 struct dsa_st {
63diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 63diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
64index cec6938..407ea62 100644 64index 1c71bc7..20e1ec3 100644
65--- a/crypto/engine/eng_cryptodev.c 65--- a/crypto/engine/eng_cryptodev.c
66+++ b/crypto/engine/eng_cryptodev.c 66+++ b/crypto/engine/eng_cryptodev.c
67@@ -2892,11 +2892,13 @@ static DSA_METHOD cryptodev_dsa = { 67@@ -2905,11 +2905,13 @@ static DSA_METHOD cryptodev_dsa = {
68 NULL, 68 NULL,
69 NULL, 69 NULL,
70 NULL, 70 NULL,
@@ -80,7 +80,7 @@ index cec6938..407ea62 100644
80 }; 80 };
81 81
82 static ECDSA_METHOD cryptodev_ecdsa = { 82 static ECDSA_METHOD cryptodev_ecdsa = {
83@@ -2906,7 +2908,6 @@ static ECDSA_METHOD cryptodev_ecdsa = { 83@@ -2919,7 +2921,6 @@ static ECDSA_METHOD cryptodev_ecdsa = {
84 NULL, 84 NULL,
85 NULL, 85 NULL,
86 NULL, 86 NULL,
@@ -88,7 +88,7 @@ index cec6938..407ea62 100644
88 0, /* flags */ 88 0, /* flags */
89 NULL /* app_data */ 89 NULL /* app_data */
90 }; 90 };
91@@ -4483,14 +4484,14 @@ static DH_METHOD cryptodev_dh = { 91@@ -4496,14 +4497,14 @@ static DH_METHOD cryptodev_dh = {
92 NULL, 92 NULL,
93 NULL, 93 NULL,
94 0, /* flags */ 94 0, /* flags */
@@ -106,5 +106,5 @@ index cec6938..407ea62 100644
106 NULL /* app_data */ 106 NULL /* app_data */
107 }; 107 };
108-- 108--
1092.7.0 1092.7.3
110 110
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0036-cryptodev-fix-free-on-error-path.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0036-cryptodev-fix-free-on-error-path.patch
index 94b9f0f6..e59744ed 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0036-cryptodev-fix-free-on-error-path.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0036-cryptodev-fix-free-on-error-path.patch
@@ -1,4 +1,4 @@
1From 8ccc9b12954b7eb299020a1b15d9d1e5735779df Mon Sep 17 00:00:00 2001 1From bf4e61a53459358185a73dffa5f79af9bd739149 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 16:36:33 +0200 3Date: Mon, 8 Feb 2016 16:36:33 +0200
4Subject: [PATCH 36/48] cryptodev: fix free on error path 4Subject: [PATCH 36/48] cryptodev: fix free on error path
@@ -29,10 +29,10 @@ index 9b28c04..c3843c6 100644
29 # if 0 29 # if 0
30 int (*init) (EC_KEY *eckey); 30 int (*init) (EC_KEY *eckey);
31diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 31diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
32index 407ea62..1b1fdc7 100644 32index 20e1ec3..1f13079 100644
33--- a/crypto/engine/eng_cryptodev.c 33--- a/crypto/engine/eng_cryptodev.c
34+++ b/crypto/engine/eng_cryptodev.c 34+++ b/crypto/engine/eng_cryptodev.c
35@@ -3424,7 +3424,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst, 35@@ -3437,7 +3437,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst,
36 if (!(sig->r = BN_new()) || !kop) 36 if (!(sig->r = BN_new()) || !kop)
37 goto err; 37 goto err;
38 if ((sig->s = BN_new()) == NULL) { 38 if ((sig->s = BN_new()) == NULL) {
@@ -42,5 +42,5 @@ index 407ea62..1b1fdc7 100644
42 } 42 }
43 43
44-- 44--
452.7.0 452.7.3
46 46
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0037-cryptodev-fix-return-value-on-error.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0037-cryptodev-fix-return-value-on-error.patch
index 2e9567b3..ea1f4b23 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0037-cryptodev-fix-return-value-on-error.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0037-cryptodev-fix-return-value-on-error.patch
@@ -1,4 +1,4 @@
1From b3d3b86063e65b84ce53f4653295e3f6a83d5794 Mon Sep 17 00:00:00 2001 1From ec6b6531e3e67b4e82a4bc6829777052f39807b1 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 16:55:32 +0200 3Date: Mon, 8 Feb 2016 16:55:32 +0200
4Subject: [PATCH 37/48] cryptodev: fix return value on error 4Subject: [PATCH 37/48] cryptodev: fix return value on error
@@ -12,10 +12,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
12 1 file changed, 1 deletion(-) 12 1 file changed, 1 deletion(-)
13 13
14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
15index 1b1fdc7..8cd3aa3 100644 15index 1f13079..b87fa7d 100644
16--- a/crypto/engine/eng_cryptodev.c 16--- a/crypto/engine/eng_cryptodev.c
17+++ b/crypto/engine/eng_cryptodev.c 17+++ b/crypto/engine/eng_cryptodev.c
18@@ -2755,7 +2755,6 @@ cryptodev_dsa_do_sign_async(const unsigned char *dgst, int dlen, DSA *dsa, 18@@ -2768,7 +2768,6 @@ cryptodev_dsa_do_sign_async(const unsigned char *dgst, int dlen, DSA *dsa,
19 sig->s = dsaret->s; 19 sig->s = dsaret->s;
20 /* Call user callback immediately */ 20 /* Call user callback immediately */
21 cookie->pkc_callback(cookie, 0); 21 cookie->pkc_callback(cookie, 0);
@@ -24,5 +24,5 @@ index 1b1fdc7..8cd3aa3 100644
24 return ret; 24 return ret;
25 } 25 }
26-- 26--
272.7.0 272.7.3
28 28
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0038-cryptodev-match-types-with-cryptodev.h.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0038-cryptodev-match-types-with-cryptodev.h.patch
index 6e083bad..acd6e320 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0038-cryptodev-match-types-with-cryptodev.h.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0038-cryptodev-match-types-with-cryptodev.h.patch
@@ -1,4 +1,4 @@
1From dcc3254b6dbb8627dd710fa58585542b98c80394 Mon Sep 17 00:00:00 2001 1From 77c84d99b5b0ab95efc9e1efc083e5cca8aa4eb5 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 17:11:43 +0200 3Date: Mon, 8 Feb 2016 17:11:43 +0200
4Subject: [PATCH 38/48] cryptodev: match types with cryptodev.h 4Subject: [PATCH 38/48] cryptodev: match types with cryptodev.h
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
9 1 file changed, 2 insertions(+), 2 deletions(-) 9 1 file changed, 2 insertions(+), 2 deletions(-)
10 10
11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
12index 8cd3aa3..4613d2d 100644 12index b87fa7d..4296704 100644
13--- a/crypto/engine/eng_cryptodev.c 13--- a/crypto/engine/eng_cryptodev.c
14+++ b/crypto/engine/eng_cryptodev.c 14+++ b/crypto/engine/eng_cryptodev.c
15@@ -85,9 +85,9 @@ struct dev_crypto_state { 15@@ -86,9 +86,9 @@ struct dev_crypto_state {
16 int ivlen; 16 int ivlen;
17 # ifdef USE_CRYPTODEV_DIGESTS 17 # ifdef USE_CRYPTODEV_DIGESTS
18 struct hash_op_data hash_op; 18 struct hash_op_data hash_op;
@@ -25,5 +25,5 @@ index 8cd3aa3..4613d2d 100644
25 # endif 25 # endif
26 }; 26 };
27-- 27--
282.7.0 282.7.3
29 29
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0039-cryptodev-explicitly-discard-const-qualifier.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0039-cryptodev-explicitly-discard-const-qualifier.patch
index 916c47e9..70319e4c 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0039-cryptodev-explicitly-discard-const-qualifier.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0039-cryptodev-explicitly-discard-const-qualifier.patch
@@ -1,4 +1,4 @@
1From 605210c8ae9241cad6c4ec071f5193bf3e83b2d4 Mon Sep 17 00:00:00 2001 1From 4366920bb2a97c10c49c5e6d035c0c82629b9f0a Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 17:15:25 +0200 3Date: Mon, 8 Feb 2016 17:15:25 +0200
4Subject: [PATCH 39/48] cryptodev: explicitly discard const qualifier 4Subject: [PATCH 39/48] cryptodev: explicitly discard const qualifier
@@ -13,10 +13,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 15diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
16index 4613d2d..2791ca3 100644 16index 4296704..f8619b0 100644
17--- a/crypto/engine/eng_cryptodev.c 17--- a/crypto/engine/eng_cryptodev.c
18+++ b/crypto/engine/eng_cryptodev.c 18+++ b/crypto/engine/eng_cryptodev.c
19@@ -1592,7 +1592,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, 19@@ -1593,7 +1593,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
20 * cryptodev calls and accumulating small amounts of data 20 * cryptodev calls and accumulating small amounts of data
21 */ 21 */
22 if (ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) { 22 if (ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) {
@@ -26,5 +26,5 @@ index 4613d2d..2791ca3 100644
26 } else { 26 } else {
27 state->mac_data = 27 state->mac_data =
28-- 28--
292.7.0 292.7.3
30 30
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0040-cryptodev-replace-caddr_t-with-void.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0040-cryptodev-replace-caddr_t-with-void.patch
index 2c61d9b8..c8359670 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0040-cryptodev-replace-caddr_t-with-void.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0040-cryptodev-replace-caddr_t-with-void.patch
@@ -1,4 +1,4 @@
1From 45429e5ea075867f9219a6fcb233677d062a4451 Mon Sep 17 00:00:00 2001 1From f256bb9574f77206b289b265d1d46bb53e54c71c Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Tue, 9 Feb 2016 11:28:23 +0200 3Date: Tue, 9 Feb 2016 11:28:23 +0200
4Subject: [PATCH 40/48] cryptodev: replace caddr_t with void * 4Subject: [PATCH 40/48] cryptodev: replace caddr_t with void *
@@ -12,10 +12,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
12 1 file changed, 11 insertions(+), 11 deletions(-) 12 1 file changed, 11 insertions(+), 11 deletions(-)
13 13
14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
15index 2791ca3..f172173 100644 15index f8619b0..aac2740 100644
16--- a/crypto/engine/eng_cryptodev.c 16--- a/crypto/engine/eng_cryptodev.c
17+++ b/crypto/engine/eng_cryptodev.c 17+++ b/crypto/engine/eng_cryptodev.c
18@@ -460,8 +460,8 @@ static int get_cryptodev_ciphers(const int **cnids) 18@@ -461,8 +461,8 @@ static int get_cryptodev_ciphers(const int **cnids)
19 return (0); 19 return (0);
20 } 20 }
21 memset(&sess, 0, sizeof(sess)); 21 memset(&sess, 0, sizeof(sess));
@@ -26,7 +26,7 @@ index 2791ca3..f172173 100644
26 26
27 for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) { 27 for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
28 if (ciphers[i].nid == NID_undef) 28 if (ciphers[i].nid == NID_undef)
29@@ -501,7 +501,7 @@ static int get_cryptodev_digests(const int **cnids) 29@@ -502,7 +502,7 @@ static int get_cryptodev_digests(const int **cnids)
30 return (0); 30 return (0);
31 } 31 }
32 memset(&sess, 0, sizeof(sess)); 32 memset(&sess, 0, sizeof(sess));
@@ -35,7 +35,7 @@ index 2791ca3..f172173 100644
35 for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) { 35 for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
36 if (digests[i].nid == NID_undef) 36 if (digests[i].nid == NID_undef)
37 continue; 37 continue;
38@@ -633,14 +633,14 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 38@@ -634,14 +634,14 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
39 cryp.ses = sess->ses; 39 cryp.ses = sess->ses;
40 cryp.flags = 0; 40 cryp.flags = 0;
41 cryp.len = inl; 41 cryp.len = inl;
@@ -53,7 +53,7 @@ index 2791ca3..f172173 100644
53 if (!ctx->encrypt) { 53 if (!ctx->encrypt) {
54 iiv = in + inl - ctx->cipher->iv_len; 54 iiv = in + inl - ctx->cipher->iv_len;
55 memcpy(save_iv, iiv, ctx->cipher->iv_len); 55 memcpy(save_iv, iiv, ctx->cipher->iv_len);
56@@ -701,15 +701,15 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 56@@ -702,15 +702,15 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
57 } 57 }
58 cryp.ses = sess->ses; 58 cryp.ses = sess->ses;
59 cryp.len = state->len; 59 cryp.len = state->len;
@@ -72,7 +72,7 @@ index 2791ca3..f172173 100644
72 if (!ctx->encrypt) { 72 if (!ctx->encrypt) {
73 iiv = in + len - ctx->cipher->iv_len; 73 iiv = in + len - ctx->cipher->iv_len;
74 memcpy(save_iv, iiv, ctx->cipher->iv_len); 74 memcpy(save_iv, iiv, ctx->cipher->iv_len);
75@@ -761,7 +761,7 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 75@@ -762,7 +762,7 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
76 if ((state->d_fd = get_dev_crypto()) < 0) 76 if ((state->d_fd = get_dev_crypto()) < 0)
77 return (0); 77 return (0);
78 78
@@ -81,7 +81,7 @@ index 2791ca3..f172173 100644
81 sess->keylen = ctx->key_len; 81 sess->keylen = ctx->key_len;
82 sess->cipher = cipher; 82 sess->cipher = cipher;
83 83
84@@ -804,7 +804,7 @@ static int cryptodev_init_aead_key(EVP_CIPHER_CTX *ctx, 84@@ -805,7 +805,7 @@ static int cryptodev_init_aead_key(EVP_CIPHER_CTX *ctx,
85 85
86 memset(sess, 0, sizeof(struct session_op)); 86 memset(sess, 0, sizeof(struct session_op));
87 87
@@ -91,5 +91,5 @@ index 2791ca3..f172173 100644
91 sess->cipher = cipher; 91 sess->cipher = cipher;
92 92
93-- 93--
942.7.0 942.7.3
95 95
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0041-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0041-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch
index 55250454..6c46061e 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0041-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0041-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch
@@ -1,4 +1,4 @@
1From f10d471839dff079a23d79d1b4ecb3e3e6529283 Mon Sep 17 00:00:00 2001 1From c714cb7a33e994ff2278149d4a7a20a21215a2f6 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 17:04:25 +0200 3Date: Mon, 8 Feb 2016 17:04:25 +0200
4Subject: [PATCH 41/48] cryptodev: check for errors inside 4Subject: [PATCH 41/48] cryptodev: check for errors inside
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
10 1 file changed, 18 insertions(+), 6 deletions(-) 10 1 file changed, 18 insertions(+), 6 deletions(-)
11 11
12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
13index f172173..695848d 100644 13index aac2740..e419bef 100644
14--- a/crypto/engine/eng_cryptodev.c 14--- a/crypto/engine/eng_cryptodev.c
15+++ b/crypto/engine/eng_cryptodev.c 15+++ b/crypto/engine/eng_cryptodev.c
16@@ -2054,12 +2054,24 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) 16@@ -2067,12 +2067,24 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
17 kop.crk_status = 0; 17 kop.crk_status = 0;
18 kop.crk_op = CRK_MOD_EXP_CRT; 18 kop.crk_op = CRK_MOD_EXP_CRT;
19 f_len = BN_num_bytes(rsa->n); 19 f_len = BN_num_bytes(rsa->n);
@@ -45,5 +45,5 @@ index f172173..695848d 100644
45 kop.crk_param[0].crp_p = p; 45 kop.crk_param[0].crp_p = p;
46 kop.crk_param[0].crp_nbits = p_len * 8; 46 kop.crk_param[0].crp_nbits = p_len * 8;
47-- 47--
482.7.0 482.7.3
49 49
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0042-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0042-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch
index 218accb1..4b9b0862 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0042-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0042-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch
@@ -1,4 +1,4 @@
1From 402a2e4da471728fa537462d7a13aa35955cd6d8 Mon Sep 17 00:00:00 2001 1From 7f444e52acada23977b89d42f8dd8ebd915ccd83 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Tue, 9 Feb 2016 11:47:52 +0200 3Date: Tue, 9 Feb 2016 11:47:52 +0200
4Subject: [PATCH 42/48] cryptodev: check for errors inside 4Subject: [PATCH 42/48] cryptodev: check for errors inside
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
10 1 file changed, 25 insertions(+), 8 deletions(-) 10 1 file changed, 25 insertions(+), 8 deletions(-)
11 11
12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
13index 695848d..8e84972 100644 13index e419bef..7c391d6 100644
14--- a/crypto/engine/eng_cryptodev.c 14--- a/crypto/engine/eng_cryptodev.c
15+++ b/crypto/engine/eng_cryptodev.c 15+++ b/crypto/engine/eng_cryptodev.c
16@@ -2109,25 +2109,42 @@ static int 16@@ -2122,25 +2122,42 @@ static int
17 cryptodev_rsa_mod_exp_async(BIGNUM *r0, const BIGNUM *I, RSA *rsa, 17 cryptodev_rsa_mod_exp_async(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
18 BN_CTX *ctx, struct pkc_cookie_s *cookie) 18 BN_CTX *ctx, struct pkc_cookie_s *cookie)
19 { 19 {
@@ -65,5 +65,5 @@ index 695848d..8e84972 100644
65 kop->crk_param[0].crp_p = p; 65 kop->crk_param[0].crp_p = p;
66 kop->crk_param[0].crp_nbits = p_len * 8; 66 kop->crk_param[0].crp_nbits = p_len * 8;
67-- 67--
682.7.0 682.7.3
69 69
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0043-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0043-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch
index 931141de..879d5c2c 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0043-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0043-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch
@@ -1,4 +1,4 @@
1From c8a5f714d35c3bd63d2511ad69e0661a7d1d5dcd Mon Sep 17 00:00:00 2001 1From 73115f243f0a65326888537f125e31f28c9f570d Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Tue, 9 Feb 2016 11:53:22 +0200 3Date: Tue, 9 Feb 2016 11:53:22 +0200
4Subject: [PATCH 43/48] cryptodev: check for errors inside 4Subject: [PATCH 43/48] cryptodev: check for errors inside
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
10 1 file changed, 11 insertions(+), 4 deletions(-) 10 1 file changed, 11 insertions(+), 4 deletions(-)
11 11
12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
13index 8e84972..55b2047 100644 13index 7c391d6..753e326 100644
14--- a/crypto/engine/eng_cryptodev.c 14--- a/crypto/engine/eng_cryptodev.c
15+++ b/crypto/engine/eng_cryptodev.c 15+++ b/crypto/engine/eng_cryptodev.c
16@@ -4043,11 +4043,15 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) 16@@ -4056,11 +4056,15 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
17 memset(&kop, 0, sizeof kop); 17 memset(&kop, 0, sizeof kop);
18 kop.crk_op = CRK_DH_COMPUTE_KEY; 18 kop.crk_op = CRK_DH_COMPUTE_KEY;
19 /* inputs: dh->priv_key pub_key dh->p key */ 19 /* inputs: dh->priv_key pub_key dh->p key */
@@ -33,7 +33,7 @@ index 8e84972..55b2047 100644
33 kop.crk_param[1].crp_p = padded_pub_key; 33 kop.crk_param[1].crp_p = padded_pub_key;
34 kop.crk_param[1].crp_nbits = p_len * 8; 34 kop.crk_param[1].crp_nbits = p_len * 8;
35 kop.crk_param[2].crp_p = p; 35 kop.crk_param[2].crp_p = p;
36@@ -4074,10 +4078,13 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) 36@@ -4087,10 +4091,13 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
37 kop.crk_param[3].crp_p = NULL; 37 kop.crk_param[3].crp_p = NULL;
38 zapparams(&kop); 38 zapparams(&kop);
39 return (dhret); 39 return (dhret);
@@ -48,5 +48,5 @@ index 8e84972..55b2047 100644
48 } 48 }
49 return (dhret); 49 return (dhret);
50-- 50--
512.7.0 512.7.3
52 52
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0044-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0044-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch
index be996435..37bdff8d 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0044-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0044-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch
@@ -1,4 +1,4 @@
1From 42a1c45091ab7996c4411f3dd74539c908c63208 Mon Sep 17 00:00:00 2001 1From 0901ff383524e896424921f4e8a1ba7020e7613d Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Tue, 9 Feb 2016 11:53:33 +0200 3Date: Tue, 9 Feb 2016 11:53:33 +0200
4Subject: [PATCH 44/48] cryptodev: check for errors inside 4Subject: [PATCH 44/48] cryptodev: check for errors inside
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
10 1 file changed, 21 insertions(+), 8 deletions(-) 10 1 file changed, 21 insertions(+), 8 deletions(-)
11 11
12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
13index 55b2047..e0f9d4b 100644 13index 753e326..b9c7ff3 100644
14--- a/crypto/engine/eng_cryptodev.c 14--- a/crypto/engine/eng_cryptodev.c
15+++ b/crypto/engine/eng_cryptodev.c 15+++ b/crypto/engine/eng_cryptodev.c
16@@ -4095,19 +4095,28 @@ static int 16@@ -4108,19 +4108,28 @@ static int
17 cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key, 17 cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key,
18 DH *dh, struct pkc_cookie_s *cookie) 18 DH *dh, struct pkc_cookie_s *cookie)
19 { 19 {
@@ -47,7 +47,7 @@ index 55b2047..e0f9d4b 100644
47 kop->crk_param[1].crp_p = padded_pub_key; 47 kop->crk_param[1].crp_p = padded_pub_key;
48 kop->crk_param[1].crp_nbits = p_len * 8; 48 kop->crk_param[1].crp_nbits = p_len * 8;
49 kop->crk_param[2].crp_p = p; 49 kop->crk_param[2].crp_p = p;
50@@ -4119,16 +4128,20 @@ cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key, 50@@ -4132,16 +4141,20 @@ cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key,
51 kop->crk_param[3].crp_nbits = p_len * 8; 51 kop->crk_param[3].crp_nbits = p_len * 8;
52 kop->crk_oparams = 1; 52 kop->crk_oparams = 1;
53 53
@@ -72,5 +72,5 @@ index 55b2047..e0f9d4b 100644
72 /* Call user cookie handler */ 72 /* Call user cookie handler */
73 cookie->pkc_callback(cookie, 0); 73 cookie->pkc_callback(cookie, 0);
74-- 74--
752.7.0 752.7.3
76 76
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0045-cryptodev-change-signature-for-conversion-functions.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0045-cryptodev-change-signature-for-conversion-functions.patch
index 11f1a541..4489b435 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0045-cryptodev-change-signature-for-conversion-functions.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0045-cryptodev-change-signature-for-conversion-functions.patch
@@ -1,4 +1,4 @@
1From 528e4965e536d31cdccb11abe5e04db28a1008a8 Mon Sep 17 00:00:00 2001 1From 6ca53b6d6519d52021e642230bb51ae7834b3e67 Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Tue, 9 Feb 2016 12:11:32 +0200 3Date: Tue, 9 Feb 2016 12:11:32 +0200
4Subject: [PATCH 45/48] cryptodev: change signature for conversion functions 4Subject: [PATCH 45/48] cryptodev: change signature for conversion functions
@@ -12,10 +12,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
12 1 file changed, 2 insertions(+), 2 deletions(-) 12 1 file changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 14diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
15index e0f9d4b..3024a68 100644 15index b9c7ff3..58e539c 100644
16--- a/crypto/engine/eng_cryptodev.c 16--- a/crypto/engine/eng_cryptodev.c
17+++ b/crypto/engine/eng_cryptodev.c 17+++ b/crypto/engine/eng_cryptodev.c
18@@ -145,7 +145,7 @@ const EVP_CIPHER cryptodev_tls12_aes_256_cbc_hmac_sha1; 18@@ -146,7 +146,7 @@ const EVP_CIPHER cryptodev_tls12_aes_256_cbc_hmac_sha1;
19 const EVP_CIPHER cryptodev_tls12_aes_128_cbc_hmac_sha256; 19 const EVP_CIPHER cryptodev_tls12_aes_128_cbc_hmac_sha256;
20 const EVP_CIPHER cryptodev_tls12_aes_256_cbc_hmac_sha256; 20 const EVP_CIPHER cryptodev_tls12_aes_256_cbc_hmac_sha256;
21 21
@@ -24,7 +24,7 @@ index e0f9d4b..3024a68 100644
24 { 24 {
25 int len; 25 int len;
26 unsigned char *p; 26 unsigned char *p;
27@@ -167,7 +167,7 @@ inline int spcf_bn2bin(BIGNUM *bn, unsigned char **bin, int *bin_len) 27@@ -168,7 +168,7 @@ inline int spcf_bn2bin(BIGNUM *bn, unsigned char **bin, int *bin_len)
28 return 0; 28 return 0;
29 } 29 }
30 30
@@ -34,5 +34,5 @@ index e0f9d4b..3024a68 100644
34 int len; 34 int len;
35 unsigned char *p; 35 unsigned char *p;
36-- 36--
372.7.0 372.7.3
38 38
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0046-cryptodev-add-explicit-cast-for-known-BIGNUM-values.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0046-cryptodev-add-explicit-cast-for-known-BIGNUM-values.patch
index e7a5aa32..d8b56dee 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0046-cryptodev-add-explicit-cast-for-known-BIGNUM-values.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0046-cryptodev-add-explicit-cast-for-known-BIGNUM-values.patch
@@ -1,4 +1,4 @@
1From b27823ac9f460c96a72d9003e2e134c1288ac85f Mon Sep 17 00:00:00 2001 1From 8f6e948f5f6bb2b517a5436dd6294e7e5536cf8f Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Tue, 9 Feb 2016 12:13:59 +0200 3Date: Tue, 9 Feb 2016 12:13:59 +0200
4Subject: [PATCH 46/48] cryptodev: add explicit cast for known BIGNUM values 4Subject: [PATCH 46/48] cryptodev: add explicit cast for known BIGNUM values
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
9 1 file changed, 1 insertion(+), 1 deletion(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 11diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
12index 3024a68..539be62 100644 12index 58e539c..ddd3462 100644
13--- a/crypto/engine/eng_cryptodev.c 13--- a/crypto/engine/eng_cryptodev.c
14+++ b/crypto/engine/eng_cryptodev.c 14+++ b/crypto/engine/eng_cryptodev.c
15@@ -4014,7 +4014,7 @@ static int cryptodev_dh_keygen(DH *dh) 15@@ -4027,7 +4027,7 @@ static int cryptodev_dh_keygen(DH *dh)
16 } 16 }
17 17
18 /* pub_key is or prime length while priv key is of length of order */ 18 /* pub_key is or prime length while priv key is of length of order */
@@ -22,5 +22,5 @@ index 3024a68..539be62 100644
22 22
23 dh->pub_key = BN_bin2bn(w, q_len, pub_key); 23 dh->pub_key = BN_bin2bn(w, q_len, pub_key);
24-- 24--
252.7.0 252.7.3
26 26
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0047-cryptodev-treat-all-build-warnings-as-errors.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0047-cryptodev-treat-all-build-warnings-as-errors.patch
index 2163998b..7cfad9cd 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0047-cryptodev-treat-all-build-warnings-as-errors.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0047-cryptodev-treat-all-build-warnings-as-errors.patch
@@ -1,4 +1,4 @@
1From 596735ad86a3dae987e19c21ef22259179966fc6 Mon Sep 17 00:00:00 2001 1From e50560cb9a201c0b0130bb29d4c99121a8ec97ba Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Mon, 8 Feb 2016 15:15:02 +0200 3Date: Mon, 8 Feb 2016 15:15:02 +0200
4Subject: [PATCH 47/48] cryptodev: treat all build warnings as errors 4Subject: [PATCH 47/48] cryptodev: treat all build warnings as errors
@@ -24,5 +24,5 @@ index 426388e..010f21d 100644
24 GENERAL=Makefile 24 GENERAL=Makefile
25 TEST= enginetest.c 25 TEST= enginetest.c
26-- 26--
272.7.0 272.7.3
28 28
diff --git a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0048-fix-maclen-is-used-uninitialized-warning-on-some-com.patch b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0048-fix-maclen-is-used-uninitialized-warning-on-some-com.patch
index d7b84e6a..57ff7f11 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/qoriq/0048-fix-maclen-is-used-uninitialized-warning-on-some-com.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/qoriq/0048-fix-maclen-is-used-uninitialized-warning-on-some-com.patch
@@ -1,4 +1,4 @@
1From 116bd4f6f1ee5acdb997d414902d9646b24df1be Mon Sep 17 00:00:00 2001 1From c79e7a4a818ea86bf6045197173d5c4e243d1f4f Mon Sep 17 00:00:00 2001
2From: Cristian Stoica <cristian.stoica@nxp.com> 2From: Cristian Stoica <cristian.stoica@nxp.com>
3Date: Wed, 6 Apr 2016 15:22:58 +0300 3Date: Wed, 6 Apr 2016 15:22:58 +0300
4Subject: [PATCH 48/48] fix 'maclen is used uninitialized' warning on some 4Subject: [PATCH 48/48] fix 'maclen is used uninitialized' warning on some
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
10 1 file changed, 4 insertions(+) 10 1 file changed, 4 insertions(+)
11 11
12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c 12diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
13index 539be62..35b71b0 100644 13index ddd3462..2266b26 100644
14--- a/crypto/engine/eng_cryptodev.c 14--- a/crypto/engine/eng_cryptodev.c
15+++ b/crypto/engine/eng_cryptodev.c 15+++ b/crypto/engine/eng_cryptodev.c
16@@ -905,6 +905,10 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, 16@@ -906,6 +906,10 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
17 maclen = SHA256_DIGEST_LENGTH; 17 maclen = SHA256_DIGEST_LENGTH;
18 aad_needs_fix = true; 18 aad_needs_fix = true;
19 break; 19 break;
@@ -25,5 +25,5 @@ index 539be62..35b71b0 100644
25 25
26 /* Correct length for AAD Length field */ 26 /* Correct length for AAD Length field */
27-- 27--
282.7.0 282.7.3
29 29
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-29 21:14:27 +0000