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 f3cf9c3583364af7625679d0021c4d55c3414994 (commit) via 8a129029dedcb1e75934cce706762539a60857ad (commit) via 57961cf6e96472aafafb7b1bb0b6d74fc4dcaae0 (commit) via af6528a5208c69ad223394fc057f14e29a51471d (commit) from 14a338c7f19830a084aa411b32639f3acaa99143 (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 f3cf9c3583364af7625679d0021c4d55c3414994 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Mon Mar 5 18:29:08 2018 +0300

linux-gen: crypto: set pkt_out to INVALID on error

correctly set passed parameter to INVALID on error.

Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org

diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 9bf77f82..a7fddb5b 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -1948,7 +1948,7 @@ int crypto_int(odp_packet_t pkt_in, err: if (allocated) { odp_packet_free(out_pkt); - out_pkt = ODP_PACKET_INVALID; + *pkt_out = ODP_PACKET_INVALID; }

return -1;

commit 8a129029dedcb1e75934cce706762539a60857ad Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Mon Mar 5 18:24:05 2018 +0300

linux-gen: crypto: remove odp prefix from internal crypto_int

Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org

diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 63e717c4..9bf77f82 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -1872,9 +1872,9 @@ int odp_crypto_result(odp_crypto_packet_result_t *result, }

static -int odp_crypto_int(odp_packet_t pkt_in, - odp_packet_t *pkt_out, - const odp_crypto_packet_op_param_t *param) +int crypto_int(odp_packet_t pkt_in, + odp_packet_t *pkt_out, + const odp_crypto_packet_op_param_t *param) { odp_crypto_alg_err_t rc_cipher = ODP_CRYPTO_ALG_ERR_NONE; odp_crypto_alg_err_t rc_auth = ODP_CRYPTO_ALG_ERR_NONE; @@ -1966,7 +1966,7 @@ int odp_crypto_op(const odp_packet_t pkt_in[], ODP_ASSERT(ODP_CRYPTO_SYNC == session->p.op_mode);

for (i = 0; i < num_pkt; i++) { - rc = odp_crypto_int(pkt_in[i], &pkt_out[i], &param[i]); + rc = crypto_int(pkt_in[i], &pkt_out[i], &param[i]); if (rc < 0) break; } @@ -1990,7 +1990,7 @@ int odp_crypto_op_enq(const odp_packet_t pkt_in[],

for (i = 0; i < num_pkt; i++) { pkt = pkt_out[i]; - rc = odp_crypto_int(pkt_in[i], &pkt, &param[i]); + rc = crypto_int(pkt_in[i], &pkt, &param[i]); if (rc < 0) break;

commit 57961cf6e96472aafafb7b1bb0b6d74fc4dcaae0 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Mon Mar 5 18:04:48 2018 +0300

linux-gen: check crypto pool allocation

Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org

diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 46cc8364..63e717c4 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -1646,6 +1646,10 @@ odp_crypto_init_global(void) /* Allocate our globally shared memory */ shm = odp_shm_reserve("crypto_pool", mem_size, ODP_CACHE_LINE_SIZE, 0); + if (ODP_SHM_INVALID == shm) { + ODP_ERR("unable to allocate crypto pool\n"); + return -1; + }

global = odp_shm_addr(shm);

commit af6528a5208c69ad223394fc057f14e29a51471d Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Mon Mar 5 16:39:03 2018 +0300

linux-gen: fix crypto merge aes_gmac_gen_init/aes_gmac_check_init

Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org

diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index f1d5fcad..46cc8364 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -816,7 +816,7 @@ aes_gmac_gen_init(odp_crypto_generic_session_t *session) EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL, session->auth.key, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.cipher_iv.length, NULL); + session->p.auth_iv.length, NULL); EVP_CIPHER_CTX_set_padding(ctx, 0); }

@@ -858,7 +858,7 @@ aes_gmac_check_init(odp_crypto_generic_session_t *session) EVP_DecryptInit_ex(ctx, session->auth.evp_cipher, NULL, session->auth.key, NULL); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.cipher_iv.length, NULL); + session->p.auth_iv.length, NULL); EVP_CIPHER_CTX_set_padding(ctx, 0); }

-----------------------------------------------------------------------

Summary of changes: platform/linux-generic/odp_crypto.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)

hooks/post-receive