This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via 484f37b71aac5f5a56cd12c72c348d90d1095e31 (commit) via bcf8b3b1b5d509ba01c0daff9f2b2056026b643a (commit) via 17454218029d3f22c15755d91b9e97c46fb16d61 (commit) from 63a39fabe4924d142d2df041d817f732eb4fdafb (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 484f37b71aac5f5a56cd12c72c348d90d1095e31 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Feb 23 16:37:34 2017 +0300
linux-generic: crypto: support OpenSSL 1.1.0
OpenSSL 1.1.0 uses new threading API. It is no longer necessary to set locking callbacks to use OpenSSL in a multi-threaded environment. OpenSSL provides compatibility callbacks, but ODP compilation still fails with unused function/argument errors. So, to support compiling ODP with OpenSSL 1.1.x, add ODP_UNUSED annotiations to lock/thread_id callbacks.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-and-tested-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index adadbf9..54b222f 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -949,14 +949,14 @@ odp_crypto_operation(odp_crypto_op_param_t *param, return 0; }
-static void openssl_thread_id(CRYPTO_THREADID *id) +static void ODP_UNUSED openssl_thread_id(CRYPTO_THREADID ODP_UNUSED *id) { CRYPTO_THREADID_set_numeric(id, odp_thread_id()); }
-static void openssl_lock(int mode, int n, - const char *file ODP_UNUSED, - int line ODP_UNUSED) +static void ODP_UNUSED openssl_lock(int mode, int n, + const char *file ODP_UNUSED, + int line ODP_UNUSED) { if (mode & CRYPTO_LOCK) odp_ticketlock_lock((odp_ticketlock_t *)
commit bcf8b3b1b5d509ba01c0daff9f2b2056026b643a Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Feb 23 16:37:33 2017 +0300
linux-generic: crypto: port to OpenSSL 1.0.x thread id API
OpenSSL 1.0.x has deperecated old 0.9.x thread id callbacks. If the library is compiled without deprecated functions, compiling ODP fails with missing functions errors. So, let's port odp_crypto to OpenSSL 1.0 thread ID API.
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-and-tested-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index b53b0fc..adadbf9 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -949,9 +949,9 @@ odp_crypto_operation(odp_crypto_op_param_t *param, return 0; }
-static unsigned long openssl_thread_id(void) +static void openssl_thread_id(CRYPTO_THREADID *id) { - return (unsigned long)odp_thread_id(); + CRYPTO_THREADID_set_numeric(id, odp_thread_id()); }
static void openssl_lock(int mode, int n, @@ -1003,7 +1003,7 @@ odp_crypto_init_global(void) odp_ticketlock_init((odp_ticketlock_t *) &global->openssl_lock[idx]);
- CRYPTO_set_id_callback(openssl_thread_id); + CRYPTO_THREADID_set_callback(openssl_thread_id); CRYPTO_set_locking_callback(openssl_lock); }
commit 17454218029d3f22c15755d91b9e97c46fb16d61 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Thu Feb 23 16:37:32 2017 +0300
linux-generic: crypto: add missing include
OpenSSL 1.1.0 headers do not include <openssl/evp.h>, so include it manually to fix the following error:
In file included from ./include/odp_packet_internal.h:28:0, from odp_classification.c:13: ./include/odp_crypto_internal.h:55:5: error: unknown type name ‘EVP_CIPHER_CTX’ EVP_CIPHER_CTX *ctx; ^~~~~~~~~~~~~~
Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-and-tested-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h index c7b893a..f85b76e 100644 --- a/platform/linux-generic/include/odp_crypto_internal.h +++ b/platform/linux-generic/include/odp_crypto_internal.h @@ -13,6 +13,7 @@ extern "C" {
#include <openssl/des.h> #include <openssl/aes.h> +#include <openssl/evp.h>
#define MAX_IV_LEN 64 #define OP_RESULT_MAGIC 0x91919191
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/include/odp_crypto_internal.h | 1 + platform/linux-generic/odp_crypto.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-)
hooks/post-receive