diff options
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch')
-rw-r--r-- | recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch | 14 |
1 files changed, 7 insertions, 7 deletions
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 @@ | |||
1 | From 2187b18ffe4851efcb6465ca02ac036d2fe031b8 Mon Sep 17 00:00:00 2001 | 1 | From 0307a70fc4399a0ee758172e385d4daaae669ce6 Mon Sep 17 00:00:00 2001 |
2 | From: Cristian Stoica <cristian.stoica@nxp.com> | 2 | From: Cristian Stoica <cristian.stoica@nxp.com> |
3 | Date: Tue, 15 Dec 2015 12:23:13 +0200 | 3 | Date: Tue, 15 Dec 2015 12:23:13 +0200 |
4 | Subject: [PATCH 27/48] cryptodev: put all digest ioctls into a single function | 4 | Subject: [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 | ||
11 | diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c | 11 | diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c |
12 | index 048e050..76faa35 100644 | 12 | index 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 | -- |
107 | 2.7.0 | 107 | 2.7.3 |
108 | 108 | ||