From 3295d2423889496e0933b3f9af6dc692c9f9a8f2 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 26 Feb 2018 12:26:14 +0000 Subject: Use the TLSv1.3 record header as AAD As of TLSv1.3 draft-25 the record header data must be used as AAD Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/5604) --- engines/e_ossltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/e_ossltest.c') diff --git a/engines/e_ossltest.c b/engines/e_ossltest.c index 2bda610f46..64376247c3 100644 --- a/engines/e_ossltest.c +++ b/engines/e_ossltest.c @@ -637,7 +637,7 @@ int ossltest_aes128_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, EVP_CIPHER_meth_get_do_cipher(EVP_aes_128_gcm())(ctx, out, in, inl); /* Throw it all away and just use the plaintext as the output */ - if (tmpbuf != NULL) + if (tmpbuf != NULL && out != NULL) memcpy(out, tmpbuf, inl); OPENSSL_free(tmpbuf); -- cgit v1.2.3