Commit 6af62ee9 authored by Matt Caswell's avatar Matt Caswell
Browse files

Properly handle a partial block in OCB mode 



If we have previously been passed a partial block in an "Update" call then
make sure we properly increment the output buffer when we use it.

Fixes #2273

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2275)
(cherry picked from commit 7c12c7b6)
parent d1257342

crypto/evp/e_aes.c

+2 −0
Original line number Diff line number Diff line
@@ -2587,6 +2587,8 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
            }

            written_len = AES_BLOCK_SIZE;

            *buf_len = 0;

            if (out != NULL)

                out += AES_BLOCK_SIZE;

        }



        /* Do we have a partial block to handle at the end? */