diff options
| author | Pascal Brand <pascal.brand@st.com> | 2014-12-23 15:02:47 +0100 |
|---|---|---|
| committer | Pascal Brand <pascal.brand@st.com> | 2015-02-17 10:56:48 +0100 |
| commit | d3588802b3e6681e6b46080768dc33010c0c473b (patch) | |
| tree | 57d3038309561c7b5d785aa1682d0c4c96459e24 | |
| parent | abd4a75004477efc5c3d6f9eb18f68737b5c394e (diff) | |
libutee: AES buffer not processed when size=16
In TEE_CipherUpdate, buffers must be processed when
the size of the input buffer is exactly the right minimum size.
As an example, in AES128, 16 bytes output must be given
every 16 bytes input.
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Tested-by: Pascal Brand <pascal.brand@linaro.org> (QEMU)
Tested-by: Jeremy PLANEIX <jeremy.planeix@st.com>
Signed-off-by: Pascal Brand <pascal.brand@st.com>
| -rw-r--r-- | lib/libutee/tee_api_operations.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/libutee/tee_api_operations.c b/lib/libutee/tee_api_operations.c index 4366d14..8a09d91 100644 --- a/lib/libutee/tee_api_operations.c +++ b/lib/libutee/tee_api_operations.c @@ -531,11 +531,15 @@ static TEE_Result tee_buffer_update( size_t tmp_dlen; size_t l; size_t buffer_size; + size_t buffer_left; - if (op->buffer_two_blocks) + if (op->buffer_two_blocks) { buffer_size = op->block_size * 2; - else + buffer_left = 1; + } else { buffer_size = op->block_size; + buffer_left = 0; + } if (op->buffer_offs > 0) { /* Fill up complete block */ @@ -552,7 +556,8 @@ static TEE_Result tee_buffer_update( } /* If we can feed from buffer */ - if (op->buffer_offs > 0 && (op->buffer_offs + slen) > buffer_size) { + if ((op->buffer_offs > 0) && + ((op->buffer_offs + slen) >= (buffer_size + buffer_left))) { l = ROUNDUP(op->buffer_offs + slen - buffer_size, op->block_size); l = MIN(op->buffer_offs, l); @@ -575,7 +580,7 @@ static TEE_Result tee_buffer_update( } } - if (slen > buffer_size) { + if (slen >= (buffer_size + buffer_left)) { /* Buffer is empty, feed as much as possible from src */ if (TEE_ALIGNMENT_IS_OK(src, uint32_t)) { l = ROUNDUP(slen - buffer_size + 1, op->block_size); |