diff options
| author | Matt Caswell <matt@openssl.org> | 2018-02-26 13:26:14 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-14 10:51:20 +0100 |
| commit | 3295d2423889496e0933b3f9af6dc692c9f9a8f2 (patch) | |
| tree | e1dbd6c2cdf978d1211970f19ec295eb6ae13b0e /engines | |
| parent | Remove '-Wextra' as default user flags for the Linux clang targets (diff) | |
| download | openssl-3295d2423889496e0933b3f9af6dc692c9f9a8f2.tar.xz openssl-3295d2423889496e0933b3f9af6dc692c9f9a8f2.zip | |
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 <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/5604)
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_ossltest.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |