diff options
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/qoriq/0026-cryptodev-remove-code-duplication-in-digest-operatio.patch')
| -rw-r--r-- | recipes-connectivity/openssl/openssl-qoriq/qoriq/0026-cryptodev-remove-code-duplication-in-digest-operatio.patch | 16 |
1 files changed, 8 insertions, 8 deletions
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 936aafced..4e1ce65d1 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 @@ | |||
| 1 | From 02dd4d275f7544a4027ca3452b60ac5bdd9376fb Mon Sep 17 00:00:00 2001 | 1 | From 7f6a709ed46d79d765ee0bb2fc16b84d0bb4c8a6 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: Mon, 14 Dec 2015 17:49:08 +0200 | 3 | Date: Mon, 14 Dec 2015 17:49:08 +0200 |
| 4 | Subject: [PATCH 26/48] cryptodev: remove code duplication in digest operations | 4 | Subject: [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 | ||
| 19 | diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c | 19 | diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c |
| 20 | index 16e6fd9..048e050 100644 | 20 | index 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 | -- |
| 154 | 2.7.0 | 154 | 2.7.3 |
| 155 | 155 | ||
