diff options
| author | Matt Caswell <matt@openssl.org> | 2017-06-28 17:18:27 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-06-29 10:15:50 +0100 |
| commit | a599574be17579496877bcdcc5e1eeaf5b014cf3 (patch) | |
| tree | a5d4cfaf17d9ffe1a1d8ab6d78efa2a64c6f47d1 /ssl/tls13_enc.c | |
| parent | e88c40af4572a422be5fcab732bd46c55df136f8 (diff) | |
Updates following review of SSL_export_key_material() changes
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3782)
Diffstat (limited to 'ssl/tls13_enc.c')
| -rw-r--r-- | ssl/tls13_enc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index 67ae0a3541..55e68c60db 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -611,10 +611,7 @@ int tls13_export_keying_material(SSL *s, unsigned char *out, size_t olen, unsigned int hashsize; int ret = 0; - if (ctx == NULL) - goto err; - - if (!SSL_is_init_finished(s)) + if (ctx == NULL || !SSL_is_init_finished(s)) goto err; if (!use_context) |