summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/openssl/openssl-qoriq/qoriq/0040-cryptodev-replace-caddr_t-with-void.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/qoriq/0040-cryptodev-replace-caddr_t-with-void.patch')
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/qoriq/0040-cryptodev-replace-caddr_t-with-void.patch18
1 files changed, 9 insertions, 9 deletions
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