Commit a68d3505 authored Apr 24, 2017 by Rich Salz

check length sanity before correcting in EVP_CTRL_AEAD_TLS1_AAD



Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3289)

parent 8af91fd9

crypto/evp/e_aes_cbc_hmac_sha1.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -809,6 +809,8 @@ static int aesni_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
		key->payload_length = len;
		if ((key->aux.tls_ver =
		p[arg - 4] << 8 \| p[arg - 3]) >= TLS1_1_VERSION) {
		if (len < AES_BLOCK_SIZE)
		return 0;
		len -= AES_BLOCK_SIZE;
		p[arg - 2] = len >> 8;
		p[arg - 1] = len;

crypto/evp/e_aes_cbc_hmac_sha256.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -788,6 +788,8 @@ static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
		key->payload_length = len;
		if ((key->aux.tls_ver =
		p[arg - 4] << 8 \| p[arg - 3]) >= TLS1_1_VERSION) {
		if (len < AES_BLOCK_SIZE)
		return 0;
		len -= AES_BLOCK_SIZE;
		p[arg - 2] = len >> 8;
		p[arg - 1] = len;

engines/e_dasync.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -606,6 +606,8 @@ static int dasync_cipher_ctrl_helper(EVP_CIPHER_CTX *ctx, int type, int arg,

		if (pipe_ctx->enc) {
		if ((p[arg - 4] << 8 \| p[arg - 3]) >= TLS1_1_VERSION) {
		if (len < AES_BLOCK_SIZE)
		return 0;
		len -= AES_BLOCK_SIZE;
		}